diff options
6 files changed, 10 insertions, 10 deletions
diff --git a/tests/activity/src/com/android/intentresolver/ResolverActivityTest.java b/tests/activity/src/com/android/intentresolver/ResolverActivityTest.java index dde2f980..05d397a2 100644 --- a/tests/activity/src/com/android/intentresolver/ResolverActivityTest.java +++ b/tests/activity/src/com/android/intentresolver/ResolverActivityTest.java @@ -49,7 +49,7 @@ import android.view.View; import android.widget.RelativeLayout; import android.widget.TextView; -import androidx.test.InstrumentationRegistry; +import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.espresso.Espresso; import androidx.test.espresso.NoMatchingViewException; import androidx.test.rule.ActivityTestRule; diff --git a/tests/activity/src/com/android/intentresolver/UnbundledChooserActivityWorkProfileTest.java b/tests/activity/src/com/android/intentresolver/UnbundledChooserActivityWorkProfileTest.java index da879f74..12def1de 100644 --- a/tests/activity/src/com/android/intentresolver/UnbundledChooserActivityWorkProfileTest.java +++ b/tests/activity/src/com/android/intentresolver/UnbundledChooserActivityWorkProfileTest.java @@ -44,7 +44,7 @@ import android.companion.DeviceFilter; import android.content.Intent; import android.os.UserHandle; -import androidx.test.InstrumentationRegistry; +import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.espresso.NoMatchingViewException; import androidx.test.rule.ActivityTestRule; diff --git a/tests/activity/src/com/android/intentresolver/v2/ResolverActivityTest.java b/tests/activity/src/com/android/intentresolver/v2/ResolverActivityTest.java index 993f1760..21fe2904 100644 --- a/tests/activity/src/com/android/intentresolver/v2/ResolverActivityTest.java +++ b/tests/activity/src/com/android/intentresolver/v2/ResolverActivityTest.java @@ -49,7 +49,7 @@ import android.view.View; import android.widget.RelativeLayout; import android.widget.TextView; -import androidx.test.InstrumentationRegistry; +import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.espresso.Espresso; import androidx.test.espresso.NoMatchingViewException; import androidx.test.rule.ActivityTestRule; diff --git a/tests/activity/src/com/android/intentresolver/v2/UnbundledChooserActivityWorkProfileTest.java b/tests/activity/src/com/android/intentresolver/v2/UnbundledChooserActivityWorkProfileTest.java index 92037ec9..8d83773e 100644 --- a/tests/activity/src/com/android/intentresolver/v2/UnbundledChooserActivityWorkProfileTest.java +++ b/tests/activity/src/com/android/intentresolver/v2/UnbundledChooserActivityWorkProfileTest.java @@ -44,7 +44,7 @@ import android.companion.DeviceFilter; import android.content.Intent; import android.os.UserHandle; -import androidx.test.InstrumentationRegistry; +import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.espresso.NoMatchingViewException; import androidx.test.rule.ActivityTestRule; diff --git a/tests/unit/src/com/android/intentresolver/model/AbstractResolverComparatorTest.java b/tests/unit/src/com/android/intentresolver/model/AbstractResolverComparatorTest.java index 2140a67d..5cec9734 100644 --- a/tests/unit/src/com/android/intentresolver/model/AbstractResolverComparatorTest.java +++ b/tests/unit/src/com/android/intentresolver/model/AbstractResolverComparatorTest.java @@ -25,7 +25,7 @@ import android.content.pm.ActivityInfo; import android.content.pm.ResolveInfo; import android.os.Message; -import androidx.test.InstrumentationRegistry; +import androidx.test.platform.app.InstrumentationRegistry; import com.android.intentresolver.ResolvedComponentInfo; import com.android.intentresolver.chooser.TargetInfo; @@ -47,7 +47,7 @@ public class AbstractResolverComparatorTest { ResolvedComponentInfo r2 = createResolvedComponentInfo( new ComponentName("zackage", "zlass")); - Context context = InstrumentationRegistry.getTargetContext(); + Context context = InstrumentationRegistry.getInstrumentation().getTargetContext(); AbstractResolverComparator comparator = getTestComparator(context, null); assertEquals("Pinned ranks over unpinned", -1, comparator.compare(r1, r2)); @@ -64,7 +64,7 @@ public class AbstractResolverComparatorTest { new ComponentName("zackage", "zlass")); r2.setPinned(true); - Context context = InstrumentationRegistry.getTargetContext(); + Context context = InstrumentationRegistry.getInstrumentation().getTargetContext(); AbstractResolverComparator comparator = getTestComparator(context, null); assertEquals("Both pinned should rank alphabetically", -1, comparator.compare(r1, r2)); @@ -78,7 +78,7 @@ public class AbstractResolverComparatorTest { ResolvedComponentInfo r2 = createResolvedComponentInfo( new ComponentName("package", "class")); - Context context = InstrumentationRegistry.getTargetContext(); + Context context = InstrumentationRegistry.getInstrumentation().getTargetContext(); AbstractResolverComparator comparator = getTestComparator(context, promoteToFirst); assertEquals("PromoteToFirst ranks over non-cemented", -1, comparator.compare(r1, r2)); @@ -94,7 +94,7 @@ public class AbstractResolverComparatorTest { new ComponentName("package", "class")); r2.setPinned(true); - Context context = InstrumentationRegistry.getTargetContext(); + Context context = InstrumentationRegistry.getInstrumentation().getTargetContext(); AbstractResolverComparator comparator = getTestComparator(context, cementedComponent); assertEquals("PromoteToFirst ranks over pinned", -1, comparator.compare(r1, r2)); diff --git a/tests/unit/src/com/android/intentresolver/v2/ui/ShareResultSenderImplTest.kt b/tests/unit/src/com/android/intentresolver/v2/ui/ShareResultSenderImplTest.kt index 371f9c26..d894cad5 100644 --- a/tests/unit/src/com/android/intentresolver/v2/ui/ShareResultSenderImplTest.kt +++ b/tests/unit/src/com/android/intentresolver/v2/ui/ShareResultSenderImplTest.kt @@ -23,7 +23,7 @@ import android.content.Intent import android.os.Process import android.service.chooser.ChooserResult import android.service.chooser.Flags -import androidx.test.InstrumentationRegistry +import androidx.test.platform.app.InstrumentationRegistry import com.android.intentresolver.inject.FakeChooserServiceFlags import com.android.intentresolver.v2.ui.model.ShareAction import com.google.common.truth.Truth.assertThat |