update support tests for SQLCipher 4.4.0

apply some other minor cleanup

Author: Christopher J. Brody

app/src/main/java/net/zetetic/tests/JavaClientLibraryVersionTest.java

@@ -4,12 +4,12 @@
 
 public class JavaClientLibraryVersionTest extends SQLCipherTest {
 
-  String expectedClientLibraryVersion = "4.4.0";
+  private final String EXPECTED_SQLCIPHER_ANDROID_VERSION = "4.4.0";
 
   @Override
   public boolean execute(SQLiteDatabase database) {
     setMessage(String.format("Report:%s", SQLiteDatabase.SQLCIPHER_ANDROID_VERSION));
-    return SQLiteDatabase.SQLCIPHER_ANDROID_VERSION.equals(expectedClientLibraryVersion);
+    return SQLiteDatabase.SQLCIPHER_ANDROID_VERSION.equals(EXPECTED_SQLCIPHER_ANDROID_VERSION);
   }
 
   @Override

app/src/main/java/net/zetetic/tests/support/JavaClientLibraryVersionTest.java

@@ -5,16 +5,16 @@
 
 public class JavaClientLibraryVersionTest extends SupportTest {
 
-  String expectedClientLibraryVersion = "4.3.0";
+  private final String EXPECTED_SQLCIPHER_ANDROID_VERSION = "4.4.0";
 
   @Override
   public boolean execute(SQLiteDatabase database) {
     setMessage(String.format("Report:%s", SQLiteDatabase.SQLCIPHER_ANDROID_VERSION));
-    return SQLiteDatabase.SQLCIPHER_ANDROID_VERSION.equals(expectedClientLibraryVersion);
+    return SQLiteDatabase.SQLCIPHER_ANDROID_VERSION.equals(EXPECTED_SQLCIPHER_ANDROID_VERSION);
   }
 
   @Override
   public String getName() {
     return "Java Client Library Version Test";
   }
-}
+}

app/src/main/java/net/zetetic/tests/support/PragmaCipherVersionTest.java

@@ -7,7 +7,7 @@
 
 public class PragmaCipherVersionTest extends SupportTest {
 
-    private final String CURRENT_CIPHER_VERSION = "4.3.0";
+    private final String CURRENT_CIPHER_VERSION = "4.4.0";
 
     @Override
     public boolean execute(SQLiteDatabase database) {
@@ -32,4 +32,4 @@ public boolean execute(SQLiteDatabase database) {
     public String getName() {
         return "PRAGMA cipher_version Test";
     }
-}
+}