diff -r 8dc8494f1e0e -r 839ea9debada persistentstorage/sql/TEST/t_sqlload.cpp --- a/persistentstorage/sql/TEST/t_sqlload.cpp Wed Sep 15 14:05:58 2010 +0300 +++ b/persistentstorage/sql/TEST/t_sqlload.cpp Wed Oct 13 16:30:44 2010 +0300 @@ -60,9 +60,6 @@ //Binary data length const TInt KBinDataLen = 2003; -//StatementMaxNumberTest() time limit in seconds. -const TInt KTestTimeLimit = 60;//seconds - /////////////////////////////////////////////////////////////////////////////////////// void DeleteTestFiles() @@ -127,8 +124,8 @@ /////////////////////////////////////////////////////////////////////////////////////// //StatementMaxNumberTest() timeouts in WDP builds. -//This function is used return the seconds passed from the start of the test case. -TTimeIntervalSeconds ExecutionTimeSeconds() +//This function is used to check whether the time limit is reaqched or not. +TBool IsTimeLimitReached() { struct TStartTime { @@ -140,6 +137,7 @@ }; static TStartTime startTime; + const TInt KTestTimeLimit = 150;//seconds TTime currTime; currTime.HomeTime(); @@ -147,7 +145,7 @@ TTimeIntervalSeconds s; TInt err = currTime.SecondsFrom(startTime.iTime, s); TEST2(err, KErrNone); - return s; + return s.Int() > KTestTimeLimit; } void CreateTestDir() @@ -616,9 +614,8 @@ if((idx % 100) == 0) { GetHomeTimeAsString(time); - TTimeIntervalSeconds s = ExecutionTimeSeconds(); - TheTest.Printf(_L("=== %S: Create % 5d statements. %d seconds.\r\n"), &time, idx + 1, s.Int()); - if(s.Int() > KTestTimeLimit) + TheTest.Printf(_L("=== %S: Create % 5d statements\r\n"), &time, idx + 1); + if(IsTimeLimitReached()) { TheTest.Printf(_L("=== %S: The time limit reached.\r\n"), &time); ++idx;//The idx-th statement is valid, the statement count is idx + 1. @@ -652,13 +649,12 @@ TEST2(err, KSqlAtRow); err = stmt[idx].Next(); TEST2(err, KSqlAtEnd); - GetHomeTimeAsString(time); - TTimeIntervalSeconds s = ExecutionTimeSeconds(); if((j % 100) == 0) { - TheTest.Printf(_L("=== %S: % 5d statements processed. %d seconds.\r\n"), &time, j + 1, s.Int()); + GetHomeTimeAsString(time); + TheTest.Printf(_L("=== %S: % 5d statements processed\r\n"), &time, j + 1); } - if(s.Int() > KTestTimeLimit) + if(IsTimeLimitReached()) { TheTest.Printf(_L("=== %S: The time limit reached.\r\n"), &time); break;