commit e6d86e20aa27084a2fd88ea5b244bb242bb2b1cf
author Vinit Nayak <peanutbutter@google.com> Tue Mar 28 22:04:46 2023 -0700
committer Vinit Nayak <peanutbutter@google.com> Wed Mar 29 18:21:45 2023 +0000
tree dc9703b1a8a6ca8505c3b4e82b84a6f70b2b81b4
parent 3f10b13a09f16e6b4f501725d47be1577b292f61

Consolidate WorkProfileTest "@After" methods

* There were two separate methods, which can run in
any order. Consolidate to reduce variability

Bug: 243688989
Change-Id: Ic924aa8a5d75505aecf6c830c63a85a0d2028d83

tests/src/com/android/launcher3/ui/WorkProfileTest.java

diff --git a/tests/src/com/android/launcher3/ui/WorkProfileTest.java b/tests/src/com/android/launcher3/ui/WorkProfileTest.java
index c22f93d..199653b 100644
--- a/tests/src/com/android/launcher3/ui/WorkProfileTest.java
+++ b/tests/src/com/android/launcher3/ui/WorkProfileTest.java
@@ -36,6 +36,7 @@
 import com.android.launcher3.allapps.WorkPausedCard;
 import com.android.launcher3.allapps.WorkProfileManager;
 import com.android.launcher3.tapl.LauncherInstrumentation;
+import com.android.launcher3.testing.shared.TestProtocol;
 
 import org.junit.After;
 import org.junit.Before;
@@ -90,17 +91,14 @@
 
     @After
     public void removeWorkProfile() throws Exception {
-        mDevice.executeShellCommand("pm remove-user " + mProfileUserId);
-    }
-
-    @After
-    public void resumeAppStoreUpdate() {
+        Log.d(TestProtocol.WORK_TAB_MISSING, "WorkProfileTest teardown");
         executeOnLauncher(launcher -> {
             if (launcher == null || launcher.getAppsView() == null) {
                 return;
             }
             launcher.getAppsView().getAppsStore().disableDeferUpdates(DEFER_UPDATES_TEST);
         });
+        mDevice.executeShellCommand("pm remove-user " + mProfileUserId);
     }
 
     private void waitForWorkTabSetup() {