From 7cf388c4de1569634e72e84e0603d575cfd25e52 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Wed, 17 Apr 2019 11:30:17 -0700 Subject: [PATCH] ThermalManagerServiceTest: change to new callback behavior Bug: 130644620 Test: atest ThermalManagerServiceTest Test: atest cts/tests/tests/os/src/android/os/cts/PowerManager_ThermalTest.java Test: atest frameworks/base/core/tests/coretests/src/android/os/PowerManagerTest.java Change-Id: I8af7c557df19580510a89734f203dd1d39bff5e1 --- .../server/power/ThermalManagerServiceTest.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java index 27d529635b70b..ccf7ca9d3cf05 100644 --- a/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java @@ -167,11 +167,12 @@ public class ThermalManagerServiceTest { verify(mEventListener1, timeout(CALLBACK_TIMEOUT_MILLI_SEC) .times(0)).notifyThrottling(any(Temperature.class)); verify(mStatusListener1, timeout(CALLBACK_TIMEOUT_MILLI_SEC) - .times(0)).onStatusChange(anyInt()); + .times(1)).onStatusChange(anyInt()); verify(mEventListener2, timeout(CALLBACK_TIMEOUT_MILLI_SEC) .times(0)).notifyThrottling(any(Temperature.class)); verify(mStatusListener2, timeout(CALLBACK_TIMEOUT_MILLI_SEC) - .times(0)).onStatusChange(anyInt()); + .times(1)).onStatusChange(anyInt()); + resetListenerMock(); mService.onBootPhase(SystemService.PHASE_ACTIVITY_MANAGER_READY); ArgumentCaptor captor = ArgumentCaptor.forClass(Temperature.class); verify(mEventListener1, timeout(CALLBACK_TIMEOUT_MILLI_SEC) @@ -202,11 +203,6 @@ public class ThermalManagerServiceTest { @Test public void testRegister() throws RemoteException { - // Unregister all - assertTrue(mService.mService.unregisterThermalEventListener(mEventListener1)); - assertTrue(mService.mService.unregisterThermalStatusListener(mStatusListener1)); - assertTrue(mService.mService.unregisterThermalEventListener(mEventListener2)); - assertTrue(mService.mService.unregisterThermalStatusListener(mStatusListener2)); resetListenerMock(); // Register callbacks and verify they are called assertTrue(mService.mService.registerThermalEventListener(mEventListener1));