From 86c95fc7ab41b1bd45598abf02df6974f8af6f1a Mon Sep 17 00:00:00 2001
From: jasonwshsu <jasonwshsu@google.com>
Date: Wed, 13 Jul 2022 12:25:23 +0800
Subject: [PATCH] Fix test case fail in HearingAidUtilsTest

Root Cause: Only happen when running `make RunSettingsRoboTests` not
happen when running `make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidUtilsTest`. It is dependency test case fail when other tests also have AlertDialog pop up alerady.

Solution: Move ShadowAlertDialog reset before running each test, not after running each test.

Bug: 238829557
Test: make RunSettingsRoboTests
Change-Id: I32da4ee87580b4f475556905f7574b211a69b29b
---
 .../android/settings/accessibility/HearingAidUtilsTest.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tests/robotests/src/com/android/settings/accessibility/HearingAidUtilsTest.java b/tests/robotests/src/com/android/settings/accessibility/HearingAidUtilsTest.java
index 6918fb679e5..efeb27f0686 100644
--- a/tests/robotests/src/com/android/settings/accessibility/HearingAidUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/HearingAidUtilsTest.java
@@ -28,7 +28,6 @@ import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.HearingAidProfile;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -59,12 +58,9 @@ public class HearingAidUtilsTest {
     public void setUp() {
         final FragmentActivity mActivity = Robolectric.setupActivity(FragmentActivity.class);
         mFragmentManager = mActivity.getSupportFragmentManager();
-    }
-
-    @After
-    public void tearDown() {
         ShadowAlertDialogCompat.reset();
     }
+
     @Test
     public void launchHearingAidPairingDialog_deviceNotConnectedHearingAid_noDialog() {
         when(mCachedBluetoothDevice.isConnectedHearingAidDevice()).thenReturn(false);