Adding test to allow testing of ATTACH and DETACH commands in SQLCipher for Android

Author: developernotes

assets/icudt44l.zip

@@ -0,0 +1,39 @@
+package net.zetetic.tests;
+
+import info.guardianproject.database.sqlcipher.SQLiteDatabase;
+import net.zetetic.ZeteticApplication;
+
+import java.io.File;
+
+public class AttachDatabaseTest extends SQLCipherTest {
+    @Override
+    public boolean execute(SQLiteDatabase encryptedDatabase) {
+
+        encryptedDatabase.execSQL("create table t1(a,b)");
+        encryptedDatabase.execSQL("insert into t1(a,b) values(?, ?)", new Object[]{"one", "two"});
+
+        String newKey = "foo";
+        File newDatabasePath = ZeteticApplication.getInstance().getDatabasePath("normal.db");
+        String attachCommand = "ATTACH DATABASE ? as encrypted KEY ?";
+        String createCommand = "create table encrypted.t1(a,b)";
+        String insertCommand = "insert into encrypted.t1 SELECT * from t1";
+        String detachCommand = "DETACH DATABASE encrypted";
+        encryptedDatabase.execSQL(attachCommand, new Object[]{newDatabasePath.getAbsolutePath(), newKey});
+        encryptedDatabase.execSQL(createCommand);
+        encryptedDatabase.execSQL(insertCommand);
+        encryptedDatabase.execSQL(detachCommand);
+        
+        return true;
+    }
+
+    @Override
+    protected void tearDown() {
+        File newDatabasePath = ZeteticApplication.getInstance().getDatabasePath("normal.db");
+        newDatabasePath.delete();
+    }
+
+    @Override
+    public String getName() {
+        return "Attach Database Test";
+    }
+}

libs/armeabi/libdatabase_sqlcipher.so

@@ -11,25 +11,30 @@ public abstract class SQLCipherTest {
 
     private SQLiteDatabase database;
 
-    protected void setUp() {
+    protected void internalSetUp() {
         database = ZeteticApplication.getInstance().createDatabase();
+        setUp();
     }
 
     public TestResult run() {
 
         TestResult result = new TestResult(getName(), false);
         try {
-            setUp();
+            internalSetUp();
             result.setResult(execute(database));
-            tearDown();
+            internalTearDown();
         } catch (Exception e) {
             Log.v(ZeteticApplication.TAG, e.toString());
         }
         return result;
     }
 
-    private void tearDown(){
+    private void internalTearDown(){
         database.close();
         SQLiteDatabase.releaseMemory();
+        tearDown();
     }
+
+    protected void setUp(){};
+    protected void tearDown(){};
 }

libs/armeabi/libsqlcipher_android.so

@@ -44,6 +44,7 @@ private List<SQLCipherTest> getTestsToRun(){
         tests.add(new CrossProcessCursorQueryTest());
         tests.add(new LoopingQueryTest());
         tests.add(new LoopingCountQueryTest());
+        tests.add(new AttachDatabaseTest());
         return tests;
     }
 }