From 7f731773c6520854171df90acbaa013e713d4a86 Mon Sep 17 00:00:00 2001
From: felipeal <felipeal@google.com>
Date: Mon, 27 Apr 2020 14:16:43 -0700
Subject: More improvements on android.car.test.utils package.

- Added more helpers to mock static methods on AbstractExtendMockitoTestCase.
- Refactored blocking UserLifeCycleListener into OneEventUserLifecycleListener.
- Moved custom ArgumentMatchers to CarArgumentMatchers.
- Moved common car-related mock calls to CarMockitoHelper.

Bug: 149099817
Test: atest \
  CarUserManagerHelperTest InitialUserSetterTest \
  UserHelperTest CarPowerManagementServiceTest \
  UserHalServiceTest VendorServiceControllerTest \
  CarUserManagerUnitTest CarUserNoticeServiceTest CarUserServiceTest

Change-Id: Ia2b9359d5b0a502d72e35eabbe8b2e487885e8d8
---
 .../src/com/android/car/user/CarUserNoticeServiceTest.java           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'tests/carservice_unit_test/src/com/android/car/user/CarUserNoticeServiceTest.java')

diff --git a/tests/carservice_unit_test/src/com/android/car/user/CarUserNoticeServiceTest.java b/tests/carservice_unit_test/src/com/android/car/user/CarUserNoticeServiceTest.java
index 09c6deb7eb..695db41c69 100644
--- a/tests/carservice_unit_test/src/com/android/car/user/CarUserNoticeServiceTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/user/CarUserNoticeServiceTest.java
@@ -101,7 +101,7 @@ public class CarUserNoticeServiceTest extends AbstractExtendMockitoTestCase {
     @Override
     protected void onSessionBuilder(CustomMockitoSessionBuilder session) {
         session
-            .mockStatic(CarLocalServices.class)
+            .spyStatic(CarLocalServices.class)
             .mockStatic(Settings.Secure.class);
     }
 
@@ -113,7 +113,6 @@ public class CarUserNoticeServiceTest extends AbstractExtendMockitoTestCase {
         doReturn(mCarPowerManager).when(() -> CarLocalServices.createCarPowerManager(mMockContext));
         doReturn(mMockCarPowerManagementService)
                 .when(() -> CarLocalServices.getService(CarPowerManagementService.class));
-        doReturn(mCarPowerManager).when(() -> CarLocalServices.createCarPowerManager(mMockContext));
         doReturn(mMockCarUserService)
                 .when(() -> CarLocalServices.getService(CarUserService.class));
 
@@ -251,7 +250,7 @@ public class CarUserNoticeServiceTest extends AbstractExtendMockitoTestCase {
         return latch;
     }
 
-    private CountDownLatch mockKeySettings(String key, int value) {
+    private static CountDownLatch mockKeySettings(String key, int value) {
         CountDownLatch latch = new CountDownLatch(1);
         when(Settings.Secure.getIntForUser(any(),
                 eq(key), anyInt(),
-- 
cgit v1.2.3