--- a/persistentstorage/dbms/tdbms/t_dbsql.cpp	Mon Sep 27 11:59:56 2010 +0100
+++ b/persistentstorage/dbms/tdbms/t_dbsql.cpp	Tue Oct 19 16:26:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1998-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -66,23 +66,23 @@
 		TEntry entry;
 		if(fsSession.Entry(KTestDatabase, entry) == KErrNone)
 			{
-			RDebug::Print(_L("Deleting \"%S\" file.\n"), &KTestDatabase);
+			TheTest.Printf(_L("Deleting \"%S\" file.\n"), &KTestDatabase);
 			err = fsSession.SetAtt(KTestDatabase, 0, KEntryAttReadOnly);
 			if(err != KErrNone)
 				{
-				RDebug::Print(_L("Error %d changing \"%S\" file attributes.\n"), err, &KTestDatabase);
+				TheTest.Printf(_L("Error %d changing \"%S\" file attributes.\n"), err, &KTestDatabase);
 				}
 			err = fsSession.Delete(KTestDatabase);
 			if(err != KErrNone)
 				{
-				RDebug::Print(_L("Error %d deleting \"%S\" file.\n"), err, &KTestDatabase);
+				TheTest.Printf(_L("Error %d deleting \"%S\" file.\n"), err, &KTestDatabase);
 				}
 			}
 		fsSession.Close();
 		}
 	else
 		{
-		RDebug::Print(_L("Error %d connecting file session. File: %S.\n"), err, &KTestDatabase);
+		TheTest.Printf(_L("Error %d connecting file session. File: %S.\n"), err, &KTestDatabase);
 		}
 	}
 
@@ -105,7 +105,7 @@
 	{
 	if(!aValue)
 		{
-        RDebug::Print(_L("*** Expression evaluated to false\r\n"));
+        TheTest.Printf(_L("*** Expression evaluated to false\r\n"));
 		::TestCleanup();
 		TheTest(EFalse, aLine);
 		}
@@ -115,7 +115,7 @@
 	{
 	if(aValue != aExpected)
 		{
-		RDebug::Print(_L("*** Expected error: %d, got: %d\r\n"), aExpected, aValue);
+		TheTest.Printf(_L("*** Expected error: %d, got: %d\r\n"), aExpected, aValue);
 		::TestCleanup();
 		TheTest(EFalse, aLine);
 		}
@@ -183,40 +183,40 @@
 	{
     if(aLog)
         {
-        TheTest.Printf(_L("TestPredicateBase::Test\r\n"));
+    	TheTest.Printf(_L("TestPredicateBase::Test\r\n"));
         }
 	TheTable.Close();
 	TInt r=TheDatabase.Commit();
 	if(aLog)
         {
-        TheTest.Printf(_L("Commit %d\r\n"), r);
+		TheTest.Printf(_L("Commit %d\r\n"), r);
         }
 	TEST2(r, KErrNone);
 	TRAPD(errCode, TestViewL(aTest,aCount,aRows, aLog));
 	if(aLog)
         {
-        TheTest.Printf(_L("TestViewL %d"), errCode);
+		TheTest.Printf(_L("TestViewL %d"), errCode);
         }
 
 	TEST2(errCode, KErrNone);
 	r=TheDatabase.Execute(_L("CREATE INDEX Key ON Compare (Test)"));
    if(aLog)
         {
-        TheTest.Printf(_L("Execute %d"), r);
+	   TheTest.Printf(_L("Execute %d"), r);
         }
 
 	TEST2(r, KErrNone);
 	TRAP(errCode,TestViewL(aTest,aCount,aRows, aLog));
 	if(aLog)
         {
-        TheTest.Printf(_L("TestViewL %d"), errCode);
+		TheTest.Printf(_L("TestViewL %d"), errCode);
 	    }
 
 	TEST2(errCode, KErrNone);
 	r=TheDatabase.Execute(_L("DROP TABLE Compare"));
     if(aLog)
         {
-        TheTest.Printf(_L("Execute %d"), r);
+    	TheTest.Printf(_L("Execute %d"), r);
         }
 
 	TEST2(r, KErrNone);
@@ -232,7 +232,7 @@
 		TInt r=TheView.Prepare(TheDatabase,TheSql,TheView.EReadOnly);
 		if(r!=KErrNone)
 		    {
-            TheTest.Printf(_L("Prepare r= %d aCount= %d  statement %S\r\n"), r, aCount, &TheSql);
+			TheTest.Printf(_L("Prepare r= %d aCount= %d  statement %S\r\n"), r, aCount, &TheSql);
 		    }
 		TEST2(r, KErrNone);
 		TBool ignoreRow0=TheView.Unevaluated();
@@ -264,7 +264,7 @@
 		{
         if(aLog)
             {
-            TheTest.Printf(_L("row = %d"), row);
+        	TheTest.Printf(_L("row = %d"), row);
             }
 		TheTable.InsertL();
 		TEST(TheTable.ColUint(1)==TUint(row));
@@ -788,7 +788,7 @@
 
 static void ReadDesc(TDes& aDes, const TDesC& aFilename, RFs& aFs)
 	{
-    TheTest.Printf(_L("---ReadDesc(), aFilename=%S\r\n"), &aFilename);
+	TheTest.Printf(_L("---ReadDesc(), aFilename=%S\r\n"), &aFilename);
 	RFile file;
 	TInt err = file.Open(aFs, aFilename, EFileRead);
 	TheTest.Printf(_L("Open file aFilename=%S err = %d\r\n"), &aFilename, err);