Merge pull request #3 from brodyspark/cursor-api-test-2

Add test of Cursor.getType()

Author: developernotes

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

@@ -0,0 +1,58 @@
+package net.zetetic.tests;
+
+import android.content.Context;
+import net.sqlcipher.Cursor;
+import net.sqlcipher.database.SQLiteDatabase;
+import net.sqlcipher.database.SQLiteOpenHelper;
+import net.zetetic.ZeteticApplication;
+
+import java.io.File;
+
+public class CursorAccessTest 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();
+
+        MyHelper databaseHelper = new MyHelper(ZeteticApplication.getInstance());
+
+        SQLiteDatabase db = databaseHelper.getWritableDatabase(ZeteticApplication.DATABASE_PASSWORD);
+
+        Cursor results = db.rawQuery("select * from t1", new String[]{});
+        results.moveToFirst();
+        int type_a = results.getType(0);
+        int type_b = results.getType(1);
+
+        results.close();
+        db.close();
+
+        return (type_a == Cursor.FIELD_TYPE_STRING) && (type_b == Cursor.FIELD_TYPE_INTEGER);
+    }
+
+    @Override
+    public String getName() {
+        return "Cursor Access Test";
+    }
+
+    private class MyHelper extends SQLiteOpenHelper {
+
+        public MyHelper(Context context) {
+            super(context, ZeteticApplication.DATABASE_NAME, null, 1);
+        }
+
+        @Override
+        public void onCreate(SQLiteDatabase database) {
+            database.execSQL("create table t1(a text,b integer)");
+            database.execSQL("insert into t1(a,b) values(?, ?)", new Object[]{"test1", 100});
+        }
+
+        @Override
+        public void onUpgrade(SQLiteDatabase database, int oldVersion, int newVersion) {}
+    }
+}

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

@@ -59,6 +59,7 @@ private List<SQLCipherTest> getTestsToRun(){
         tests.add(new ReadableDatabaseTest());
         tests.add(new AutoVacuumOverReadTest());
         tests.add(new ReadableWritableAccessTest());
+        tests.add(new CursorAccessTest());
         tests.add(new VerifyOnUpgradeIsCalledTest());
         tests.add(new MigrationUserVersion());
         tests.add(new ExportToUnencryptedDatabase());