diff -r 000000000000 -r 08ec8eefde2f persistentstorage/sql/TEST/t_sqlenvdestroy.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/persistentstorage/sql/TEST/t_sqlenvdestroy.cpp	Fri Jan 22 11:06:30 2010 +0200
@@ -0,0 +1,108 @@
+// Copyright (c) 2006-2009 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// SQL security - deleting secure test databases from C:
+// Please, ensure that t_sqlenvdestroy test is executed after the other sql security tests
+// 
+//
+
+#include <e32test.h>
+#include <bautils.h>
+
+RTest TheTest(_L("t_sqlenvdestroy - deleting secure test databases from C:"));
+
+_LIT(KDbCFileName1, "c:\\private\\10281e17\\[21212122]AADb2.db");
+_LIT(KDbCFileName2, "c:\\private\\10281e17\\[21212122]BBDb2.db");
+_LIT(KDbCFileName3, "c:\\private\\10281e17\\[21212125]T_AB.db");
+_LIT(KDbCFileName4, "c:\\private\\10281e17\\[1111CCCC]T_AB.db");
+_LIT(KDbCFileName5, "c:\\private\\10281e17\\[21212125]T_OneDefPolicy.db");
+
+_LIT(KDb1, "c:\\private\\10281e17\\[98765432]t_nosettings.db");
+_LIT(KDb2, "c:\\private\\10281e17\\[98765432]t_emptysettings.db");
+_LIT(KDb3, "c:\\private\\10281e17\\[98765432]t_invversion.db");
+_LIT(KDb4, "c:\\private\\10281e17\\[98765432]t_nocollation.db");
+_LIT(KDb5, "c:\\private\\10281e17\\[98765432]t_longcollation.db");
+_LIT(KDb6, "c:\\private\\10281e17\\[98765432]t_nodefaultpolicy.db");
+_LIT(KDb7, "c:\\private\\10281e17\\[98765432]t_invobject.db");
+_LIT(KDb8, "c:\\private\\10281e17\\[98765432]t_2defaultpolicies.db");
+
+///////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////
+//Test macros and functions
+static void Check(TInt aValue, TInt aExpected, TInt aLine)
+	{
+	if(aValue != aExpected)
+		{
+		RDebug::Print(_L("*** Expected error: %d, got: %d\r\n"), aExpected, aValue);
+		TheTest(EFalse, aLine);
+		}
+	}
+#define TEST2(aValue, aExpected) ::Check(aValue, aExpected, __LINE__)
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+void DoDeleteFile(RFs& aFs, const TDesC& aFilePath)
+	{
+	TInt err = BaflUtils::DeleteFile(aFs, aFilePath);
+	if(err != KErrNone && err != KErrNotFound)
+		{
+		TheTest.Printf(_L("Error %d deleting \"%S\" file.\n"), err, &aFilePath);
+		}
+	}
+
+void DoRun()
+	{
+    RFs fs;
+	TInt err = fs.Connect();
+	TEST2(err, KErrNone);
+
+	TheTest.Start(_L("  @SYMTestCaseID:SYSLIB-SQL-LEGACY-T_SQLENVDESTROY-0001 Delete secure databases from C: "));
+
+	DoDeleteFile(fs, KDbCFileName1);
+	DoDeleteFile(fs, KDbCFileName2);
+	DoDeleteFile(fs, KDbCFileName3);
+	DoDeleteFile(fs, KDbCFileName4);
+	DoDeleteFile(fs, KDbCFileName5);
+
+	DoDeleteFile(fs, KDb1);
+	DoDeleteFile(fs, KDb2);
+	DoDeleteFile(fs, KDb3);
+	DoDeleteFile(fs, KDb4);
+	DoDeleteFile(fs, KDb5);
+	DoDeleteFile(fs, KDb6);
+	DoDeleteFile(fs, KDb7);
+	DoDeleteFile(fs, KDb8);
+
+	fs.Close();
+	}
+
+TInt E32Main()
+    {
+	TheTest.Title();
+
+	CTrapCleanup* tc = CTrapCleanup::New();
+
+	__UHEAP_MARK;
+
+	DoRun();
+
+	__UHEAP_MARKEND;
+
+	TheTest.End();
+	TheTest.Close();
+
+	delete tc;
+
+	User::Heap().Check();
+	return KErrNone;
+    }