diff options
5 files changed, 31 insertions, 14 deletions
diff --git a/core/tests/coretests/src/android/content/ContextTest.java b/core/tests/coretests/src/android/content/ContextTest.java index f0997a68492b..aab39bf61163 100644 --- a/core/tests/coretests/src/android/content/ContextTest.java +++ b/core/tests/coretests/src/android/content/ContextTest.java @@ -24,13 +24,18 @@ import android.app.ActivityThread; import android.hardware.display.DisplayManager; import android.os.UserHandle; -import androidx.test.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; import org.junit.Test; import org.junit.runner.RunWith; +/** + * + * Build/Install/Run: + * atest FrameworksCoreTests:ContextTest + */ @SmallTest @RunWith(AndroidJUnit4.class) public class ContextTest { diff --git a/core/tests/coretests/src/android/view/ImeInsetsSourceConsumerTest.java b/core/tests/coretests/src/android/view/ImeInsetsSourceConsumerTest.java index 03aba25bf9f7..54fd00d22706 100644 --- a/core/tests/coretests/src/android/view/ImeInsetsSourceConsumerTest.java +++ b/core/tests/coretests/src/android/view/ImeInsetsSourceConsumerTest.java @@ -35,9 +35,9 @@ import android.view.WindowManager.LayoutParams; import android.view.inputmethod.EditorInfo; import android.widget.TextView; -import androidx.test.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.FlakyTest; -import androidx.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; import org.junit.Before; import org.junit.Test; @@ -45,12 +45,18 @@ import org.junit.runner.RunWith; import java.util.ArrayList; +/** + * Test {@link InsetsSourceConsumer} with IME type. + * + * Build/Install/Run: + * atest FrameworksCoreTests:ImeInsetsSourceConsumerTest + */ @Presubmit @FlakyTest(detail = "Promote once confirmed non-flaky") @RunWith(AndroidJUnit4.class) public class ImeInsetsSourceConsumerTest { - Context mContext = InstrumentationRegistry.getTargetContext(); + Context mContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); ImeInsetsSourceConsumer mImeConsumer; InsetsController mController; SurfaceControl mLeash; diff --git a/core/tests/coretests/src/android/view/InsetsControllerTest.java b/core/tests/coretests/src/android/view/InsetsControllerTest.java index d432dda4a1be..ade31d8e4173 100644 --- a/core/tests/coretests/src/android/view/InsetsControllerTest.java +++ b/core/tests/coretests/src/android/view/InsetsControllerTest.java @@ -60,8 +60,8 @@ import android.view.animation.LinearInterpolator; import android.view.test.InsetsModeSession; import android.widget.TextView; -import androidx.test.InstrumentationRegistry; -import androidx.test.runner.AndroidJUnit4; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; import com.android.server.testutils.OffsettableClock; import com.android.server.testutils.TestHandler; @@ -113,7 +113,7 @@ public class InsetsControllerTest { .setName("testSurface") .build(); InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> { - Context context = InstrumentationRegistry.getTargetContext(); + Context context = InstrumentationRegistry.getInstrumentation().getTargetContext(); // cannot mock ViewRootImpl since it's final. mViewRoot = new ViewRootImpl(context, context.getDisplayNoVerify()); try { diff --git a/core/tests/coretests/src/android/view/InsetsSourceConsumerTest.java b/core/tests/coretests/src/android/view/InsetsSourceConsumerTest.java index 754c6791cade..cc93f9a5b59c 100644 --- a/core/tests/coretests/src/android/view/InsetsSourceConsumerTest.java +++ b/core/tests/coretests/src/android/view/InsetsSourceConsumerTest.java @@ -17,8 +17,8 @@ package android.view; import static android.view.InsetsState.ITYPE_STATUS_BAR; - import static android.view.WindowInsets.Type.statusBars; + import static junit.framework.Assert.assertEquals; import static junit.framework.TestCase.assertFalse; import static junit.framework.TestCase.assertTrue; @@ -37,8 +37,8 @@ import android.view.WindowManager.BadTokenException; import android.view.WindowManager.LayoutParams; import android.widget.TextView; -import androidx.test.InstrumentationRegistry; -import androidx.test.runner.AndroidJUnit4; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; import org.junit.Before; import org.junit.Test; diff --git a/core/tests/coretests/src/android/view/ViewRootImplTest.java b/core/tests/coretests/src/android/view/ViewRootImplTest.java index 0d497e113537..ecc3b4f072f9 100644 --- a/core/tests/coretests/src/android/view/ViewRootImplTest.java +++ b/core/tests/coretests/src/android/view/ViewRootImplTest.java @@ -40,9 +40,9 @@ import android.platform.test.annotations.Presubmit; import android.view.WindowInsets.Side; import android.view.WindowInsets.Type; -import androidx.test.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; import org.junit.Before; import org.junit.Test; @@ -51,6 +51,12 @@ import org.junit.runner.RunWith; import java.lang.reflect.Field; import java.lang.reflect.Method; +/** + * Tests for {@link ViewRootImpl} + * + * Build/Install/Run: + * atest FrameworksCoreTests:ViewRootImplTest + */ @Presubmit @SmallTest @RunWith(AndroidJUnit4.class) @@ -61,7 +67,7 @@ public class ViewRootImplTest { @Before public void setUp() throws Exception { - mContext = InstrumentationRegistry.getContext(); + mContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> { mViewRootImpl = new ViewRootImplAccessor( |