Mercurial Mercurial > oss > MCL > sf > os > kernelhwsrv / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
kerneltest/f32test/server/t_dlocl.cpp
branchRCL_3
changeset 44 3e88ff8f41d5
parent 43 c1f20ce4abcf 
--- a/kerneltest/f32test/server/t_dlocl.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/f32test/server/t_dlocl.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -73,7 +73,7 @@
 
     RLibrary testLib;
     TInt res=testLib.Load(EKDATA);
-    test_KErrNone(res);
+    test(res==KErrNone);
     THandleInfo handleInfo;
     testLib.HandleInfo(&handleInfo);
     test(handleInfo.iNumOpenInThread==2);
@@ -81,16 +81,16 @@
 
     test.Printf(_L("Change to unknown dll \n"));                // Test with non keydata type dll
     res=KeyTranslator->ChangeKeyData(DUMMYDLL);
-    test_Value(res, res == KErrArgument);
+    test(res==KErrArgument);
     
     res=testLib.Load(EKDATA);
-    test_KErrNone(res);
+    test(res==KErrNone);
     testLib.HandleInfo(&handleInfo);
     test(handleInfo.iNumOpenInThread==2);
     testLib.Close();
 
     res=testLib.Load(DUMMYDLL);
-    test_KErrNone(res);
+    test(res==KErrNone);
     testLib.HandleInfo(&handleInfo);
     test(handleInfo.iNumOpenInThread==1);
     testLib.Close();
@@ -106,15 +106,15 @@
     //
     test.Printf(_L("Change to EKDATA.dll\n"));
     res=KeyTranslator->ChangeKeyData(EKDATA);
-    test_KErrNone(res);
+    test(res==KErrNone);
     
     res=testLib.Load(EKDATA);
-    test_KErrNone(res);
+    test(res==KErrNone);
     testLib.HandleInfo(&handleInfo);
     test(handleInfo.iNumOpenInThread==2);
     testLib.Close();
     res=testLib.Load(DUMMYDLL);
-    test_KErrNone(res);
+    test(res==KErrNone);
     testLib.HandleInfo(&handleInfo);
     test(handleInfo.iNumOpenInThread==1);
     testLib.Close();
@@ -134,16 +134,16 @@
 
     test.Printf(_L("Change back to Default KeyData\n"));
     res=KeyTranslator->ChangeKeyData(_L(""));
-    test_KErrNone(res);
+    test(res==KErrNone);
     
     res=testLib.Load(EKDATA);
-    test_KErrNone(res);
+    test(res==KErrNone);
     testLib.HandleInfo(&handleInfo);
     test(handleInfo.iNumOpenInThread==2);
     testLib.Close();
 
     res=testLib.Load(DUMMYDLL);
-    test_KErrNone(res);
+    test(res==KErrNone);
     testLib.HandleInfo(&handleInfo);
     test(handleInfo.iNumOpenInThread==1);
     testLib.Close();
@@ -280,7 +280,7 @@
         test.Printf(_L("SubscribeToSystemChangeNotification(0x%x), attempt:%d\n"), aEventMask, i);   
 
         TInt nRes = aNotifier.Logon(aStatus);
-        test_KErrNone(nRes);
+        test(nRes==KErrNone);
 
         if(aStatus.Int() == KRequestPending)
             break;
@@ -322,11 +322,11 @@
     
     RChangeNotifier notifier;
     TInt res=notifier.Create();
-    test_KErrNone(res);
+    test(res==KErrNone);
     TRequestStatus stat;
     
     res=notifier.Logon(stat);
-    test_KErrNone(res);
+    test(res==KErrNone);
 	// initial value of stat already tested by t_chnot
 
     SubscribeToSystemChangeNotification(notifier, stat, EChangesLocale);
@@ -334,7 +334,7 @@
         test.Printf(_L("Change to US Locale\n"));   
         res=UserSvr::ChangeLocale(ELOCLUS);
         test.Printf(_L("res=%d\n"),res);
-        test_KErrNone(res);
+        test(res==KErrNone);
 
     WaitForSystemChange(notifier, stat, EChangesLocale);
     test(stat.Int() & EChangesLocale);
@@ -350,7 +350,7 @@
         test.Printf(_L("Change to GE Locale\n"));
         res=UserSvr::ChangeLocale(ELOCLGE);
         test.Printf(_L("res=%d\n"),res);
-        test_KErrNone(res);
+        test(res==KErrNone);
 
     WaitForSystemChange(notifier, stat, EChangesLocale);
     test(stat.Int() & EChangesLocale);
@@ -367,7 +367,7 @@
         test.Printf(_L("Load non ELOCL type DLL\n"));    
         res=UserSvr::ChangeLocale(DUMMYDLL);
         test.Printf(_L("res=%d\n"),res);
-        test_Value(res, res == KErrNotSupported);
+        test(res == KErrNotSupported);
     
     //-- ensure that there wasn't locale change
     const TInt KMaxAttempts = 100;
@@ -396,7 +396,7 @@
         test.Printf(_L("Change to US1 Locale\n"));  
         res=UserSvr::ChangeLocale(ELOCLUS1);
         test.Printf(_L("res=%d\n"),res);
-        test_KErrNone(res);
+        test(res==KErrNone);
     
     WaitForSystemChange(notifier, stat, EChangesLocale);
     test(stat.Int() & EChangesLocale);
