Adding a test around getWritableDatabase() and getReadableDatabase() with a

transaction between them.

Author: developernotes

libs/armeabi/libsqlcipher_android.so

@@ -36,12 +36,9 @@
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/r" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-assets" />
       <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-resources" />
       <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/extracted-dependencies" />
-      <excludeFolder url="file://$MODULE_DIR$/target/output" />
-      <excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.android:android:2.1.2" level="project" />

libs/sqlcipher.jar

@@ -63,4 +63,13 @@ public void delete1xDatabase() {
         File databaseFile = getInstance().getDatabasePath(ONE_X_DATABASE);
         databaseFile.delete();
     }
+
+    public void deleteDatabaseFileAndSiblings(String databaseName){
+
+        File databaseFile = ZeteticApplication.getInstance().getDatabasePath(databaseName);
+        File databasesDirectory = new File(databaseFile.getParent());
+        for(File file : databasesDirectory.listFiles()){
+            file.delete();
+        }
+    }
 }

net.zetetic.sqlcipher.test.iml

@@ -0,0 +1,28 @@
+package net.zetetic.tests;
+
+import net.sqlcipher.database.SQLiteDatabase;
+
+public class AutoVacuumOverReadTest extends SQLCipherTest {
+    @Override
+    public boolean execute(SQLiteDatabase database) {
+
+        database.execSQL("BEGIN EXCLUSIVE");
+
+        String createTableMessages = "create table Message (_id integer primary key autoincrement, syncServerId text, syncServerTimeStamp integer, displayName text, timeStamp integer, subject text, flagRead integer, flagLoaded integer, flagFavorite integer, flagAttachment integer, flags integer, clientId integer, messageId text, mailboxKey integer, accountKey integer, fromList text, toList text, ccList text, bccList text, replyToList text, meetingInfo text);";
+        String createTableMessagesUpdates = "create table Message_Updates (_id integer unique, syncServerId text, syncServerTimeStamp integer, displayName text, timeStamp integer, subject text, flagRead integer, flagLoaded integer, flagFavorite integer, flagAttachment integer, flags integer, clientId integer, messageId text, mailboxKey integer, accountKey integer, fromList text, toList text, ccList text, bccList text, replyToList text, meetingInfo text);";
+        String createTableMessageDeletes = "create table Message_Deletes (_id integer unique, syncServerId text, syncServerTimeStamp integer, displayName text, timeStamp integer, subject text, flagRead integer, flagLoaded integer, flagFavorite integer, flagAttachment integer, flags integer, clientId integer, messageId text, mailboxKey integer, accountKey integer, fromList text, toList text, ccList text, bccList text, replyToList text, meetingInfo text);";
+
+        database.execSQL(createTableMessageDeletes);
+        database.execSQL(createTableMessagesUpdates);
+        database.execSQL(createTableMessages);
+
+        database.execSQL("COMMIT TRANSACTION");
+
+        return true;
+    }
+
+    @Override
+    public String getName() {
+        return "Autovacuum Over Read Test";
+    }
+}

net.zetetic.sqlcipher.test.iws

@@ -5,7 +5,7 @@
 
 public class PragmaCipherVersionTest extends SQLCipherTest {
 
-    private final String CURRENT_CIPHER_VERSION = "2.0.5";
+    private final String CURRENT_CIPHER_VERSION = "2.0.6";
 
     @Override
     public boolean execute(SQLiteDatabase database) {

src/main/java/net/zetetic/ZeteticApplication.java

@@ -0,0 +1,62 @@
+package net.zetetic.tests;
+
+import android.content.Context;
+import android.database.Cursor;
+import net.sqlcipher.database.SQLiteDatabase;
+import net.sqlcipher.database.SQLiteOpenHelper;
+import net.zetetic.ZeteticApplication;
+
+import java.io.File;
+
+public class ReadableWritableAccessTest extends SQLCipherTest {
+
+    @Override
+    public boolean execute(SQLiteDatabase database) {
+
+        database.close();
+        ZeteticApplication.getInstance().deleteDatabaseFileAndSiblings(ZeteticApplication.DATABASE_NAME);
+        String databasesFolderPath = ZeteticApplication.getInstance()
+                                                   .getDatabasePath(ZeteticApplication.DATABASE_NAME).getParent();
+        File databasesFolder = new File(databasesFolderPath);
+        databasesFolder.delete();
+
+        DatabaseHelper databaseHelper = new DatabaseHelper(ZeteticApplication.getInstance());
+
+        SQLiteDatabase writableDatabase = databaseHelper.getWritableDatabase(ZeteticApplication.DATABASE_PASSWORD);
+        writableDatabase.beginTransaction();
+        SQLiteDatabase readableDatabase = databaseHelper.getReadableDatabase(ZeteticApplication.DATABASE_PASSWORD);
+
+        Cursor results = readableDatabase.rawQuery("select count(*) from t1", new String[]{});
+        results.moveToFirst();
+        int rowCount = results.getInt(0);
+
+        results.close();
+        writableDatabase.endTransaction();
+        readableDatabase.close();
+        writableDatabase.close();
+
+        return rowCount == 1;
+    }
+
+    @Override
+    public String getName() {
+        return "Readable/Writable Access Test";
+    }
+
+    private class DatabaseHelper extends SQLiteOpenHelper {
+
+        public DatabaseHelper(Context context) {
+            super(context, ZeteticApplication.DATABASE_NAME, null, 1);
+        }
+
+        @Override
+        public void onCreate(SQLiteDatabase database) {
+            database.execSQL("create table t1(a,b)");
+            database.execSQL("insert into t1(a,b) values(?, ?)", new Object[]{"one for the money",
+                                                                              "two for the show"});
+        }
+
+        @Override
+        public void onUpgrade(SQLiteDatabase database, int oldVersion, int newVersion) {}
+    }
+}

src/main/java/net/zetetic/tests/AutoVacuumOverReadTest.java

@@ -56,6 +56,8 @@ private List<SQLCipherTest> getTestsToRun(){
         tests.add(new ImportUnencryptedDatabaseTest());
         tests.add(new FullTextSearchTest());
         tests.add(new ReadableDatabaseTest());
+        tests.add(new AutoVacuumOverReadTest());
+        tests.add(new ReadableWritableAccessTest());
         return tests;
     }
 }