--- a/loggingservices/eventlogger/test/src/t_logfile.cpp	Tue Aug 31 16:57:14 2010 +0300
+++ b/loggingservices/eventlogger/test/src/t_logfile.cpp	Wed Sep 01 12:39:58 2010 +0100
@@ -198,9 +198,7 @@
 
 	while(!finished)
 		{
-		TheTest.Printf(_L("%d\r\n"), failCount);
-
-        if(failCount > 8)
+        if(failCount == 4)
             {
             TRAP(error, client = CLogClient::NewL(theFs));
             TEST2(error, KErrNone);
@@ -208,8 +206,8 @@
             finished = ETrue;
             continue;
             }
-		
-		__FILE_FAILNEXT(KErrNoMemory, failCount++);
+
+		__FILE_FAILNEXT(++failCount);
 
 		TRAP(error, client = CLogClient::NewL(theFs));
 
@@ -222,13 +220,13 @@
 			}
 		else
 			{
-			TEST2(error, KErrNoMemory);
+			TEST2(error, KErrGeneral);
 			TestUtils::DeleteDatabaseL();
 			}
 		}
 
 	delete client;
-	TheTest.Printf(_L("\r\nThe test has succeeded at iteration %d\n"), failCount);
+	TheTest.Printf(_L("The test has succeeded at iteration %d\n"), failCount);
 	}
 
 /**
@@ -260,7 +258,8 @@
 	while(!finished)
 		{
 		error = KErrNone;
-        if(failCount == 8)
+
+        if(failCount == 4)
             {
             aClient.AddEventType(*type, active->iStatus);
             active->StartL();
@@ -269,11 +268,9 @@
             finished = ETrue;
             continue;
             }
+		
+		__FILE_FAILNEXT(++failCount);
 
-		TheTest.Printf(_L("%d  \r"), failCount);
-        
-		__FILE_FAILNEXT(KErrNoMemory, failCount++);
-		
 		aClient.AddEventType(*type, active->iStatus);
 	
 		active->StartL();
@@ -286,7 +283,7 @@
 
 		__FILE_RESET;
 
-		if (error == KErrNoMemory)
+		if (error == KErrGeneral)
 			{
 			active->StartL();
 			aClient.GetEventType(*type, active->iStatus);
@@ -304,7 +301,7 @@
 	TEST2(active->iStatus.Int(), KErrAlreadyExists);
 
 	CleanupStack::PopAndDestroy(2); // active, type
-	TheTest.Printf(_L("\r\nThe test has succeeded at iteration %d\n"), failCount);
+	TheTest.Printf(_L("The test has succeeded at iteration %d\n"), failCount);
 	}
 
 /**
@@ -332,8 +329,7 @@
 
 	while(!finished)
 		{
-		TheTest.Printf(_L("%d  \r"), failCount);
-		__FILE_FAILNEXT(KErrNoMemory, failCount++);
+		__FILE_FAILNEXT(++failCount);
 
 		aClient.GetEventType(*type, active->iStatus);
 
@@ -344,7 +340,7 @@
 			finished = ETrue;
 		else
 			{
-			TEST2(active->iStatus.Int(), KErrNoMemory);
+			TEST2(active->iStatus.Int(), KErrGeneral);
 			TEST(type->Description() == KNullDesC);
 			}
 
@@ -356,7 +352,7 @@
 	TEST(type->LoggingEnabled());
 
 	CleanupStack::PopAndDestroy(2); // active, type
-	TheTest.Printf(_L("\r\nThe test has succeeded at iteration %d\n"), failCount);
+	TheTest.Printf(_L("The test has succeeded at iteration %d\n"), failCount);
 	}
 
 /**
@@ -390,7 +386,7 @@
 		type->SetDescription(KTestEventDesc2);
 		type->SetLoggingEnabled(EFalse);
 
-        if(failCount == 8)
+        if(failCount == 3)
             {
             aClient.ChangeEventType(*type, active->iStatus);
             active->StartL();
@@ -400,8 +396,7 @@
             continue;
             }
 		
-		TheTest.Printf(_L("%d  \r"), failCount);
-		__FILE_FAILNEXT(KErrNoMemory, failCount++);
+		__FILE_FAILNEXT(++failCount);
 
 		aClient.ChangeEventType(*type, active->iStatus);
 
@@ -415,7 +410,7 @@
 
 		__FILE_RESET;
 
-		if (error == KErrNoMemory)
+		if (error == KErrGeneral)
 			{
 			active->StartL();
 			aClient.GetEventType(*type, active->iStatus);
@@ -441,7 +436,7 @@
 	TEST(type->LoggingEnabled() == EFalse);
 
 	CleanupStack::PopAndDestroy(2); // type, active
-	TheTest.Printf(_L("\r\nThe test has succeeded at iteration %d\n"), failCount);
+	TheTest.Printf(_L("The test has succeeded at iteration %d\n"), failCount);
 	}
 
 /**
@@ -472,7 +467,7 @@
 		{
 		error = KErrNone;
 
-        if(failCount == 8)
+        if(failCount == 3)
             {
             aClient.DeleteEventType(KTestEventUid, active->iStatus);
             active->StartL();
@@ -482,8 +477,7 @@
             continue;
             }
 		
-		TheTest.Printf(_L("%d  \r"), failCount);
-		__FILE_FAILNEXT(KErrNoMemory, failCount++);
+		__FILE_FAILNEXT(++failCount);
 
 		aClient.DeleteEventType(KTestEventUid, active->iStatus);
 
@@ -497,7 +491,7 @@
 
 		__FILE_RESET;
 
-		if (error == KErrNoMemory)
+		if (error == KErrGeneral)
 			{
 			active->StartL();
 			aClient.GetEventType(*type, active->iStatus);
@@ -514,7 +508,7 @@
 	TEST2(active->iStatus.Int(), KErrNotFound);
 
 	CleanupStack::PopAndDestroy(2); // type, active
-	TheTest.Printf(_L("\r\nThe test has succeeded at iteration %d\n"), failCount);
+	TheTest.Printf(_L("The test has succeeded at iteration %d\n"), failCount);
 	}
 
 /**
@@ -574,7 +568,7 @@
 		{
 		error = KErrNone;
 
-        if(failCount == 8)
+        if(failCount == 3)
             {
             aClient.AddEvent(*event, active->iStatus);
             active->StartL();
@@ -584,8 +578,7 @@
             continue;
             }
 
-		TheTest.Printf(_L("%d  \r"), failCount);
-		__FILE_FAILNEXT(KErrNoMemory, failCount++);
+		__FILE_FAILNEXT(++failCount);
 		aClient.AddEvent(*event, active->iStatus);
 
 		active->StartL();
@@ -598,8 +591,9 @@
 
 		__FILE_RESET;
 
-		if (error == KErrNoMemory)
+		if (error == KErrGeneral)
 			{
+			TEST2(error, KErrGeneral);
 			event->SetId(0);
 
 			active->StartL();
@@ -623,7 +617,7 @@
 	TEST2(active->iStatus.Int(), KErrNone);
 
 	CleanupStack::PopAndDestroy(3); // event, active, type
-	TheTest.Printf(_L("\r\nThe test has succeeded at iteration %d\n"), failCount);
+	TheTest.Printf(_L("The test has succeeded at iteration %d\n"), failCount);
 	}
 
 /**
@@ -652,8 +646,7 @@
 
 	while(!finished)
 		{
-		TheTest.Printf(_L("%d  \r"), failCount);
-		__FILE_FAILNEXT(KErrNoMemory, failCount++);
+		__FILE_FAILNEXT(++failCount);
 		aClient.GetEvent(*event, active->iStatus);
 
 		active->StartL();
@@ -662,7 +655,7 @@
 		if (active->iStatus == KErrNone)
 			finished = ETrue;
 		else
-			TEST2(active->iStatus.Int(), KErrNoMemory);
+			TEST2(active->iStatus.Int(), KErrGeneral);
 
 		__FILE_RESET;
 		}
@@ -683,7 +676,7 @@
 	TEST(event->Data() == KTestData1);
 
 	CleanupStack::PopAndDestroy(2); // event, active
-	TheTest.Printf(_L("\r\nThe test has succeeded at iteration %d\n"), failCount);
+	TheTest.Printf(_L("The test has succeeded at iteration %d\n"), failCount);
 	}
 
 /**
@@ -729,7 +722,7 @@
 		event->SetLink(KTestLink2);
 		event->SetDataL(KTestData2);
 
-        if(failCount == 14)
+        if(failCount == 3)
             {
             aClient.ChangeEvent(*event, active->iStatus);
             active->StartL();
@@ -739,8 +732,7 @@
             continue;
             }
 		
-		TheTest.Printf(_L("%d  \r"), failCount);
-		__FILE_FAILNEXT(KErrNoMemory, failCount++);
+		__FILE_FAILNEXT(++failCount);
 
 		aClient.ChangeEvent(*event, active->iStatus);
 
@@ -753,13 +745,13 @@
 
 		__FILE_RESET;
 
-		if (error == KErrNoMemory)
+		if (error == KErrGeneral)
 			{
 			active->StartL();
 			aClient.GetEvent(*event, active->iStatus);
 			CActiveScheduler::Start();
 			if (active->iStatus != KErrNone) 
-			    TheTest.Printf(_L("\nerror code:%d failcount:%d\n"),active->iStatus.Int(),failCount);
+			    TheTest.Printf(_L("error code:%d failcount:%d\n"),active->iStatus.Int(),failCount);
 			TEST2(active->iStatus.Int(), KErrNone);
 
 			TEST(event->Id() == 0);
@@ -802,7 +794,7 @@
 	TEST(event->Data() == KTestData2);
 
 	CleanupStack::PopAndDestroy(2); // event, active
-	TheTest.Printf(_L("\r\nThe test has succeeded at iteration %d\n"), failCount);
+	TheTest.Printf(_L("The test has succeeded at iteration %d\n"), failCount);
 	}
 
 /**
@@ -834,7 +826,7 @@
 		{
 		error = KErrNone;
 
-        if(failCount == 10)
+        if(failCount == 6)
             {
             aClient.DeleteEvent(0, active->iStatus);
             active->StartL();
@@ -844,8 +836,7 @@
             continue;
             }
 		
-		TheTest.Printf(_L("%d  \r"), failCount);
-		__FILE_FAILNEXT(KErrNoMemory, failCount++);
+		__FILE_FAILNEXT(++failCount);
 
 		aClient.DeleteEvent(0, active->iStatus);
 
@@ -859,7 +850,7 @@
 
 		__FILE_RESET;
 
-		if (error == KErrNoMemory)
+		if (error == KErrGeneral)
 			{
 			active->StartL();
 			aClient.GetEvent(*event, active->iStatus);
@@ -876,7 +867,7 @@
 	TEST2(active->iStatus.Int(), KErrNotFound);
 
 	CleanupStack::PopAndDestroy(2); // event, active
-	TheTest.Printf(_L("\r\nThe test has succeeded at iteration %d\n"), failCount);
+	TheTest.Printf(_L("The test has succeeded at iteration %d\n"), failCount);
 	}
 
 /**
@@ -906,8 +897,7 @@
 
 	while(!finished)
 		{
-		TheTest.Printf(_L("%d  \r"), failCount);
-		__FILE_FAILNEXT(KErrNoMemory, failCount++);
+		__FILE_FAILNEXT(++failCount);
 		aClient.GetConfig(config, active->iStatus);
 
 		active->StartL();
@@ -916,7 +906,7 @@
 		if (active->iStatus == KErrNone)
 			finished = ETrue;
 		else
-			TEST2(active->iStatus.Int(), KErrNoMemory);
+			TEST2(active->iStatus.Int(), KErrGeneral);
 
 		__FILE_RESET;
 		}
@@ -926,7 +916,7 @@
 	TEST(config.iMaxRecentLogSize > 0);
 
 	CleanupStack::PopAndDestroy(); // active
-	TheTest.Printf(_L("\r\nThe test has succeeded at iteration %d\n"), failCount);
+	TheTest.Printf(_L("The test has succeeded at iteration %d\n"), failCount);
 	}
 
 /**
@@ -966,7 +956,7 @@
 		config.iMaxRecentLogSize = KTestMaxRecentLogSize;
 		config.iMaxEventAge = KTestMaxEventAge;
 
-        if(failCount == 11)
+        if(failCount == 4)
             {
             aClient.ChangeConfig(config, active->iStatus);
             active->StartL();
@@ -976,8 +966,7 @@
             continue;
             }
 		
-		TheTest.Printf(_L("%d  \r"), failCount);
-		__FILE_FAILNEXT(KErrNoMemory, failCount++);
+		__FILE_FAILNEXT(++failCount);
 
 		aClient.ChangeConfig(config, active->iStatus);
 
@@ -991,7 +980,7 @@
 		
 		__FILE_RESET;
 
-		if (error == KErrNoMemory)
+		if (error == KErrGeneral)
 			{
 			active->StartL();
 			aClient.GetConfig(config, active->iStatus);
@@ -1011,7 +1000,7 @@
 	TEST(config.iMaxEventAge == KTestMaxEventAge);
 
 	CleanupStack::PopAndDestroy(); // active
-	TheTest.Printf(_L("\r\nThe test has succeeded at iteration %d\n"), failCount);
+	TheTest.Printf(_L("The test has succeeded at iteration %d\n"), failCount);
 	}
 
 /**
@@ -1035,8 +1024,7 @@
 
 	while(!finished)
 		{
-		TheTest.Printf(_L("%d  \r"), failCount);
-		__FILE_FAILNEXT(KErrNoMemory, failCount++);
+		__FILE_FAILNEXT(++failCount);
 
 		error = aClient.GetString(str, R_LOG_DIR_IN);
 
@@ -1049,11 +1037,11 @@
 			}
 		else
 			{
-			TEST2(error, KErrNoMemory);
+			TEST2(error, KErrGeneral);
 			TEST(str.Length() == 0);
 			}
 		}
-	TheTest.Printf(_L("\r\nThe test has succeeded at iteration %d\n"), failCount);
+	TheTest.Printf(_L("The test has succeeded at iteration %d\n"), failCount);
 	}
 
 /**
@@ -1156,8 +1144,7 @@
 
 	while(!finished)
 		{
-		TheTest.Printf(_L("%d  \r"), failCount);
-		__FILE_FAILNEXT(KErrNoMemory, failCount++);
+		__FILE_FAILNEXT(++failCount);
 
 #ifdef SYMBIAN_ENABLE_EVENTLOGGER_DUALSIM	
 		if(aUseSimId)
@@ -1178,7 +1165,7 @@
 		if (active->iStatus == KErrNone)
 			finished = ETrue;
 		else
-			TEST2(active->iStatus.Int(), KErrNoMemory);
+			TEST2(active->iStatus.Int(), KErrGeneral);
 		}
 
 	active->StartL();
@@ -1219,7 +1206,7 @@
 	TEST2(active->iStatus.Int(), KErrNotFound);
 
 	CleanupStack::PopAndDestroy(5); // event4, event3, event2, event1, active
-	TheTest.Printf(_L("\r\nThe test has succeeded at iteration %d\n"), failCount);
+	TheTest.Printf(_L("The test has succeeded at iteration %d\n"), failCount);
 	}
 
 void doTestsL()
@@ -1229,7 +1216,7 @@
     TheTest.Start(_L("Construction + create db"));
 	TestUtils::DeleteDatabaseL();
 	TestConstructionL(); // Creates database
-	TheTest.Next(_L("Construction + open db"));
+    TheTest.Next(_L("Construction + open db"));
 	TestConstructionL(); // Opens existing database
 	TestUtils::DeleteDatabaseL();
 	theLog.Write(_L8("Test 1 OK\n"));