From 6fed9f2944cd22d9bb444a6467e04fac5fbe3054 Mon Sep 17 00:00:00 2001 From: Tiem Song Date: Tue, 23 Oct 2018 10:29:28 -0700 Subject: [PATCH] Update import for InstrumentationRegistry Use androidx.test.platform.app.InstrumentationRegistry instead of androidx.test.InstrumentationRegistry. --- app/src/androidTest/java/io/plaidapp/ui/HomeActivityTest.kt | 2 +- .../core/designernews/data/database/LoggedInUserDaoTest.kt | 2 +- .../designernews/data/login/AuthTokenLocalDataSourceTest.kt | 2 +- .../core/designernews/data/login/LoginLocalDataSourceTest.kt | 4 ++-- .../core/dribbble/data/prefs/DribbbleV1SourceRemoverTest.kt | 2 +- .../java/io/plaidapp/core/util/TextViewExtensionTest.kt | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/androidTest/java/io/plaidapp/ui/HomeActivityTest.kt b/app/src/androidTest/java/io/plaidapp/ui/HomeActivityTest.kt index 8d3b12655..5c33456f2 100644 --- a/app/src/androidTest/java/io/plaidapp/ui/HomeActivityTest.kt +++ b/app/src/androidTest/java/io/plaidapp/ui/HomeActivityTest.kt @@ -16,7 +16,6 @@ package io.plaidapp.ui -import androidx.test.InstrumentationRegistry import androidx.test.espresso.Espresso.onView import androidx.test.espresso.action.ViewActions.click import androidx.test.espresso.assertion.ViewAssertions.matches @@ -26,6 +25,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.rule.ActivityTestRule import androidx.test.uiautomator.UiDevice import android.view.Gravity +import androidx.test.platform.app.InstrumentationRegistry import io.plaidapp.R import org.junit.Rule import org.junit.Test diff --git a/core/src/androidTest/java/io/plaidapp/core/designernews/data/database/LoggedInUserDaoTest.kt b/core/src/androidTest/java/io/plaidapp/core/designernews/data/database/LoggedInUserDaoTest.kt index 474062acb..f3920cff6 100644 --- a/core/src/androidTest/java/io/plaidapp/core/designernews/data/database/LoggedInUserDaoTest.kt +++ b/core/src/androidTest/java/io/plaidapp/core/designernews/data/database/LoggedInUserDaoTest.kt @@ -18,7 +18,7 @@ package io.plaidapp.core.designernews.data.database import androidx.arch.core.executor.testing.InstantTaskExecutorRule import androidx.room.Room -import androidx.test.InstrumentationRegistry +import androidx.test.platform.app.InstrumentationRegistry import io.plaidapp.core.designernews.data.login.model.LoggedInUser import io.plaidapp.test.shared.LiveDataTestUtil import org.junit.After diff --git a/core/src/androidTest/java/io/plaidapp/core/designernews/data/login/AuthTokenLocalDataSourceTest.kt b/core/src/androidTest/java/io/plaidapp/core/designernews/data/login/AuthTokenLocalDataSourceTest.kt index 62c30bbc4..c5553c096 100644 --- a/core/src/androidTest/java/io/plaidapp/core/designernews/data/login/AuthTokenLocalDataSourceTest.kt +++ b/core/src/androidTest/java/io/plaidapp/core/designernews/data/login/AuthTokenLocalDataSourceTest.kt @@ -17,7 +17,7 @@ package io.plaidapp.core.designernews.data.login import android.content.Context -import androidx.test.InstrumentationRegistry +import androidx.test.platform.app.InstrumentationRegistry import org.junit.After import org.junit.Assert.assertEquals import org.junit.Assert.assertNull diff --git a/core/src/androidTest/java/io/plaidapp/core/designernews/data/login/LoginLocalDataSourceTest.kt b/core/src/androidTest/java/io/plaidapp/core/designernews/data/login/LoginLocalDataSourceTest.kt index c18313594..03c974f29 100644 --- a/core/src/androidTest/java/io/plaidapp/core/designernews/data/login/LoginLocalDataSourceTest.kt +++ b/core/src/androidTest/java/io/plaidapp/core/designernews/data/login/LoginLocalDataSourceTest.kt @@ -17,7 +17,7 @@ package io.plaidapp.core.designernews.data.login import android.content.Context -import androidx.test.InstrumentationRegistry.getInstrumentation +import androidx.test.platform.app.InstrumentationRegistry import io.plaidapp.core.designernews.data.login.model.LoggedInUser import org.junit.After import org.junit.Assert.assertEquals @@ -30,7 +30,7 @@ import org.junit.Test */ class LoginLocalDataSourceTest { - private var sharedPreferences = getInstrumentation().context + private var sharedPreferences = InstrumentationRegistry.getInstrumentation().context .getSharedPreferences("test", Context.MODE_PRIVATE) private var dataSource = LoginLocalDataSource(sharedPreferences) diff --git a/core/src/androidTest/java/io/plaidapp/core/dribbble/data/prefs/DribbbleV1SourceRemoverTest.kt b/core/src/androidTest/java/io/plaidapp/core/dribbble/data/prefs/DribbbleV1SourceRemoverTest.kt index 23a63b78d..bf9b65e13 100644 --- a/core/src/androidTest/java/io/plaidapp/core/dribbble/data/prefs/DribbbleV1SourceRemoverTest.kt +++ b/core/src/androidTest/java/io/plaidapp/core/dribbble/data/prefs/DribbbleV1SourceRemoverTest.kt @@ -17,8 +17,8 @@ package io.plaidapp.core.dribbble.data.prefs import android.content.Context -import androidx.test.InstrumentationRegistry import androidx.core.content.edit +import androidx.test.platform.app.InstrumentationRegistry import io.plaidapp.core.data.prefs.checkAndRemove import org.junit.After import org.junit.Assert.assertEquals diff --git a/core/src/androidTest/java/io/plaidapp/core/util/TextViewExtensionTest.kt b/core/src/androidTest/java/io/plaidapp/core/util/TextViewExtensionTest.kt index 2cabc82e3..baf2a01e7 100644 --- a/core/src/androidTest/java/io/plaidapp/core/util/TextViewExtensionTest.kt +++ b/core/src/androidTest/java/io/plaidapp/core/util/TextViewExtensionTest.kt @@ -16,15 +16,15 @@ package io.plaidapp.core.util -import androidx.test.InstrumentationRegistry import android.widget.TextView +import androidx.test.platform.app.InstrumentationRegistry import org.junit.Assert.assertTrue import org.junit.Test import java.util.concurrent.atomic.AtomicBoolean class TextViewExtensionTest { - private val context = InstrumentationRegistry.getContext() + private val context = InstrumentationRegistry.getInstrumentation().context private val view = TextView(context) @Test