diff --git a/services/tests/dreamservicetests/AndroidManifest.xml b/services/tests/dreamservicetests/AndroidManifest.xml index fc3ad34aaecbe..f4b88d9c18e9d 100644 --- a/services/tests/dreamservicetests/AndroidManifest.xml +++ b/services/tests/dreamservicetests/AndroidManifest.xml @@ -26,6 +26,32 @@ android:testOnly="true"> + + + + + + + + + + + + + + + + diff --git a/services/tests/servicestests/res/xml/test_dream_metadata_invalid.xml b/services/tests/dreamservicetests/res/xml/test_dream_metadata_invalid.xml similarity index 100% rename from services/tests/servicestests/res/xml/test_dream_metadata_invalid.xml rename to services/tests/dreamservicetests/res/xml/test_dream_metadata_invalid.xml diff --git a/services/tests/servicestests/src/com/android/server/dreams/DreamControllerTest.java b/services/tests/dreamservicetests/src/com/android/server/dreams/DreamControllerTest.java similarity index 99% rename from services/tests/servicestests/src/com/android/server/dreams/DreamControllerTest.java rename to services/tests/dreamservicetests/src/com/android/server/dreams/DreamControllerTest.java index a1d42ffc1b742..db704342ab611 100644 --- a/services/tests/servicestests/src/com/android/server/dreams/DreamControllerTest.java +++ b/services/tests/dreamservicetests/src/com/android/server/dreams/DreamControllerTest.java @@ -44,6 +44,7 @@ import android.os.RemoteException; import android.os.test.TestLooper; import android.service.dreams.IDreamService; +import androidx.test.filters.FlakyTest; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -231,6 +232,7 @@ public class DreamControllerTest { } @Test + @FlakyTest(bugId = 293109503) public void serviceDisconnect_resetsScreenTimeout() throws RemoteException { // Start dream. mDreamController.startDream(mToken, mDreamName, false /*isPreview*/, false /*doze*/, @@ -250,6 +252,7 @@ public class DreamControllerTest { } @Test + @FlakyTest(bugId = 293109503) public void binderDied_resetsScreenTimeout() throws RemoteException { // Start dream. mDreamController.startDream(mToken, mDreamName, false /*isPreview*/, false /*doze*/, diff --git a/services/tests/servicestests/src/com/android/server/dreams/DreamOverlayServiceTest.java b/services/tests/dreamservicetests/src/com/android/server/dreams/DreamOverlayServiceTest.java similarity index 99% rename from services/tests/servicestests/src/com/android/server/dreams/DreamOverlayServiceTest.java rename to services/tests/dreamservicetests/src/com/android/server/dreams/DreamOverlayServiceTest.java index f05fa65a43ea2..54f46078d30ba 100644 --- a/services/tests/servicestests/src/com/android/server/dreams/DreamOverlayServiceTest.java +++ b/services/tests/dreamservicetests/src/com/android/server/dreams/DreamOverlayServiceTest.java @@ -35,6 +35,7 @@ import android.service.dreams.IDreamOverlayClientCallback; import android.view.WindowManager; import androidx.annotation.NonNull; +import androidx.test.filters.FlakyTest; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -123,6 +124,7 @@ public class DreamOverlayServiceTest { * Verifies that callbacks for subclasses are run on the provided executor. */ @Test + @FlakyTest(bugId = 293108088) public void testCallbacksRunOnExecutor() throws RemoteException { final TestDreamOverlayService.Monitor monitor = Mockito.mock( TestDreamOverlayService.Monitor.class); diff --git a/services/tests/servicestests/src/com/android/server/dreams/DreamServiceTest.java b/services/tests/dreamservicetests/src/com/android/server/dreams/DreamServiceTest.java similarity index 95% rename from services/tests/servicestests/src/com/android/server/dreams/DreamServiceTest.java rename to services/tests/dreamservicetests/src/com/android/server/dreams/DreamServiceTest.java index 0efd296fd8b6b..d231e40f5d0d1 100644 --- a/services/tests/servicestests/src/com/android/server/dreams/DreamServiceTest.java +++ b/services/tests/dreamservicetests/src/com/android/server/dreams/DreamServiceTest.java @@ -36,13 +36,13 @@ import org.junit.runner.RunWith; @SmallTest @RunWith(AndroidJUnit4.class) public class DreamServiceTest { - private static final String TEST_PACKAGE_NAME = "com.android.frameworks.servicestests"; + private static final String TEST_PACKAGE_NAME = "com.android.frameworks.dreamservicetests"; @Test public void testMetadataParsing() throws PackageManager.NameNotFoundException { final String testDreamClassName = "com.android.server.dreams.TestDreamService"; final String testSettingsActivity = - "com.android.frameworks.servicestests/.TestDreamSettingsActivity"; + "com.android.frameworks.dreamservicetests/.TestDreamSettingsActivity"; final DreamService.DreamMetadata metadata = getDreamMetadata(testDreamClassName); assertThat(metadata.settingsActivity).isEqualTo( diff --git a/services/tests/servicestests/src/com/android/server/dreams/TestDreamService.java b/services/tests/dreamservicetests/src/com/android/server/dreams/TestDreamService.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/dreams/TestDreamService.java rename to services/tests/dreamservicetests/src/com/android/server/dreams/TestDreamService.java diff --git a/services/tests/servicestests/src/com/android/server/dreams/TestDreamServiceWithInvalidSettings.java b/services/tests/dreamservicetests/src/com/android/server/dreams/TestDreamServiceWithInvalidSettings.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/dreams/TestDreamServiceWithInvalidSettings.java rename to services/tests/dreamservicetests/src/com/android/server/dreams/TestDreamServiceWithInvalidSettings.java diff --git a/services/tests/servicestests/AndroidManifest.xml b/services/tests/servicestests/AndroidManifest.xml index fa0a9713fec07..0089d4cafaadc 100644 --- a/services/tests/servicestests/AndroidManifest.xml +++ b/services/tests/servicestests/AndroidManifest.xml @@ -144,32 +144,6 @@ android:resource="@xml/test_account_type2_authenticator"/> - - - - - - - - - - - - - - - -