From 82486c75144a0fd0b4b58f96b18c8e5d9343f527 Mon Sep 17 00:00:00 2001 From: olegivo Date: Sun, 5 Jan 2020 11:20:39 +0300 Subject: [PATCH] migrate InstrumentationRegistry --- .../androidTest/java/org/isoron/uhabits/BaseAndroidTest.java | 4 ++-- .../java/org/isoron/uhabits/BaseUserInterfaceTest.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java index 0734910ad..f7b351e36 100644 --- 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); diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java index 3e19e927e..f8c62a2c6 100644 --- 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