Removing the async task for now as it was causing issues with multiple tests at play

Author: developernotes

libs/armeabi/libdatabase_sqlcipher.so

@@ -31,7 +31,7 @@ public Activity getCurrentActivity(){
     }
 
     public SQLiteDatabase createDatabase(){
-        File databaseFile = getDatabasePath(ZeteticApplication.DATABASE_NAME);
+        File databaseFile = getDatabasePath(DATABASE_NAME);
         databaseFile.mkdirs();
         databaseFile.delete();
         return SQLiteDatabase.openOrCreateDatabase(databaseFile, DATABASE_PASSWORD, null);

libs/sqlcipher.jar

@@ -17,8 +17,6 @@ public class ZeteticContentProvider extends ContentProvider {
     public ZeteticContentProvider() {
         SQLiteDatabase.loadLibs(ZeteticApplication.getInstance());
         database = ZeteticApplication.getInstance().createDatabase();
-        database.execSQL("create table t1(a, b);");
-        database.execSQL("insert into t1(a, b) values('one for the money', 'two for the show');");
     }
 
     @Override
@@ -28,7 +26,7 @@ public boolean onCreate() {
 
     @Override
     public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
-        //return database.rawQuery("select * from t1", null);
+        createDatabaseWithData(database);
         SQLiteQueryBuilder builder = new SQLiteQueryBuilder();
         builder.setTables("t1");
         return builder.query(database, new String[]{"a", "b"}, null, null, null, null, null);
@@ -53,4 +51,9 @@ public int delete(Uri uri, String s, String[] strings) {
     public int update(Uri uri, ContentValues contentValues, String s, String[] strings) {
         return 0;
     }
+
+    private void createDatabaseWithData(SQLiteDatabase database) {
+        database.execSQL("create table if not exists t1(a, b);");
+        database.execSQL("insert into t1(a, b) values('one for the money', 'two for the show');");
+    }
 }

net.zetetic.sqlcipher.test.iws

@@ -7,22 +7,26 @@
 import net.zetetic.ZeteticContentProvider;
 
 public class CrossProcessCursorQueryTest extends SQLCipherTest {
+    
     @Override
     public boolean execute(SQLiteDatabase database) {
 
         Activity activity = ZeteticApplication.getInstance().getCurrentActivity();
         Uri providerUri = ZeteticContentProvider.CONTENT_URI;
         android.database.Cursor cursor = activity.managedQuery(providerUri, null, null, null, null);
         StringBuilder buffer = new StringBuilder();
-        while(cursor.moveToNext()){
+        while (cursor.moveToNext()) {
             buffer.append(cursor.getString(0));
             buffer.append(cursor.getString(1));
         }
+        cursor.close();
         return buffer.toString().length() > 0;
     }
-    
+
+
+
     @Override
     public String getName() {
-        return "Cross Process Cursor";
+        return "Cross Process Cursor Test";
     }
 }

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

@@ -16,14 +16,20 @@ protected void setUp() {
     }
 
     public TestResult run() {
-        
+
         TestResult result = new TestResult(getName(), false);
         try {
             setUp();
             result.setResult(execute(database));
+            tearDown();
         } catch (Exception e) {
             Log.v(ZeteticApplication.TAG, e.toString());
         }
         return result;
     }
+
+    private void tearDown(){
+        database.close();
+        SQLiteDatabase.releaseMemory();
+    }
 }

src/main/java/net/zetetic/ZeteticContentProvider.java

@@ -1,5 +1,6 @@
 package net.zetetic.tests;
 
+import android.util.Log;
 import info.guardianproject.database.sqlcipher.SQLiteDatabase;
 import net.zetetic.ZeteticApplication;
 
@@ -18,7 +19,8 @@ public void runSuite(){
 
         SQLiteDatabase.loadLibs(ZeteticApplication.getInstance());
         for(SQLCipherTest test : getTestsToRun()){
-            new TestTask(notifier).execute(test);
+            Log.i(ZeteticApplication.TAG, "Running test:" + test.getName());
+            notifier.send(test.run());
         }
     }