Merge "Disable tests in API 31 that are covered by CTS, media test suite or FAT." into emu-master-dev

8 files changed, 32 insertions, 23 deletions

diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/AddGoogleAccountTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/AddGoogleAccountTest.java
index 431375fd..5b31732d 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/AddGoogleAccountTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/AddGoogleAccountTest.java
@@ -29,6 +29,7 @@ import com.android.devtools.systemimage.uitest.utils.AppLauncher;
 import com.android.devtools.systemimage.uitest.utils.Wait;
 import com.android.devtools.systemimage.uitest.watchers.watcher;
 
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.Timeout;
@@ -65,6 +66,7 @@ public class AddGoogleAccountTest {
      */
     @Test
     @TestInfo(id = "14581151")
+    @Ignore("Covered by FAT")
     public void testAddAccountUsingContactsApp() throws Exception {
         final Instrumentation instrumentation = testFramework.getInstrumentation();
         final UiDevice mDevice = testFramework.getDevice();
@@ -97,4 +99,4 @@ public class AddGoogleAccountTest {
         assertTrue("Add Google account page not found",
                 new Wait(10000L).until(signInHeader::exists));
     }
-}
\ No newline at end of file
+}
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/ApiDemosTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/ApiDemosTest.java
index 7a673bef..778a0379 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/ApiDemosTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/ApiDemosTest.java
@@ -35,6 +35,7 @@ import junit.framework.Assert;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.Timeout;
@@ -88,7 +89,7 @@ public class ApiDemosTest {
      *
      */
     @Test
-    @TestInfo(id = "T144630615")
+    @Ignore("Covered by CTS. Move it to FAT")
     public void testPasswordQuality() throws Exception {
         AppLauncher.launch(instrumentation, "API Demos");
 
@@ -155,4 +156,4 @@ public class ApiDemosTest {
         //Deactivate "Device Admin" to restore the state.
         SettingsUtil.deactivate(instrumentation, "Sample Device Admin", "Security", "Device admin apps");
     }
-}
\ No newline at end of file
+}
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/AppTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/AppTest.java
index 60556b7b..49811081 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/AppTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/AppTest.java
@@ -33,6 +33,7 @@ import com.android.devtools.systemimage.uitest.utils.Wait;
 import com.android.devtools.systemimage.uitest.watchers.AppWatcher;
 import com.android.devtools.systemimage.uitest.watchers.watcher;
 
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.Timeout;
@@ -74,6 +75,7 @@ public class AppTest {
      */
     @Test
     @TestInfo(id = "14578823")
+    @Ignore("Covered by CTS. Move to FAT")
     public void installAppAndLaunch() throws Exception {
         Instrumentation instrumentation = testFramework.getInstrumentation();
         UiDevice device = UiDevice.getInstance(instrumentation);
@@ -116,6 +118,7 @@ public class AppTest {
      */
     @Test
     @TestInfo(id = "14578831")
+    @Ignore("Covered by FAT")
     public void bookmarkWebSiteInBrowser() throws Exception {
         Instrumentation instrumentation = testFramework.getInstrumentation();
         final UiDevice device = UiDevice.getInstance(instrumentation);
@@ -196,4 +199,4 @@ public class AppTest {
             trashCan.click();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/CameraTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/CameraTest.java
index 645a70a6..1bafc154 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/CameraTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/CameraTest.java
@@ -29,6 +29,7 @@ import com.android.devtools.systemimage.uitest.utils.Wait;
 import com.android.devtools.systemimage.uitest.watchers.watcher;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.Timeout;
@@ -69,6 +70,7 @@ public class CameraTest {
      */
     @Test
     @TestInfo(id = "ab5f9585-433b-4261-bd15-5c7136f6127b")
+    @Ignore("Covered by CTS. Move to FAT")
     public void testPhotoCapture() throws Exception {
         Instrumentation instrumentation = testFramework.getInstrumentation();
         boolean photoTestSuccess = CameraTestUtil.useCamera(instrumentation, "Images", 3);
@@ -98,6 +100,7 @@ public class CameraTest {
      */
     @Test
     @TestInfo(id = "ab5f9585-433b-4261-bd15-5c7136f6127b")
+    @Ignore("Covered by CTS. Move to FAT")
     public void testVideoCapture() throws Exception {
         Instrumentation instrumentation = testFramework.getInstrumentation();
         boolean videoTestSuccess = CameraTestUtil.useCamera(instrumentation, "Videos", 3);
@@ -118,6 +121,7 @@ public class CameraTest {
      */
     @Test
     @TestInfo(id = "61ba18b5-cfba-46a7-a3f2-abfc60e40303")
+    @Ignore("Covered by FAT")
     public void launchARApp() throws Exception {
         Instrumentation instrumentation = testFramework.getInstrumentation();
         final UiDevice device = testFramework.getDevice();
@@ -137,4 +141,4 @@ public class CameraTest {
                 })
         );
     }
-}
\ No newline at end of file
+}
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/PlayStoreTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/PlayStoreTest.java
index 346abd86..86f173f5 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/PlayStoreTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/PlayStoreTest.java
@@ -31,6 +31,7 @@ import com.android.devtools.systemimage.uitest.watchers.GoogleAppConfirmationWat
 import com.android.devtools.systemimage.uitest.watchers.watcher;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.Timeout;
@@ -78,6 +79,7 @@ public class PlayStoreTest {
      */
     @Test
     @TestInfo(id = "50027a89-8043-44d7-b7ed-33c631903910")
+    @Ignore("Covered by FAT")
     public void testPlaySearch() throws Exception {
         if (testFramework.isGoogleApiAndPlayImage()) {
             Instrumentation instrumentation = testFramework.getInstrumentation();
@@ -111,6 +113,7 @@ public class PlayStoreTest {
      */
     @Test
     @TestInfo(id = "cb0ccd97-f045-42fa-8293-a32e94e838aa")
+    @Ignore("Covered by FAT")
     public void testAppInstallation() throws Exception {
         if (testFramework.isGoogleApiAndPlayImage()) {
             Instrumentation instrumentation = testFramework.getInstrumentation();
@@ -151,6 +154,7 @@ public class PlayStoreTest {
      */
     @Test
     @TestInfo(id = "924a0428-4e07-4794-b6a7-2c9d407204aa")
+    @Ignore("Covered by FAT")
     public void testAppInstallationAndLaunch() throws Exception {
         if (testFramework.isGoogleApiAndPlayImage()) {
             Instrumentation instrumentation = testFramework.getInstrumentation();
@@ -219,6 +223,7 @@ public class PlayStoreTest {
      */
     @Test
     @TestInfo(id = "bd9460a8-7b07-4cfc-901f-a99564533e51")
+    @Ignore("Covered by FAT")
     public void testPayAppVerification() throws Exception {
         if (testFramework.isGoogleApiAndPlayImage()) {
             Instrumentation instrumentation = testFramework.getInstrumentation();
@@ -261,6 +266,7 @@ public class PlayStoreTest {
      */
     @Test
     @TestInfo(id = "fe78dba5-a0f2-4acf-bcbb-10b1c15d3484")
+    @Ignore("Covered by FAT")
     public void testParentalControls() throws Exception {
         if (testFramework.isGoogleApiAndPlayImage()) {
             final Instrumentation instrumentation = testFramework.getInstrumentation();
@@ -286,4 +292,4 @@ public class PlayStoreTest {
             device.pressHome();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/SettingsTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/SettingsTest.java
index 93fecd84..218dcd14 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/SettingsTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/SettingsTest.java
@@ -502,7 +502,6 @@ public class SettingsTest {
      *   </pre>
      */
     @Test
-    @TestInfo(id = "T144630613")
     public void activateDeactivatePolicy() throws Exception {
         try {
             SettingsUtil.launchDeviceAdminApps(instrumentation, "Security", "Device admin apps");
@@ -589,10 +588,10 @@ public class SettingsTest {
      *   1. App settings for Maps are reset to default (Verify that Permissions and notification
      *   settings for Maps are cleared).
      *   </pre>
-     */
-    @Ignore("Test is canceled on crash during app permission reset.")
+     */    
     @Test
     @TestInfo(id = "d49facce-9be7-47e0-afde-2052d3c57a25")
+    @Ignore("Test is canceled on crash during app permission reset")
     public void modifyAndResetAppPermissions() throws Exception {
         String appName = "Maps";
         String contactsText = "Contacts";
@@ -809,9 +808,9 @@ public class SettingsTest {
      *   2. Test file is copied into the Download folder.
      *   3. Test file is deleted from the Download folder.
      *   </pre>
-     */
-    @Ignore("Cannot access external storage without a runtime permissions implementation")
+     */    
     @Test
+    @Ignore("Cannot access external storage without a runtime permissions implementation")
     public void filesDeleted() throws Exception {
         String[] testFileNames = {"test_text_01.txt", "test_text_02.txt", "test_text_03.txt"};
 
@@ -833,4 +832,4 @@ public class SettingsTest {
                     SettingsUtil.hasTestFile(instrumentation, name));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/VpnTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/VpnTest.java
index ef1a304f..47a7eea1 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/VpnTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/VpnTest.java
@@ -68,7 +68,6 @@ public class VpnTest {
      * <p/>
      */
     @Test
-    @TestInfo(id = "14578822")
     public void testVpn() throws Exception {
         Instrumentation instrumentation = testFramework.getInstrumentation();
         UiDevice device = testFramework.getDevice();
@@ -93,4 +92,4 @@ public class VpnTest {
                     VpnTestUtil.verifyVpnStatus_v2(device));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/YouTubeTest.java b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/YouTubeTest.java
index 9331a362..f953bdad 100644
--- a/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/YouTubeTest.java
+++ b/system_image_uitests/app/src/androidTest/java/com/android/devtools/systemimage/uitest/smoke/api31/YouTubeTest.java
@@ -29,6 +29,7 @@ import com.android.devtools.systemimage.uitest.utils.GoogleAppUtil;
 import com.android.devtools.systemimage.uitest.utils.YouTubeUtil;
 
 import org.junit.FixMethodOrder;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.Timeout;
@@ -59,9 +60,6 @@ public class YouTubeTest {
 
     /**
      * Verify YouTube has the latest version or not.
-     * <p>
-     * TT ID: XXXX
-     * <p>
      *   <pre>
      *   Test Steps:
      *   1. Start an emulator and launch home screen.
@@ -72,7 +70,7 @@ public class YouTubeTest {
      *   </pre>
      */
     @Test
-    @TestInfo(id = "XXXX")
+    @Ignore("Covered by media test suite")
     public void checkYouTubeVersion() throws Exception{
         Instrumentation instrumentation = testFramework.getInstrumentation();
         UiDevice device = UiDevice.getInstance(instrumentation);
@@ -84,9 +82,6 @@ public class YouTubeTest {
 
     /**
      * Verify YouTube login and logout are working correctly.
-     * <p>
-     * TT ID: XXXX
-     * <p>
      *   <pre>
      *   Test Steps:
      *   1. Start an emulator and launch home screen
@@ -100,7 +95,7 @@ public class YouTubeTest {
      *   </pre>
      */
     @Test
-    @TestInfo(id = "XXXX")
+    @Ignore("Covered by media test suite")
     public void loginYouTube() throws Exception {
         Instrumentation instrumentation = testFramework.getInstrumentation();
         UiDevice device = UiDevice.getInstance(instrumentation);
@@ -131,4 +126,4 @@ public class YouTubeTest {
         assertFalse("YouTube log out was unsuccessful",
                 YouTubeUtil.isTestUserLoggedIn(instrumentation));
     }
-}
\ No newline at end of file
+}