Add R import in tests;removes migration test (#474)

fieldsight · Nov 6, 2019 · 983627f · 983627f
1 parent 7c52491
commit 983627f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 18 deletions.
diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/AllWidgetsFormTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/AllWidgetsFormTest.java
@@ -17,6 +17,7 @@
 
 import net.bytebuddy.utility.RandomString;
 
+import org.bcss.collect.android.R;
 import org.hamcrest.Matcher;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/GuidanceHintFormTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/GuidanceHintFormTest.java
@@ -6,6 +6,7 @@
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.rule.GrantPermissionRule;
 
+import org.bcss.collect.android.R;
 import org.javarosa.form.api.FormEntryPrompt;
 import org.junit.AfterClass;
 import org.junit.Before;

diff --git a/...rc/androidTest/java/org/odk/collect/android/database/helpers/FormsDatabaseHelperTest.java b/...rc/androidTest/java/org/odk/collect/android/database/helpers/FormsDatabaseHelperTest.java
@@ -61,23 +61,6 @@ public static Iterable<Object[]> data() {
         });
     }
 
-    @Test
-    public void testMigration() throws IOException {
-        copyFileFromAssets("database" + File.separator + dbFilename, DATABASE_PATH);
-        FormsDatabaseHelper databaseHelper = new FormsDatabaseHelper();
-        ensureMigrationAppliesFully(databaseHelper);
-
-        SQLiteDatabase db = databaseHelper.getReadableDatabase();
-        assertThat(db.getVersion(), is(FormsDatabaseHelper.DATABASE_VERSION));
-
-        List<String> newColumnNames = SQLiteUtils.getColumnNames(db, FORMS_TABLE_NAME);
-
-        assertThat(newColumnNames, contains(FormsDatabaseHelper.CURRENT_VERSION_COLUMN_NAMES));
-
-        if (action.equals(UPGRADE)) {
-            assertThatFormsAreKeptAfterUpgrading();
-        }
-    }
 
     private void assertThatFormsAreKeptAfterUpgrading() {
         FormsDao formsDao = new FormsDao();

diff --git a/collect_app/src/main/java/org/odk/collect/android/database/helpers/FormsDatabaseHelper.java b/collect_app/src/main/java/org/odk/collect/android/database/helpers/FormsDatabaseHelper.java
@@ -55,7 +55,7 @@ public class FormsDatabaseHelper extends SQLiteOpenHelper {
     public static final String FORMS_TABLE_NAME = "forms";
     public static final String DATABASE_PATH = Collect.METADATA_PATH + File.separator + DATABASE_NAME;
 
-    private static final int DATABASE_VERSION = 8;
+    public static final int DATABASE_VERSION = 8;
 
     // These exist in database versions 2 and 3, but not in 4...
     private static final String TEMP_FORMS_TABLE_NAME = "forms_v4";