--- a/loggingservices/eventlogger/test/src/t_logviewfail2.cpp Thu Aug 19 11:36:21 2010 +0300
+++ b/loggingservices/eventlogger/test/src/t_logviewfail2.cpp Tue Aug 31 16:57:14 2010 +0300
@@ -65,7 +65,8 @@
while(!finished)
{
- __FILE_FAILNEXT(++failCount);
+ TheTest.Printf(_L("%d \r"), failCount);
+ __FILE_FAILNEXT(KErrNoMemory, failCount++);
TBool result = EFalse;
TRAP(error, result = view->SetFilterL(*filter, active->iStatus));
@@ -86,25 +87,25 @@
}
else
{
- if(active->iStatus.Int() != KErrGeneral)
+ if(active->iStatus.Int() != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, active->iStatus.Int());
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, active->iStatus.Int());
}
- TEST2(active->iStatus.Int(), KErrGeneral);
+ TEST2(active->iStatus.Int(), KErrNoMemory);
}
}
else
{
- if(error != KErrGeneral)
+ if(error != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, error);
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, error);
}
- TEST2(error, KErrGeneral);
+ TEST2(error, KErrNoMemory);
}
__FILE_RESET;
}
- TheTest.Printf(_L("Test-1 has succeeded at iteration %d\n"), failCount);
+ TheTest.Printf(_L("\r\nTest-1 has succeeded at iteration %d\n"), failCount);
list->AppendL(filter);
CleanupStack::Pop(); // filter
@@ -120,7 +121,8 @@
while(!finished)
{
- __FILE_FAILNEXT(++failCount);
+ TheTest.Printf(_L("%d \r"), failCount);
+ __FILE_FAILNEXT(KErrNoMemory, failCount++);
TBool result = EFalse;
TRAP(error, result = view->SetFilterL(*list, active->iStatus));
@@ -141,20 +143,20 @@
}
else
{
- if(active->iStatus.Int() != KErrGeneral)
+ if(active->iStatus.Int() != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, active->iStatus.Int());
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, active->iStatus.Int());
}
- TEST2(active->iStatus.Int(), KErrGeneral);
+ TEST2(active->iStatus.Int(), KErrNoMemory);
}
}
else
{
- if(error != KErrGeneral)
+ if(error != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, error);
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, error);
}
- TEST2(error, KErrGeneral);
+ TEST2(error, KErrNoMemory);
}
__FILE_RESET;
@@ -163,7 +165,7 @@
list->ResetAndDestroy();
CleanupStack::PopAndDestroy(4); // list, view, event, active
- TheTest.Printf(_L("Test-2 has succeeded at iteration %d\n"), failCount);
+ TheTest.Printf(_L("\r\nTest-2 has succeeded at iteration %d\n"), failCount);
}
/**
@@ -206,7 +208,8 @@
while(!finished)
{
- __FILE_FAILNEXT(++failCount);
+ TheTest.Printf(_L("%d \r"), failCount);
+ __FILE_FAILNEXT(KErrNoMemory, failCount++);
TBool result = EFalse;
TRAP(error, result = view->SetRecentListL(KLogRecentIncomingCalls, active->iStatus));
@@ -225,25 +228,25 @@
}
else
{
- if(active->iStatus.Int() != KErrGeneral)
+ if(active->iStatus.Int() != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, active->iStatus.Int());
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, active->iStatus.Int());
}
- TEST2(active->iStatus.Int(), KErrGeneral);
+ TEST2(active->iStatus.Int(), KErrNoMemory);
}
}
else
{
- if(error != KErrGeneral)
+ if(error != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, error);
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, error);
}
- TEST2(error, KErrGeneral);
+ TEST2(error, KErrNoMemory);
}
__FILE_RESET;
}
- TheTest.Printf(_L("Test-1 has succeeded at iteration %d\n"), failCount);
+ TheTest.Printf(_L("\r\nTest-1 has succeeded at iteration %d\n"), failCount);
CLogFilterList* list = new(ELeave)CLogFilterList;
CleanupStack::PushL(list);
@@ -257,7 +260,8 @@
while(!finished)
{
- __FILE_FAILNEXT(++failCount);
+ TheTest.Printf(_L("%d \r"), failCount);
+ __FILE_FAILNEXT(KErrNoMemory, failCount++);
TBool result = EFalse;
TRAP(error, result = view->SetRecentListL(KLogRecentIncomingCalls, *filter, active->iStatus));
@@ -276,25 +280,25 @@
}
else
{
- if(active->iStatus.Int() != KErrGeneral)
+ if(active->iStatus.Int() != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, active->iStatus.Int());
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, active->iStatus.Int());
}
- TEST2(active->iStatus.Int(), KErrGeneral);
+ TEST2(active->iStatus.Int(), KErrNoMemory);
}
}
else
{
- if(error != KErrGeneral)
+ if(error != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, error);
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, error);
}
- TEST2(error, KErrGeneral);
+ TEST2(error, KErrNoMemory);
}
__FILE_RESET;
}
- TheTest.Printf(_L("Test-2 has succeeded at iteration %d\n"), failCount);
+ TheTest.Printf(_L("\r\nTest-2 has succeeded at iteration %d\n"), failCount);
list->AppendL(filter);
CleanupStack::Pop(); // filter
@@ -310,7 +314,8 @@
while(!finished)
{
- __FILE_FAILNEXT(++failCount);
+ TheTest.Printf(_L("%d \r"), failCount);
+ __FILE_FAILNEXT(KErrNoMemory, failCount++);
TBool result = EFalse;
TRAP(error, result = view->SetRecentListL(KLogRecentIncomingCalls, *list, active->iStatus));
@@ -329,20 +334,20 @@
}
else
{
- if(active->iStatus.Int() != KErrGeneral)
+ if(active->iStatus.Int() != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, active->iStatus.Int());
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, active->iStatus.Int());
}
- TEST2(active->iStatus.Int(), KErrGeneral);
+ TEST2(active->iStatus.Int(), KErrNoMemory);
}
}
else
{
- if(error != KErrGeneral)
+ if(error != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, error);
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, error);
}
- TEST2(error, KErrGeneral);
+ TEST2(error, KErrNoMemory);
}
__FILE_RESET;
@@ -351,7 +356,7 @@
list->ResetAndDestroy();
CleanupStack::PopAndDestroy(4); // list, view, event, active
- TheTest.Printf(_L("Test-3 has succeeded at iteration %d\n"), failCount);
+ TheTest.Printf(_L("\r\nTest-3 has succeeded at iteration %d\n"), failCount);
}
/**
@@ -409,7 +414,8 @@
while(!finished)
{
- __FILE_FAILNEXT(++failCount);
+ TheTest.Printf(_L("%d \r"), failCount);
+ __FILE_FAILNEXT(KErrNoMemory, failCount++);
TBool result = EFalse;
TRAP(error, result = view->DuplicatesL(*duplicate, active->iStatus));
@@ -428,25 +434,25 @@
}
else
{
- if(active->iStatus.Int() != KErrGeneral)
+ if(active->iStatus.Int() != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, active->iStatus.Int());
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, active->iStatus.Int());
}
- TEST2(active->iStatus.Int(), KErrGeneral);
+ TEST2(active->iStatus.Int(), KErrNoMemory);
}
}
else
{
- if(error != KErrGeneral)
+ if(error != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, error);
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, error);
}
- TEST2(error, KErrGeneral);
+ TEST2(error, KErrNoMemory);
}
__FILE_RESET;
}
- TheTest.Printf(_L("Test-1 has succeeded at iteration %d\n"), failCount);
+ TheTest.Printf(_L("\r\nTest-1 has succeeded at iteration %d\n"), failCount);
CLogFilterList* list = new(ELeave)CLogFilterList;
CleanupStack::PushL(list);
@@ -460,7 +466,8 @@
while(!finished)
{
- __FILE_FAILNEXT(++failCount);
+ TheTest.Printf(_L("%d \r"), failCount);
+ __FILE_FAILNEXT(KErrNoMemory, failCount++);
TBool result = EFalse;
TRAP(error, result = view->DuplicatesL(*duplicate, *filter, active->iStatus));
@@ -479,25 +486,25 @@
}
else
{
- if(active->iStatus.Int() != KErrGeneral)
+ if(active->iStatus.Int() != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, active->iStatus.Int());
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, active->iStatus.Int());
}
- TEST2(active->iStatus.Int(), KErrGeneral);
+ TEST2(active->iStatus.Int(), KErrNoMemory);
}
}
else
{
- if(error != KErrGeneral)
+ if(error != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, error);
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, error);
}
- TEST2(error, KErrGeneral);
+ TEST2(error, KErrNoMemory);
}
__FILE_RESET;
}
- TheTest.Printf(_L("Test-2 has succeeded at iteration %d\n"), failCount);
+ TheTest.Printf(_L("\r\nTest-2 has succeeded at iteration %d\n"), failCount);
list->AppendL(filter);
CleanupStack::Pop(); // filter
@@ -513,7 +520,8 @@
while(!finished)
{
- __FILE_FAILNEXT(++failCount);
+ TheTest.Printf(_L("%d \r"), failCount);
+ __FILE_FAILNEXT(KErrNoMemory, failCount++);
TBool result = EFalse;
TRAP(error, result = view->DuplicatesL(*duplicate, *list, active->iStatus));
@@ -532,20 +540,20 @@
}
else
{
- if(active->iStatus.Int() != KErrGeneral)
+ if(active->iStatus.Int() != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, active->iStatus.Int());
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, active->iStatus.Int());
}
- TEST2(active->iStatus.Int(), KErrGeneral);
+ TEST2(active->iStatus.Int(), KErrNoMemory);
}
}
else
{
- if(error != KErrGeneral)
+ if(error != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, error);
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, error);
}
- TEST2(error, KErrGeneral);
+ TEST2(error, KErrNoMemory);
}
__FILE_RESET;
@@ -554,7 +562,7 @@
list->ResetAndDestroy();
CleanupStack::PopAndDestroy(5); // list, duplicate, view, event, active
- TheTest.Printf(_L("Test-3 has succeeded at iteration %d\n"), failCount);
+ TheTest.Printf(_L("\r\nTest-3 has succeeded at iteration %d\n"), failCount);
}
/**
@@ -601,7 +609,8 @@
TEST(view->CountL() > 1);
event->CopyL(view->Event());
- __FILE_FAILNEXT(++failCount);
+ TheTest.Printf(_L("%d \r"), failCount);
+ __FILE_FAILNEXT(KErrNoMemory, failCount++);
TBool result = EFalse;
TRAP(error, result = view->NextL(active->iStatus));
@@ -620,25 +629,25 @@
}
else
{
- if(active->iStatus.Int() != KErrGeneral)
+ if(active->iStatus.Int() != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, active->iStatus.Int());
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, active->iStatus.Int());
}
- TEST2(active->iStatus.Int(), KErrGeneral);
+ TEST2(active->iStatus.Int(), KErrNoMemory);
}
}
else
{
- if(error != KErrGeneral)
+ if(error != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, error);
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, error);
}
- TEST2(error, KErrGeneral);
+ TEST2(error, KErrNoMemory);
}
__FILE_RESET;
}
- TheTest.Printf(_L("Test-1 (\"View Next\") has succeeded at iteration %d\n"), failCount);
+ TheTest.Printf(_L("\r\nTest-1 (\"View Next\") has succeeded at iteration %d\n"), failCount);
failCount = 0;
finished = EFalse;
@@ -658,7 +667,8 @@
event->CopyL(view->Event());
- __FILE_FAILNEXT(++failCount);
+ TheTest.Printf(_L("%d \r"), failCount);
+ __FILE_FAILNEXT(KErrNoMemory, failCount++);
TBool result = EFalse;
TRAP(error, result = view->PreviousL(active->iStatus));
@@ -677,25 +687,25 @@
}
else
{
- if(active->iStatus.Int() != KErrGeneral)
+ if(active->iStatus.Int() != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, active->iStatus.Int());
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, active->iStatus.Int());
}
- TEST2(active->iStatus.Int(), KErrGeneral);
+ TEST2(active->iStatus.Int(), KErrNoMemory);
}
}
else
{
- if(error != KErrGeneral)
+ if(error != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, error);
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, error);
}
- TEST2(error, KErrGeneral);
+ TEST2(error, KErrNoMemory);
}
__FILE_RESET;
}
- TheTest.Printf(_L("Test-2 (\"View Previous\") has succeeded at iteration %d\n"), failCount);
+ TheTest.Printf(_L("\r\nTest-2 (\"View Previous\") has succeeded at iteration %d\n"), failCount);
failCount = 0;
finished = EFalse;
@@ -715,7 +725,8 @@
event->CopyL(view->Event());
- __FILE_FAILNEXT(++failCount);
+ TheTest.Printf(_L("%d \r"), failCount);
+ __FILE_FAILNEXT(KErrNoMemory, failCount++);
TBool result = EFalse;
TRAP(error, result = view->FirstL(active->iStatus));
@@ -734,25 +745,25 @@
}
else
{
- if(active->iStatus.Int() != KErrGeneral)
+ if(active->iStatus.Int() != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, active->iStatus.Int());
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, active->iStatus.Int());
}
- TEST2(active->iStatus.Int(), KErrGeneral);
+ TEST2(active->iStatus.Int(), KErrNoMemory);
}
}
else
{
- if(error != KErrGeneral)
+ if(error != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, error);
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, error);
}
- TEST2(error, KErrGeneral);
+ TEST2(error, KErrNoMemory);
}
__FILE_RESET;
}
- TheTest.Printf(_L("Test-3 (\"View First\") has succeeded at iteration %d\n"), failCount);
+ TheTest.Printf(_L("\r\nTest-3 (\"View First\") has succeeded at iteration %d\n"), failCount);
failCount = 0;
finished = EFalse;
@@ -772,7 +783,8 @@
event->CopyL(view->Event());
- __FILE_FAILNEXT(++failCount);
+ TheTest.Printf(_L("%d \r"), failCount);
+ __FILE_FAILNEXT(KErrNoMemory, failCount++);
TBool result = EFalse;
TRAP(error, result = view->LastL(active->iStatus));
@@ -791,20 +803,20 @@
}
else
{
- if(active->iStatus.Int() != KErrGeneral)
+ if(active->iStatus.Int() != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, active->iStatus.Int());
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, active->iStatus.Int());
}
- TEST2(active->iStatus.Int(), KErrGeneral);
+ TEST2(active->iStatus.Int(), KErrNoMemory);
}
}
else
{
- if(error != KErrGeneral)
+ if(error != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, error);
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, error);
}
- TEST2(error, KErrGeneral);
+ TEST2(error, KErrNoMemory);
}
__FILE_RESET;
@@ -812,7 +824,7 @@
CleanupStack::PopAndDestroy(4); // filter, view, event, active
- TheTest.Printf(_L("Test-4 (\"View Last\") has succeeded at iteration %d\n"), failCount);
+ TheTest.Printf(_L("\r\nTest-4 (\"View Last\") has succeeded at iteration %d\n"), failCount);
}
/**
@@ -856,7 +868,8 @@
while(!finished)
{
- __FILE_FAILNEXT(++failCount);
+ TheTest.Printf(_L("%d \r"), failCount);
+ __FILE_FAILNEXT(KErrNoMemory, failCount++);
TInt result = 0;
TRAP(error, result = view->CountL());
@@ -868,11 +881,11 @@
}
else
{
- if(error != KErrGeneral)
+ if(error != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, error);
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, error);
}
- TEST2(error, KErrGeneral);
+ TEST2(error, KErrNoMemory);
}
__FILE_RESET;
@@ -880,7 +893,7 @@
CleanupStack::PopAndDestroy(4); // filter, view, event, active
- TheTest.Printf(_L("The test (\"View Count\") has succeeded at iteration %d\n"), failCount);
+ TheTest.Printf(_L("\r\nThe test (\"View Count\") has succeeded at iteration %d\n"), failCount);
}
/**
@@ -943,14 +956,9 @@
while(!finished)
{
- // This failCount value causes DBMS to return KErrCorrupt. Apparently this
- // can't actually occur in real life, so we skip this value.
- if (failCount == 9)
- {
- failCount++;
- }
- __FILE_FAILNEXT(++failCount);
-
+ TheTest.Printf(_L("%d \r"), failCount);
+ __FILE_FAILNEXT(KErrNoMemory, failCount++);
+
TRAP(error, view->RemoveL(view->Event().Id()));
__FILE_RESET;
@@ -964,7 +972,7 @@
CActiveScheduler::Start();
if(active->iStatus.Int() != KErrNone)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, active->iStatus.Int());
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, active->iStatus.Int());
}
TEST2(active->iStatus.Int(), KErrNone);
@@ -972,16 +980,24 @@
}
else
{
- if(error != KErrGeneral)
+ if(error != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, error);
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, error);
}
- TEST2(error, KErrGeneral);
+ TEST2(error, KErrNoMemory);
+ }
+ // This failCount value causes DBMS to return KErrCorrupt. Apparently this
+ // can't actually occur in real life, so we skip this value.
+ if (failCount > 9)
+ {
+ finished = ETrue;
+ TRAP(error, view->RemoveL(view->Event().Id()));
+ TEST2(error, KErrNone);
}
}
CleanupStack::PopAndDestroy(3); // view, event, active
- TheTest.Printf(_L("The test (\"View Remove\") has succeeded at iteration %d\n"), failCount);
+ TheTest.Printf(_L("\r\nThe test (\"View Remove\") has succeeded at iteration %d\n"), failCount);
}
/**
@@ -1055,14 +1071,15 @@
while(!finished)
{
- __FILE_FAILNEXT(++failCount);
+ TheTest.Printf(_L("%d \r"), failCount);
+ __FILE_FAILNEXT(KErrNoMemory, failCount++);
- if(failCount == 7)
+ if(failCount == 17)
{
__FILE_RESET;
break;
}
-
+
TRAP(error, duplicate->RemoveL(duplicate->Event().Id()));
__FILE_RESET;
@@ -1076,7 +1093,7 @@
CActiveScheduler::Start();
if(active->iStatus.Int() != KErrNone)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, active->iStatus.Int());
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, active->iStatus.Int());
}
TEST2(active->iStatus.Int(), KErrNone);
@@ -1084,16 +1101,16 @@
}
else
{
- if(error != KErrGeneral)
+ if(error != KErrNoMemory)
{
- TheTest.Printf(_L("Iter.step: %d, error %d\n"), failCount, error);
+ TheTest.Printf(_L("\r\nIter.step: %d, error %d\n"), failCount, error);
}
- TEST2(error, KErrGeneral);
+ TEST2(error, KErrNoMemory);
}
}
CleanupStack::PopAndDestroy(4); // duplicate, view, event, active
- TheTest.Printf(_L("The test (\"View Remove Duplicates\") has succeeded at iteration %d\n"), failCount);
+ TheTest.Printf(_L("\r\nThe test (\"View Remove Duplicates\") has succeeded at iteration %d\n"), failCount);
}
void doTestsL()