diff options
4 files changed, 4 insertions, 10 deletions
diff --git a/ravenwood/TEST_MAPPING b/ravenwood/TEST_MAPPING index 607592b4cbbe..cb54e9f56c0c 100644 --- a/ravenwood/TEST_MAPPING +++ b/ravenwood/TEST_MAPPING @@ -113,10 +113,6 @@ "host": true }, { - "name": "FrameworksMockingServicesTestsRavenwood", - "host": true - }, - { "name": "FrameworksServicesTestsRavenwood_Compat", "host": true }, diff --git a/ravenwood/tests/bivalentinst/test/com/android/ravenwoodtest/bivalentinst/RavenwoodInstrumentationTest_nonself.java b/ravenwood/tests/bivalentinst/test/com/android/ravenwoodtest/bivalentinst/RavenwoodInstrumentationTest_nonself.java index ed1992cdd1ea..77874bd28677 100644 --- a/ravenwood/tests/bivalentinst/test/com/android/ravenwoodtest/bivalentinst/RavenwoodInstrumentationTest_nonself.java +++ b/ravenwood/tests/bivalentinst/test/com/android/ravenwoodtest/bivalentinst/RavenwoodInstrumentationTest_nonself.java @@ -19,7 +19,6 @@ import static com.google.common.truth.Truth.assertThat; import android.app.Instrumentation; import android.content.Context; -import android.platform.test.annotations.DisabledOnRavenwood; import android.platform.test.ravenwood.RavenwoodConfig; import android.platform.test.ravenwood.RavenwoodConfig.Config; @@ -34,7 +33,7 @@ import org.junit.runner.RunWith; * Tests for the case where the instrumentation target is _not_ the test APK itself. */ @RunWith(AndroidJUnit4.class) -@DisabledOnRavenwood(reason="AOSP is missing resources support") +@android.platform.test.annotations.DisabledOnRavenwood(reason = "AOSP is missing resources support") public class RavenwoodInstrumentationTest_nonself { private static final String TARGET_PACKAGE_NAME = "com.android.ravenwood.bivalentinst_target_app"; diff --git a/ravenwood/tests/bivalentinst/test/com/android/ravenwoodtest/bivalentinst/RavenwoodInstrumentationTest_self.java b/ravenwood/tests/bivalentinst/test/com/android/ravenwoodtest/bivalentinst/RavenwoodInstrumentationTest_self.java index b5bafc435845..203923bb551b 100644 --- a/ravenwood/tests/bivalentinst/test/com/android/ravenwoodtest/bivalentinst/RavenwoodInstrumentationTest_self.java +++ b/ravenwood/tests/bivalentinst/test/com/android/ravenwoodtest/bivalentinst/RavenwoodInstrumentationTest_self.java @@ -19,7 +19,6 @@ import static com.google.common.truth.Truth.assertThat; import android.app.Instrumentation; import android.content.Context; -import android.platform.test.annotations.DisabledOnRavenwood; import android.platform.test.ravenwood.RavenwoodConfig; import android.platform.test.ravenwood.RavenwoodConfig.Config; @@ -34,7 +33,7 @@ import org.junit.runner.RunWith; * Tests for the case where the instrumentation target is the test APK itself. */ @RunWith(AndroidJUnit4.class) -@DisabledOnRavenwood(reason="AOSP is missing resources support") +@android.platform.test.annotations.DisabledOnRavenwood(reason = "AOSP is missing resources support") public class RavenwoodInstrumentationTest_self { private static final String TARGET_PACKAGE_NAME = diff --git a/ravenwood/tests/services-test/test/com/android/ravenwoodtest/servicestest/RavenwoodServicesTest.java b/ravenwood/tests/services-test/test/com/android/ravenwoodtest/servicestest/RavenwoodServicesTest.java index 52bf92e25f19..eeb71100cd9d 100644 --- a/ravenwood/tests/services-test/test/com/android/ravenwoodtest/servicestest/RavenwoodServicesTest.java +++ b/ravenwood/tests/services-test/test/com/android/ravenwoodtest/servicestest/RavenwoodServicesTest.java @@ -24,7 +24,6 @@ import static org.junit.Assert.fail; import android.content.Context; import android.hardware.SerialManager; import android.hardware.SerialManagerInternal; -import android.platform.test.annotations.DisabledOnRavenwood; import android.platform.test.ravenwood.RavenwoodConfig; import android.platform.test.ravenwood.RavenwoodConfig.Config; @@ -70,7 +69,8 @@ public class RavenwoodServicesTest { } @Test - @DisabledOnRavenwood(reason="AOSP is missing resources support") + @android.platform.test.annotations.DisabledOnRavenwood( + reason = "AOSP is missing resources support") public void testSimple() { // Verify that we can obtain a manager, and talk to the backend service, and that no // serial ports are configured by default |