updated tests and jnilibs

app/src/androidTest/java/org/spatialite/DatabaseCursorTest.java

@@ -63,6 +63,10 @@ public class DatabaseCursorTest /*implements PerformanceTestCase*/ {
     private SQLiteDatabase mDatabase;
     private File mDatabaseFile;
 
+    static {
+        System.loadLibrary("android_spatialite");
+    }
+
     @Before
     public void setUp() throws Exception {
         File dbDir = ApplicationProvider.getApplicationContext().getDir("tests", Context.MODE_PRIVATE);

app/src/androidTest/java/org/spatialite/DatabaseErrorHandlerTest.java

@@ -50,6 +50,10 @@ public class DatabaseErrorHandlerTest {
     private static final String DB_NAME = "database_test.db";
     private File dbDir;
 
+    static {
+        System.loadLibrary("android_spatialite");
+    }
+
     @Before
     protected void setUp() throws Exception {
         dbDir = ApplicationProvider.getApplicationContext().getDir(this.getClass().getName(), Context.MODE_PRIVATE);

app/src/androidTest/java/org/spatialite/DatabaseLocaleTest.java

@@ -42,6 +42,11 @@
 @RunWith(AndroidJUnit4.class)
 public class DatabaseLocaleTest {
 
+    static {
+        System.loadLibrary("android_spatialite");
+    }
+
+
     private SQLiteDatabase mDatabase;
 
     private static final String[] STRINGS = {
@@ -151,7 +156,7 @@ public void testRemoveAccents() {
         Cursor cursor = mDatabase.rawQuery("SELECT id,remove_accents(data) FROM test", null);
 
         // Move to the first (and only) row in the result set
-        if (cursor != null && cursor.moveToNext()) {
+        if (cursor != null && cursor.moveToFirst()) {
             int id=cursor.getInt(0);
             // Get the string from the query result
             String data = cursor.getString(1);
@@ -168,7 +173,8 @@ public void testRemoveAccents() {
             }
 
             // Close the cursor
-            cursor.close();
+            if(!cursor.isClosed())
+                cursor.close();
         } else {
             throw new AssertionError("Cursor is null or empty.");
         }

app/src/androidTest/java/org/spatialite/DatabaseStatementTest.java

@@ -49,6 +49,10 @@ public class DatabaseStatementTest /*implements PerformanceTestCase*/ {
     private SQLiteDatabase mDatabase;
     private File mDatabaseFile;
 
+    static {
+        System.loadLibrary("android_spatialite");
+    }
+
     @Before
     public void setUp() throws Exception {
         File dbDir = ApplicationProvider.getApplicationContext().getDir("tests", Context.MODE_PRIVATE);

app/src/androidTest/java/org/spatialite/NewDatabasePerformanceTestSuite.java

@@ -23,6 +23,9 @@
 
 public class NewDatabasePerformanceTestSuite extends TestSuite {
 
+    static {
+        System.loadLibrary("android_spatialite");
+    }
     public static TestSuite suite() {
         TestSuite suite =
           new TestSuite(NewDatabasePerformanceTestSuite.class.getName());

app/src/androidTest/java/org/spatialite/NewDatabasePerformanceTests.java

@@ -38,6 +38,10 @@ public class NewDatabasePerformanceTests {
     // Edit this to change the test run times.  The original is 100.
     final static int kMultiplier = 1;
 
+    static {
+        System.loadLibrary("android_spatialite");
+    }
+
     public static class PerformanceBase extends TestCase /*implements PerformanceTestCase*/ {
         protected static final int CURRENT_DATABASE_VERSION = 42;
         protected SQLiteDatabase mDatabase;

app/src/androidTest/java/org/spatialite/NullTest.java

@@ -19,6 +19,10 @@
 @RunWith(AndroidJUnit4.class)
 public class NullTest {
 
+
+    static {
+        System.loadLibrary("android_spatialite");
+    }
     private SQLiteDatabase mDatabase;
     private File mDatabaseFile;