--- a/persistentstorage/sqlite3api/TEST/sqliteTestUtl.cpp Thu Aug 19 11:36:21 2010 +0300
+++ b/persistentstorage/sqlite3api/TEST/sqliteTestUtl.cpp Tue Aug 31 16:57:14 2010 +0300
@@ -21,40 +21,65 @@
static TBuf8<500> TheBuf8;
static TBuf16<500> TheBuf16;
-static RTest TheTest(_L("t_sqliteapi test"));
+static RTest* TheTest;
-extern "C" void TestTitle(void)
+extern "C" void TestOpen(const char* title)
{
- TheTest.Title();
+ TPtrC8 p((const unsigned char*)title);
+ TheBuf16.Copy(p);
+ TheTest = new RTest(TheBuf16);
+ }
+
+extern "C" void TestTitle()
+ {
+ TheTest->Title();
}
extern "C" void TestStart(const char* title)
{
TPtrC8 p((const unsigned char*)title);
TheBuf16.Copy(p);
- TheTest.Start(TheBuf16);
+ TheTest->Start(TheBuf16);
}
extern "C" void TestNext(const char* title)
{
TPtrC8 p((const unsigned char*)title);
TheBuf16.Copy(p);
- TheTest.Next(TheBuf16);
+ TheTest->Next(TheBuf16);
}
extern "C" void TestClose(void)
{
- TheTest.Close();
+ TheTest->Close();
+ delete TheTest;
}
extern "C" void TestEnd(void)
{
- TheTest.End();
+ TheTest->End();
}
extern "C" void TestAbort(int aLine)
{
- TheTest(0, aLine);
+ TheTest->operator()(0, aLine);
+ }
+
+extern "C" void TestTestLine(int aResult, int aLine)
+ {
+ TheTest->operator()(aResult, aLine);
+ }
+
+extern "C" void TestTest(int aResult)
+ {
+ TheTest->operator()(aResult);
+ }
+
+extern "C" void TestPrintf(const char* title)
+ {
+ TPtrC8 p((const unsigned char*)title);
+ TheBuf16.Copy(p);
+ TheTest->Printf(TheBuf16);
}
extern "C" void TestHeapMark(void)
@@ -115,9 +140,9 @@
{
RFs TheFs;
TInt err = TheFs.Connect();
- TheTest(err == KErrNone);
+ TheTest->operator()(err == KErrNone);
err = TheFs.CreatePrivatePath(EDriveC);
TheFs.Close();
- TheTest(err == KErrNone || err == KErrAlreadyExists);
+ TheTest->operator()(err == KErrNone || err == KErrAlreadyExists);
}