commit d0f23ef3cc259bc62b0c6909e3b6fce6384e748f
author Mady Mellor <madym@google.com> Wed Dec 04 16:05:54 2019 +0000
committer Mady Mellor <madym@google.com> Wed Dec 04 16:05:54 2019 +0000
tree 5a7fa8b3db2f4457c09e76c09f98b014784b06e9
parent 799a5677300adb8ad53240d8f25004e8395dceed

Revert "Don't use ActivityManagerTestBase"

This reverts commit 799a5677300adb8ad53240d8f25004e8395dceed.

Reason for revert: the test doesn't actually pass

Change-Id: I2b871f3eaa774ea3d788bcf119db93533acbf5da

tests/app/src/android/app/cts/NotificationManagerTest.java

diff --git a/tests/app/src/android/app/cts/NotificationManagerTest.java b/tests/app/src/android/app/cts/NotificationManagerTest.java
index ad455b6..fcd6a0a 100644
--- a/tests/app/src/android/app/cts/NotificationManagerTest.java
+++ b/tests/app/src/android/app/cts/NotificationManagerTest.java
@@ -100,6 +100,7 @@
 import android.provider.ContactsContract.Data;
 import android.provider.Settings;
 import android.provider.Telephony.Threads;
+import android.server.wm.ActivityManagerTestBase;
 import android.service.notification.Condition;
 import android.service.notification.NotificationListenerService;
 import android.service.notification.StatusBarNotification;
@@ -688,12 +689,19 @@
         mContext.unregisterReceiver(mBubbleBroadcastReceiver);
     }
 
-    private static String goHome() {
-        try {
-            return SystemUtil.runShellCommand(InstrumentationRegistry.getInstrumentation(),
-                    "am start -a android.intent.action.MAIN -c android.intent.category.HOME");
-        } catch (IOException e) {
-            throw new RuntimeException(e);
+    private class HomeHelper extends ActivityManagerTestBase implements AutoCloseable {
+
+        HomeHelper() throws Exception {
+            setUp();
+        }
+
+        void goHome() {
+            launchHomeActivity();
+        }
+
+        @Override
+        public void close() throws Exception {
+            tearDown();
         }
     }
 
@@ -2969,7 +2977,8 @@
             }
 
             // Make ourselves not foreground
-            goHome();
+            HomeHelper homeHelper = new HomeHelper();
+            homeHelper.goHome();
 
             // The notif should be allowed to update as a bubble
             a.sendBubble(4001, false /* autoExpand */);
@@ -2991,6 +3000,7 @@
             }
 
             cleanupSendBubbleActivity();
+            homeHelper.close();
         } finally {
             // turn off bubbles globally
             toggleBubbleSetting(false);