Adding a looping test over the database, also running tests as async tasks so their progress can be published as they complete.

Author: developernotes

net.zetetic.sqlcipher.test.iws

@@ -5,14 +5,14 @@
 import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
+import net.zetetic.tests.ResultNotifier;
 import net.zetetic.tests.TestResult;
 import net.zetetic.tests.TestSuiteRunner;
 
-import java.util.List;
-
-public class TestSuiteActivity extends Activity {
+public class TestSuiteActivity extends Activity implements ResultNotifier {
 
     private static String TAG = "net.zetetic.sqlcipher.test";
+    TextView resultsView;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -23,15 +23,14 @@ public void onCreate(Bundle savedInstanceState) {
 
     public void onButtonClick(View view) {
 
+        resultsView = (TextView) findViewById(R.id.test_suite_results);
         ZeteticApplication.getInstance().setCurrentActivity(this);
-        TestSuiteRunner runner = new TestSuiteRunner();
-        List<TestResult> results = runner.runSuite();
+        TestSuiteRunner runner = new TestSuiteRunner(this);
+        runner.runSuite();
+    }
 
-        TextView resultsView = (TextView) findViewById(R.id.test_suite_results);
-        StringBuilder buffer = new StringBuilder();
-        for(TestResult result : results){
-            buffer.append(result.toString() + "\n");
-        }
-        resultsView.setText(buffer.toString());
+    @Override
+    public void send(TestResult result) {
+        resultsView.append(result.toString());
     }
 }

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

@@ -0,0 +1,31 @@
+package net.zetetic.tests;
+
+import android.database.Cursor;
+import info.guardianproject.database.sqlcipher.SQLiteDatabase;
+
+public class LoopingQueryTest extends SQLCipherTest {
+
+    @Override
+    public boolean execute(SQLiteDatabase database) {
+        int counter = 0;
+        int iterations = 1000;
+        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 * from t1", null);
+            if(cursor != null){
+                cursor.moveToFirst();
+                buffer.append(cursor.getString(0));
+                cursor.close();
+            }
+            counter++;
+        }
+        return buffer.toString().length() > 0;
+    }
+
+    @Override
+    public String getName() {
+        return "Looping Query Test";
+    }
+}

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

@@ -0,0 +1,5 @@
+package net.zetetic.tests;
+
+public interface ResultNotifier {
+    void send(TestResult result);
+}

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

@@ -8,20 +8,25 @@
 
 public class TestSuiteRunner {
 
-    public List<TestResult> runSuite(){
+    private ResultNotifier notifier;
+
+    public TestSuiteRunner(ResultNotifier notifier) {
+        this.notifier = notifier;
+    }
+
+    public void runSuite(){
 
         SQLiteDatabase.loadLibs(ZeteticApplication.getInstance());
-        List<TestResult> results = new ArrayList<TestResult>();
         for(SQLCipherTest test : getTestsToRun()){
-            results.add(test.run());
+            new TestTask(notifier).execute(test);
         }
-        return results;
     }
 
     private List<SQLCipherTest> getTestsToRun(){
         List<SQLCipherTest> tests = new ArrayList<SQLCipherTest>();
         tests.add(new NullQueryResultTest());
         tests.add(new CrossProcessCursorQueryTest());
+        tests.add(new LoopingQueryTest());
         return tests;
     }
 }

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

@@ -0,0 +1,23 @@
+package net.zetetic.tests;
+
+import android.os.AsyncTask;
+
+public class TestTask extends AsyncTask<SQLCipherTest, Void, TestResult> {
+
+    private ResultNotifier notifier;
+
+    public TestTask(ResultNotifier notifier){
+        this.notifier = notifier;
+    }
+
+    @Override
+    protected TestResult doInBackground(SQLCipherTest... sqlCipherTests) {
+        SQLCipherTest test = sqlCipherTests[0];
+        return test.run();
+    }
+
+    @Override
+    protected void onPostExecute(TestResult testResult) {
+        notifier.send(testResult);
+    }
+}