Making the TestSuiteRunner an async task

Tests run on Android between versions 2.1 and 3.2

Author: developernotes

AndroidManifest.xml

@@ -11,5 +11,6 @@
         </activity>
         <provider android:name=".ZeteticContentProvider" android:authorities="net.zetetic.sqlcipher.zeteticprovider" />
     </application>
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
 </manifest>
 

libs/sqlcipher.jar

@@ -5,7 +5,7 @@
     android:layout_height="fill_parent"
     >
 <Button
-    android:id="@+id/button1"
+    android:id="@+id/executeSuite"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:text="@string/test_suite_button"

net.zetetic.sqlcipher.test.iws

@@ -23,14 +23,19 @@ public void onCreate(Bundle savedInstanceState) {
 
     public void onButtonClick(View view) {
 
+        findViewById(R.id.executeSuite).setEnabled(false);
         resultsView = (TextView) findViewById(R.id.test_suite_results);
         ZeteticApplication.getInstance().setCurrentActivity(this);
-        TestSuiteRunner runner = new TestSuiteRunner(this);
-        runner.runSuite();
+        new TestSuiteRunner().execute(this);
     }
 
     @Override
     public void send(TestResult result) {
         resultsView.append(result.toString());
     }
+
+    @Override
+    public void complete() {
+        findViewById(R.id.executeSuite).setEnabled(true);
+    }
 }

res/layout/main.xml

@@ -0,0 +1,31 @@
+package net.zetetic.tests;
+
+import android.database.Cursor;
+import info.guardianproject.database.sqlcipher.SQLiteDatabase;
+
+public class LoopingCountQueryTest extends SQLCipherTest {
+    
+    @Override
+    public boolean execute(SQLiteDatabase database) {
+        int counter = 0;
+        int iterations = 10;
+        database.execSQL("create table t1(a);");
+        database.execSQL("insert into t1(a) values (?)", new Object[]{"foo"});
+        StringBuilder buffer = new StringBuilder();
+        while(counter < iterations){
+            Cursor cursor = database.rawQuery("select count(*) from t1", null);
+            if(cursor != null){
+                cursor.moveToFirst();
+                buffer.append(cursor.getInt(0));
+                cursor.close();
+            }
+            counter++;
+        }
+        return buffer.toString().length() > 0;
+    }
+
+    @Override
+    public String getName() {
+        return "Looping Count Query Test";
+    }
+}

src/main/java/net/zetetic/TestSuiteActivity.java

@@ -2,4 +2,5 @@
 
 public interface ResultNotifier {
     void send(TestResult result);
+    void complete();
 }

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

@@ -1,26 +1,40 @@
 package net.zetetic.tests;
 
+import android.os.AsyncTask;
 import android.util.Log;
 import info.guardianproject.database.sqlcipher.SQLiteDatabase;
 import net.zetetic.ZeteticApplication;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class TestSuiteRunner {
+public class TestSuiteRunner extends AsyncTask<ResultNotifier, TestResult, Void> {
 
     private ResultNotifier notifier;
 
-    public TestSuiteRunner(ResultNotifier notifier) {
-        this.notifier = notifier;
+    @Override
+    protected Void doInBackground(ResultNotifier... resultNotifiers) {
+        this.notifier = resultNotifiers[0];
+        runSuite();
+        return null;
     }
 
-    public void runSuite(){
+    @Override
+    protected void onProgressUpdate(TestResult... values) {
+        notifier.send(values[0]);
+    }
+
+    @Override
+    protected void onPostExecute(Void aVoid) {
+        notifier.complete();
+    }
+
+    private void runSuite(){
 
         SQLiteDatabase.loadLibs(ZeteticApplication.getInstance());
         for(SQLCipherTest test : getTestsToRun()){
             Log.i(ZeteticApplication.TAG, "Running test:" + test.getName());
-            notifier.send(test.run());
+            publishProgress(test.run());
         }
     }