Merge "Fix flaky SilentModeHandlerUnitTest" into sc-dev

1 files changed, 14 insertions, 12 deletions

diff --git a/tests/carservice_unit_test/src/com/android/car/power/SilentModeHandlerUnitTest.java b/tests/carservice_unit_test/src/com/android/car/power/SilentModeHandlerUnitTest.java
index 5bc7974dc6..fdaf4ef577 100644
--- a/tests/carservice_unit_test/src/com/android/car/power/SilentModeHandlerUnitTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/power/SilentModeHandlerUnitTest.java
@@ -71,11 +71,11 @@ public final class SilentModeHandlerUnitTest {
 
         writeStringToFile(mFileHwStateMonitoring.getFile(), VALUE_SILENT_MODE);
 
-        assertSilentMode(handler, true);
+        assertSilentMode(handler, /* expectedMode= */ true);
 
         writeStringToFile(mFileHwStateMonitoring.getFile(), VALUE_NON_SILENT_MODE);
 
-        assertSilentMode(handler, false);
+        assertSilentMode(handler, /* expectedMode= */ false);
     }
 
     @Test
@@ -113,12 +113,12 @@ public final class SilentModeHandlerUnitTest {
                 mFileKernelSilentMode.getFile().getPath(), BOOT_REASON_NORMAL);
         handler.init();
 
-        handler.updateKernelSilentMode(true);
+        handler.updateKernelSilentMode(/* silent= */ true);
 
         String contents = readFileAsString(mFileKernelSilentMode.getPath());
         assertWithMessage("Kernel silent mode").that(contents).isEqualTo(VALUE_SILENT_MODE);
 
-        handler.updateKernelSilentMode(false);
+        handler.updateKernelSilentMode(/* silent= */ false);
 
         contents = readFileAsString(mFileKernelSilentMode.getPath());
         assertWithMessage("Kernel silent mode").that(contents).isEqualTo(VALUE_NON_SILENT_MODE);
@@ -126,36 +126,36 @@ public final class SilentModeHandlerUnitTest {
 
     @Test
     public void testSetSilentMode_normalSilentToForcedSilent() throws Exception {
-        testSetSilentMode_toForced(true, true);
+        testSetSilentMode_toForced(/* initSilentMode= */ true, /* expectedSilentMode = */ true);
     }
 
     @Test
     public void testSetSilentMode_normalSilentToForcedNonSilent() throws Exception {
-        testSetSilentMode_toForced(true, false);
+        testSetSilentMode_toForced(/* initSilentMode= */ true, /* expectedSilentMode = */ false);
         verify(mCarPowerManagementService, timeout(BUFFER_TIME_TO_AVOID_RACE_CONDITION))
                 .notifySilentModeChange(false);
     }
 
     @Test
     public void testSetSilentMode_normalNonSilentToForcedSilent() throws Exception {
-        testSetSilentMode_toForced(false, true);
+        testSetSilentMode_toForced(/* initSilentMode= */ false, /* expectedSilentMode = */ true);
         verify(mCarPowerManagementService, timeout(BUFFER_TIME_TO_AVOID_RACE_CONDITION))
                 .notifySilentModeChange(true);
     }
 
     @Test
     public void testSetSilentMode_normalNonSilentToForcedNonSilent() throws Exception {
-        testSetSilentMode_toForced(false, false);
+        testSetSilentMode_toForced(/* initSilentMode= */ false, /* expectedSilentMode = */ false);
     }
 
     @Test
     public void testSetSilentMode_forcedSilentToNonForced() throws Exception {
-        testSetSilentMode_toNonForced(true);
+        testSetSilentMode_toNonForced(/* initSilentMode= */ true);
     }
 
     @Test
     public void testSetSilentMode_forcedNonSilentToNonForced() throws Exception {
-        testSetSilentMode_toNonForced(false);
+        testSetSilentMode_toNonForced(/* initSilentMode= */ false);
     }
 
     private void testSetSilentMode_toForced(boolean initSilentMode, boolean expectedSilentMode)
@@ -215,10 +215,12 @@ public final class SilentModeHandlerUnitTest {
         }
     }
 
-    private static void assertSilentMode(SilentModeHandler handler, boolean expectedMode)
+    private void assertSilentMode(SilentModeHandler handler, boolean expectedMode)
             throws Exception {
+        String expectedValue = expectedMode ? VALUE_SILENT_MODE : VALUE_NON_SILENT_MODE;
         for (int i = 0; i < MAX_POLLING_TRIES; i++) {
-            if (handler.isSilentMode() == expectedMode) {
+            String contents = readFileAsString(mFileKernelSilentMode.getPath());
+            if (handler.isSilentMode() == expectedMode && contents.equals(expectedValue)) {
                 return;
             }
             SystemClock.sleep(POLLING_DELAY_MS);