Use new fake reference manager setup in PromptAutoplayerTest

rral0 · Feb 18, 2020 · 8e5994c · 8e5994c
1 parent 1d3121e
commit 8e5994c
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 102 deletions.
diff --git a/collect_app/src/test/java/org/odk/collect/android/support/CollectHelpers.java b/collect_app/src/test/java/org/odk/collect/android/support/CollectHelpers.java
@@ -1,6 +1,6 @@
 package org.odk.collect.android.support;
 
-import android.util.Pair;
+import androidx.core.util.Pair;
 
 import org.javarosa.core.reference.InvalidReferenceException;
 import org.javarosa.core.reference.Reference;

diff --git a/collect_app/src/test/java/org/odk/collect/android/views/helpers/PromptAutoplayerTest.java b/collect_app/src/test/java/org/odk/collect/android/views/helpers/PromptAutoplayerTest.java
diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/AnnotateWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/AnnotateWidgetTest.java
@@ -4,11 +4,11 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.provider.MediaStore;
-import android.util.Pair;
 import android.view.View;
 import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
+import androidx.core.util.Pair;
 
 import net.bytebuddy.utility.RandomString;
 

diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/DrawWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/DrawWidgetTest.java
@@ -3,7 +3,7 @@
 import android.content.Intent;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.util.Pair;
+import androidx.core.util.Pair;
 import android.view.View;
 import android.widget.ImageView;
 

diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/ImageWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/ImageWidgetTest.java
@@ -2,11 +2,11 @@
 
 import android.content.Intent;
 import android.provider.MediaStore;
-import android.util.Pair;
 import android.view.View;
 import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
+import androidx.core.util.Pair;
 
 import net.bytebuddy.utility.RandomString;
 

diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/SignatureWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/SignatureWidgetTest.java
@@ -3,7 +3,7 @@
 import android.content.Intent;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.util.Pair;
+import androidx.core.util.Pair;
 import android.view.View;
 import android.widget.ImageView;