migrate InstrumentationRegistry

6 years ago · 82486c7514
parent fe732ea385
commit 82486c7514
2 changed files with 5 additions and 2 deletions
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java
@ -84,8 +84,8 @@ public class BaseAndroidTest extends TestCase
    {
        if (Looper.myLooper() == null) Looper.prepare();

-        targetContext = InstrumentationRegistry.getTargetContext();
-        testContext = InstrumentationRegistry.getContext();
+        targetContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        testContext = InstrumentationRegistry.getInstrumentation().getContext();

        DateUtils.setFixedLocalTime(FIXED_LOCAL_TIME);
        setResolution(2.0f);
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java
@ -31,6 +31,9 @@ import org.isoron.uhabits.core.ui.screens.habits.list.*;
 import org.isoron.uhabits.core.utils.*;
 import org.junit.*;

+import static androidx.test.InstrumentationRegistry.getContext;
+import static androidx.test.InstrumentationRegistry.getTargetContext;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 import static androidx.test.uiautomator.UiDevice.*;

 public class BaseUserInterfaceTest