fix tests: not to use deprecated features

maskarade · Oct 27, 2018 · d713738 · d713738
1 parent f4cd2e5
commit d713738
Show file tree

Hide file tree

Showing 39 changed files with 161 additions and 140 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -35,6 +35,11 @@ android {
     dexOptions {
         preDexLibraries = !System.getenv("CI")
     }
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
@@ -56,19 +61,19 @@ dependencies {
     testAnnotationProcessor project(':processor')
     testImplementation project(':encryption')
     testImplementation "org.robolectric:robolectric:4.0"
+    testImplementation 'androidx.test:core:1.0.0'
     testImplementation 'androidx.test:runner:1.1.0'
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.hamcrest:hamcrest-library:1.3'
+    testImplementation 'androidx.test.ext:junit:1.0.0'
     testImplementation 'com.google.code.gson:gson:2.8.2'
     testImplementation "androidx.recyclerview:recyclerview:${ANDROIDX_RECYCLERVIEW_VERSION}"
     testImplementation 'io.reactivex.rxjava2:rxjava:2.2.2'
     testImplementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
 
     androidTestAnnotationProcessor project(':processor')
     androidTestImplementation project(':encryption')
+    androidTestImplementation 'androidx.test:core:1.0.0'
     androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
+    androidTestImplementation 'androidx.test.ext:junit:1.0.0'
     androidTestImplementation 'com.google.code.gson:gson:2.8.2'
     androidTestImplementation "androidx.recyclerview:recyclerview:${ANDROIDX_RECYCLERVIEW_VERSION}"
     androidTestImplementation 'io.reactivex.rxjava2:rxjava:2.2.2'

diff --git a/library/src/test/java/com/github/gfx/android/orma/test/AggregatorTest.java b/library/src/test/java/com/github/gfx/android/orma/test/AggregatorTest.java
@@ -26,7 +26,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.Matchers.*;

diff --git a/library/src/test/java/com/github/gfx/android/orma/test/CompositeIndexTest.java b/library/src/test/java/com/github/gfx/android/orma/test/CompositeIndexTest.java
@@ -28,7 +28,8 @@
 import org.junit.runner.RunWith;
 
 import android.database.sqlite.SQLiteConstraintException;
-import androidx.test.runner.AndroidJUnit4;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.Matchers.*;

diff --git a/library/src/test/java/com/github/gfx/android/orma/test/ConditionHelpersTest.java b/library/src/test/java/com/github/gfx/android/orma/test/ConditionHelpersTest.java
@@ -25,12 +25,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import androidx.test.runner.AndroidJUnit4;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.Matchers.*;
 
@@ -183,12 +183,12 @@ public void testGe() throws Exception {
 
     @Test
     public void testBetween() throws Exception {
-        assertThat(selector().byteValueBetween((byte) 3 ,(byte)5).count(), is(3));
-        assertThat(selector().shortValueBetween((short) 3, (short)5).count(), is(3));
+        assertThat(selector().byteValueBetween((byte) 3, (byte) 5).count(), is(3));
+        assertThat(selector().shortValueBetween((short) 3, (short) 5).count(), is(3));
         assertThat(selector().intValueBetween(3, 5).count(), is(3));
         assertThat(selector().longValueBetween((long) 3, (long) 5).count(), is(3));
-        assertThat(selector().floatValueBetween((float) 3, (float)5).count(), is(3));
-        assertThat(selector().doubleValueBetween((double) 3, (double)5).count(), is(3));
+        assertThat(selector().floatValueBetween((float) 3, (float) 5).count(), is(3));
+        assertThat(selector().doubleValueBetween((double) 3, (double) 5).count(), is(3));
         assertThat(selector().dateValueBetween(new Date(3), new Date(5)).count(), is(3));
     }
 

diff --git a/library/src/test/java/com/github/gfx/android/orma/test/DirectAssociationsTest.java b/library/src/test/java/com/github/gfx/android/orma/test/DirectAssociationsTest.java
@@ -16,7 +16,6 @@
 
 package com.github.gfx.android.orma.test;
 
-import com.github.gfx.android.orma.ColumnDef;
 import com.github.gfx.android.orma.Inserter;
 import com.github.gfx.android.orma.ModelFactory;
 import com.github.gfx.android.orma.function.Function1;
@@ -42,7 +41,7 @@
 import org.junit.runner.RunWith;
 
 import androidx.annotation.NonNull;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.Matchers.*;
@@ -493,7 +492,7 @@ public Author_AssociationCondition apply(Author_AssociationCondition cond) {
 
     @Test
     public void testFindByMoreNestedAssociatedModelCondition() throws Exception {
-        ModelWithMoreNestedDirectAssociations model =  orma.createModelWithMoreNestedDirectAssociations(
+        ModelWithMoreNestedDirectAssociations model = orma.createModelWithMoreNestedDirectAssociations(
                 new ModelFactory<ModelWithMoreNestedDirectAssociations>() {
                     @NonNull
                     @Override
@@ -530,13 +529,18 @@ public ModelWithDirectAssociation call() {
         ModelWithMoreNestedDirectAssociations_Selector selector = orma.selectFromModelWithMoreNestedDirectAssociations()
                 .mnd(new Function1<ModelWithNestedDirectAssociations_AssociationCondition, ModelWithNestedDirectAssociations_AssociationCondition>() {
                     @Override
-                    public ModelWithNestedDirectAssociations_AssociationCondition apply(ModelWithNestedDirectAssociations_AssociationCondition cond) {
-                        return cond.md(new Function1<ModelWithDirectAssociation_AssociationCondition, ModelWithDirectAssociation_AssociationCondition>() {
+                    public ModelWithNestedDirectAssociations_AssociationCondition apply(
+                            ModelWithNestedDirectAssociations_AssociationCondition cond) {
+                        return cond
+                                .md(new Function1<ModelWithDirectAssociation_AssociationCondition, ModelWithDirectAssociation_AssociationCondition>() {
                                     @Override
-                                    public ModelWithDirectAssociation_AssociationCondition apply(ModelWithDirectAssociation_AssociationCondition cond) {
-                                        return cond.author(new Function1<Author_AssociationCondition, Author_AssociationCondition>() {
+                                    public ModelWithDirectAssociation_AssociationCondition apply(
+                                            ModelWithDirectAssociation_AssociationCondition cond) {
+                                        return cond
+                                                .author(new Function1<Author_AssociationCondition, Author_AssociationCondition>() {
                                                     @Override
-                                                    public Author_AssociationCondition apply(Author_AssociationCondition cond) {
+                                                    public Author_AssociationCondition apply(
+                                                            Author_AssociationCondition cond) {
                                                         return cond.noteEq(author1.note);
                                                     }
                                                 });

diff --git a/library/src/test/java/com/github/gfx/android/orma/test/EncryptedDatabaseTest.java b/library/src/test/java/com/github/gfx/android/orma/test/EncryptedDatabaseTest.java
@@ -25,18 +25,20 @@
 import org.junit.runner.RunWith;
 
 import android.content.Context;
+
 import androidx.annotation.NonNull;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.*;
 import static org.junit.Assume.assumeTrue;
 
 @RunWith(AndroidJUnit4.class)
 public class EncryptedDatabaseTest {
+
     Context getContext() {
-        return InstrumentationRegistry.getTargetContext();
+        return ApplicationProvider.getApplicationContext();
     }
 
     @Test
@@ -45,16 +47,16 @@ public void simpleExecution() {
 
         Publisher publisher = OrmaFactory.createEncrypted()
                 .createPublisher(new ModelFactory<Publisher>() {
-            @NonNull
-            @Override
-            public Publisher call() {
-                Publisher publisher = new Publisher();
-                publisher.name = "foo bar";
-                publisher.startedYear = 2015;
-                publisher.startedMonth = 12;
-                return publisher;
-            }
-        });
+                    @NonNull
+                    @Override
+                    public Publisher call() {
+                        Publisher publisher = new Publisher();
+                        publisher.name = "foo bar";
+                        publisher.startedYear = 2015;
+                        publisher.startedMonth = 12;
+                        return publisher;
+                    }
+                });
 
         assertThat(publisher.id, is(not(0L)));
     }

diff --git a/library/src/test/java/com/github/gfx/android/orma/test/ForeignKeysTest.java b/library/src/test/java/com/github/gfx/android/orma/test/ForeignKeysTest.java
@@ -33,12 +33,13 @@
 import android.database.Cursor;
 import android.database.sqlite.SQLiteConstraintException;
 import android.database.sqlite.SQLiteException;
+
 import androidx.annotation.NonNull;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import static org.hamcrest.MatcherAssert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 /**
  * @see DirectAssociationsTest

diff --git a/library/src/test/java/com/github/gfx/android/orma/test/GsonTypeAdapterTest.java b/library/src/test/java/com/github/gfx/android/orma/test/GsonTypeAdapterTest.java
@@ -31,7 +31,7 @@
 import org.junit.runner.RunWith;
 
 import androidx.annotation.NonNull;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.Matchers.*;

diff --git a/library/src/test/java/com/github/gfx/android/orma/test/MigrationEngineTest.java b/library/src/test/java/com/github/gfx/android/orma/test/MigrationEngineTest.java
@@ -27,20 +27,21 @@
 import org.junit.runner.RunWith;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import androidx.annotation.NonNull;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.Matchers.*;
 
 @RunWith(AndroidJUnit4.class)
 public class MigrationEngineTest {
 
     Context getContext() {
-        return InstrumentationRegistry.getTargetContext();
+        return ApplicationProvider.getApplicationContext();
     }
 
     @Before

diff --git a/library/src/test/java/com/github/gfx/android/orma/test/ModelSpecTest.java b/library/src/test/java/com/github/gfx/android/orma/test/ModelSpecTest.java
@@ -40,8 +40,6 @@
 
 import android.database.sqlite.SQLiteException;
 import android.net.Uri;
-import androidx.annotation.NonNull;
-import androidx.test.runner.AndroidJUnit4;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -55,6 +53,9 @@
 import java.util.List;
 import java.util.UUID;
 
+import androidx.annotation.NonNull;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.Matchers.*;
 

diff --git a/library/src/test/java/com/github/gfx/android/orma/test/OrmaAdapterTest.java b/library/src/test/java/com/github/gfx/android/orma/test/OrmaAdapterTest.java
@@ -31,14 +31,14 @@
 import org.junit.runner.RunWith;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import io.reactivex.functions.Predicate;
 
 import static org.hamcrest.MatcherAssert.*;
@@ -52,7 +52,7 @@ public class OrmaAdapterTest {
     OrmaAdapter<Author> adapter;
 
     static Context getContext() {
-        return InstrumentationRegistry.getTargetContext();
+        return ApplicationProvider.getApplicationContext();
     }
 
     @Before

diff --git a/library/src/test/java/com/github/gfx/android/orma/test/OrmaConnectionTest.java b/library/src/test/java/com/github/gfx/android/orma/test/OrmaConnectionTest.java
@@ -24,16 +24,15 @@
 
 import android.content.Context;
 import android.database.sqlite.SQLiteException;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 @RunWith(AndroidJUnit4.class)
 public class OrmaConnectionTest {
 
-    static final String NAME = "main.db";
-
     Context getContext() {
-        return InstrumentationRegistry.getTargetContext();
+        return ApplicationProvider.getApplicationContext();
     }
 
     @Test

diff --git a/library/src/test/java/com/github/gfx/android/orma/test/OrmaDatabaseTest.java b/library/src/test/java/com/github/gfx/android/orma/test/OrmaDatabaseTest.java
@@ -30,9 +30,10 @@
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
+
 import androidx.annotation.NonNull;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.Matchers.*;
@@ -43,7 +44,7 @@ public class OrmaDatabaseTest {
     static final String NAME = "main.db";
 
     Context getContext() {
-        return InstrumentationRegistry.getTargetContext();
+        return ApplicationProvider.getApplicationContext();
     }
 
     @After

diff --git a/library/src/test/java/com/github/gfx/android/orma/test/ParcelableTest.java b/library/src/test/java/com/github/gfx/android/orma/test/ParcelableTest.java
@@ -29,20 +29,21 @@
 import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
+
 import androidx.annotation.NonNull;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.MatcherAssert.*;
+import static org.hamcrest.Matchers.*;
 
 @RunWith(AndroidJUnit4.class)
 public class ParcelableTest {
 
     OrmaDatabase orma;
 
     Context getContext() {
-        return InstrumentationRegistry.getTargetContext();
+        return ApplicationProvider.getApplicationContext();
     }
 
     <T extends Parcelable> T reload(T parcelable) {

diff --git a/library/src/test/java/com/github/gfx/android/orma/test/PrimaryKeyWithTypeAdapterTest.java b/library/src/test/java/com/github/gfx/android/orma/test/PrimaryKeyWithTypeAdapterTest.java
@@ -27,7 +27,7 @@
 import org.junit.runner.RunWith;
 
 import androidx.annotation.NonNull;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;