@@ -437,7 +437,7 @@
         test.Printf(_L("Back to default UK Locale\n"));
         res=UserSvr::ChangeLocale(ELOCL_DEFAULT);
         test.Printf(_L("res=%d\n"),res);
-        test_KErrNone(res);
+        test(res==KErrNone);
     
     WaitForSystemChange(notifier, stat, EChangesLocale);
     test(stat.Int() & EChangesLocale);
@@ -459,12 +459,12 @@
         _LIT(KTestFile, "TEST.TXT");
         RFile file;
         res = file.Replace(TheFs, KTestFile, 0);
-        test_KErrNone(res);
+        test(res == KErrNone);
 
 
         res=UserSvr::ChangeLocale(ELOCLUS);
         test.Printf(_L("res=%d\n"),res);
-        test_KErrNone(res);
+        test(res==KErrNone);
 
 
     WaitForSystemChange(notifier, stat, EChangesLocale);
@@ -477,14 +477,14 @@
 
         _LIT8(KTestData, "Arsenal");
         res = file.Write(KTestData);
-        test_KErrNone(res);
+        test(res==KErrNone);
         file.Close();
 
         res = file.Open(TheFs, KTestFile, 0);
-        test_KErrNone(res);
+        test(res == KErrNone);
         file.Close();
         res = TheFs.Delete(KTestFile);
-        test_KErrNone(res);
+        test(res==KErrNone);
 
     //************************************************
 
@@ -650,11 +650,11 @@
     TExtendedLocale locale;
     locale.LoadLocale(ELOCLUS);
     TInt r = locale.SaveSystemSettings();
-    test_KErrNone(r);
+    test(r == KErrNone);
     testExtendedUS(ELocaleLanguageSettings | ELocaleCollateSetting | ELocaleLocaleSettings | ELocaleTimeDateSettings, locale);
 
     r = locale.SetCurrencySymbol(TPtrC(_S("Leu")));
-    test_KErrNone(r);
+    test(r == KErrNone);
     TCurrencySymbol symbol;
     symbol.Set();
     test(symbol.Compare(TPtrC(_S("Leu"))) == 0);
@@ -668,39 +668,35 @@
     eloclus.Copy(ELOCLUS);
     eloclus.Append(TPtrC(KDLLExtension));
     r = locale.GetLocaleDllName(ELocaleLanguageSettings, dllName);
-    test_KErrNone(r);
-	dllName.UpperCase();
+    test(r == KErrNone);
     test.Printf(_L("dllName looking for %s (%s)\n"), dllName.Ptr(), eloclus.Ptr());
     test(dllName.Find(eloclus) != KErrNotFound);
     
     dllName.FillZ();
 
     r = locale.GetLocaleDllName(ELocaleCollateSetting, dllName);
-    test_KErrNone(r);
-	dllName.UpperCase();
+    test(r == KErrNone);
     test(dllName.Find(eloclus) != KErrNotFound);
     
     dllName.FillZ();
 
     r = locale.GetLocaleDllName(ELocaleLocaleSettings, dllName);
-    test_KErrNone(r);
-	dllName.UpperCase();
+    test(r == KErrNone);
     test(dllName.Find(eloclus) != KErrNotFound);
     
     dllName.FillZ();
 
     r = locale.GetLocaleDllName(ELocaleTimeDateSettings, dllName);
-    test_KErrNone(r);
-	dllName.UpperCase();
+    test(r == KErrNone);
     test(dllName.Find(eloclus) != KErrNotFound);
     
     dllName.FillZ();
 
     r = locale.LoadLocaleAspect(ELocaleLocaleSettings | ELocaleTimeDateSettings, ELOCLGE);
-    test_KErrNone(r);
+    test(r == KErrNone);
 
     r = locale.SaveSystemSettings();
-    test_KErrNone(r);
+    test(r == KErrNone);
 
     testExtendedUS(ELocaleLanguageSettings | ELocaleCollateSetting, locale);
 
@@ -723,29 +719,25 @@
     eloclge.Copy(ELOCLGE);
     eloclge.Append(KDLLExtension);
     r = locale.GetLocaleDllName(ELocaleLanguageSettings, dllName);
-    test_KErrNone(r);
-	dllName.UpperCase();
+    test(r == KErrNone);
     test(dllName.Find(eloclus) != KErrNotFound);
     
     dllName.FillZ();
 
     r = locale.GetLocaleDllName(ELocaleCollateSetting, dllName);
-    test_KErrNone(r);
-	dllName.UpperCase();
+    test(r == KErrNone);
     test(dllName.Find(eloclus) != KErrNotFound);
     
     dllName.FillZ();
 
     r = locale.GetLocaleDllName(ELocaleLocaleSettings, dllName);
-    test_KErrNone(r);
-	dllName.UpperCase();
+    test(r == KErrNone);
     test(dllName.Find(eloclge) != KErrNotFound);
     
     dllName.FillZ();
 
     r = locale.GetLocaleDllName(ELocaleTimeDateSettings, dllName);
-    test_KErrNone(r);
-	dllName.UpperCase();
+    test(r == KErrNone);
     test(dllName.Find(eloclge) != KErrNotFound);
     
     dllName.FillZ();
MCL/sf/os/kernelhwsrv