Merge "Replace use of AbstractExtendedMockitoTestCase's deprecated constructor" into tm-dev

7 files changed, 31 insertions, 3 deletions

diff --git a/service/src/com/android/car/user/CarUserNoticeService.java b/service/src/com/android/car/user/CarUserNoticeService.java
index b040a17d95..b917b6d3c2 100644
--- a/service/src/com/android/car/user/CarUserNoticeService.java
+++ b/service/src/com/android/car/user/CarUserNoticeService.java
@@ -77,7 +77,9 @@ import com.android.internal.annotations.VisibleForTesting;
  */
 public final class CarUserNoticeService implements CarServiceBase {
 
-    private static final String TAG = CarLog.tagFor(CarUserNoticeService.class);
+    @VisibleForTesting
+    static final String TAG = CarLog.tagFor(CarUserNoticeService.class);
+
     private static final boolean DBG = Slogf.isLoggable(TAG, Log.DEBUG);
 
     // Keyguard unlocking can be only polled as we cannot dismiss keyboard.
diff --git a/tests/carservice_unit_test/src/android/car/AbstractExtendedMockitoCarServiceTestCase.java b/tests/carservice_unit_test/src/android/car/AbstractExtendedMockitoCarServiceTestCase.java
index 258e49ed89..a7a5261639 100644
--- a/tests/carservice_unit_test/src/android/car/AbstractExtendedMockitoCarServiceTestCase.java
+++ b/tests/carservice_unit_test/src/android/car/AbstractExtendedMockitoCarServiceTestCase.java
@@ -35,6 +35,10 @@ public abstract class AbstractExtendedMockitoCarServiceTestCase
 
     private static final boolean VERBOSE = false;
 
+    public AbstractExtendedMockitoCarServiceTestCase(String... logTags) {
+        super(logTags);
+    }
+
     /**
      * Mocks a call to {@link CarLocalServices#getService(Class)}.
      *
diff --git a/tests/carservice_unit_test/src/com/android/car/pm/CarSafetyAccessibilityServiceImplTest.java b/tests/carservice_unit_test/src/com/android/car/pm/CarSafetyAccessibilityServiceImplTest.java
index d23ed41654..45fba9f38d 100644
--- a/tests/carservice_unit_test/src/com/android/car/pm/CarSafetyAccessibilityServiceImplTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/pm/CarSafetyAccessibilityServiceImplTest.java
@@ -31,13 +31,17 @@ import org.junit.runners.JUnit4;
 import org.mockito.Mock;
 
 @RunWith(JUnit4.class)
-public class CarSafetyAccessibilityServiceImplTest extends
+public final class CarSafetyAccessibilityServiceImplTest extends
         AbstractExtendedMockitoCarServiceTestCase {
     @Mock
     private CarPackageManagerService mMockCarPackageManagerService;
 
     private CarSafetyAccessibilityServiceImpl mCarSafetyAccessibilityService;
 
+    public CarSafetyAccessibilityServiceImplTest() {
+        super(NO_LOG_TAGS);
+    }
+
     @Before
     public void setup() {
         mockGetCarLocalService(CarPackageManagerService.class, mMockCarPackageManagerService);
diff --git a/tests/carservice_unit_test/src/com/android/car/telemetry/CarTelemetryServiceTest.java b/tests/carservice_unit_test/src/com/android/car/telemetry/CarTelemetryServiceTest.java
index e20c139663..5a1e237de7 100644
--- a/tests/carservice_unit_test/src/com/android/car/telemetry/CarTelemetryServiceTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/telemetry/CarTelemetryServiceTest.java
@@ -47,6 +47,7 @@ import android.os.ResultReceiver;
 import androidx.test.filters.SmallTest;
 
 import com.android.car.CarLocalServices;
+import com.android.car.CarLog;
 import com.android.car.CarPropertyService;
 import com.android.car.CarServiceUtils;
 import com.android.car.power.CarPowerManagementService;
@@ -92,6 +93,10 @@ public class CarTelemetryServiceTest extends AbstractExtendedMockitoCarServiceTe
     @Mock private SystemMonitor mMockSystemMonitor;
     @Mock private ResultReceiver mMockAddMetricsConfigCallback;
 
+    public CarTelemetryServiceTest() {
+        super(CarLog.TAG_TELEMETRY);
+    }
+
     @Override
     protected void onSessionBuilder(CustomMockitoSessionBuilder session) {
         session.spyStatic(SystemMonitor.class);
diff --git a/tests/carservice_unit_test/src/com/android/car/telemetry/databroker/DataBrokerTest.java b/tests/carservice_unit_test/src/com/android/car/telemetry/databroker/DataBrokerTest.java
index 25d2f68eca..eee8200b43 100644
--- a/tests/carservice_unit_test/src/com/android/car/telemetry/databroker/DataBrokerTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/telemetry/databroker/DataBrokerTest.java
@@ -43,6 +43,7 @@ import android.os.RemoteException;
 import android.os.SystemClock;
 import android.util.Log;
 
+import com.android.car.CarLog;
 import com.android.car.CarPropertyService;
 import com.android.car.telemetry.ResultStore;
 import com.android.car.telemetry.publisher.AbstractPublisher;
@@ -69,7 +70,7 @@ import java.util.concurrent.PriorityBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
 @RunWith(MockitoJUnitRunner.class)
-public class DataBrokerTest extends AbstractExtendedMockitoCarServiceTestCase {
+public final class DataBrokerTest extends AbstractExtendedMockitoCarServiceTestCase {
     private static final String TAG = DataBrokerTest.class.getSimpleName();
 
     private static final int PROP_ID = 100;
@@ -133,6 +134,10 @@ public class DataBrokerTest extends AbstractExtendedMockitoCarServiceTestCase {
     @Mock
     private AbstractPublisher mAbstractPublisher;
 
+    public DataBrokerTest() {
+        super(CarLog.TAG_TELEMETRY);
+    }
+
     @Before
     public void setUp() throws Exception {
         when(mMockCarPropertyService.getPropertyList())
diff --git a/tests/carservice_unit_test/src/com/android/car/telemetry/sessioncontroller/SessionControllerUnitTest.java b/tests/carservice_unit_test/src/com/android/car/telemetry/sessioncontroller/SessionControllerUnitTest.java
index a5c9718404..92f71b1a16 100644
--- a/tests/carservice_unit_test/src/com/android/car/telemetry/sessioncontroller/SessionControllerUnitTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/telemetry/sessioncontroller/SessionControllerUnitTest.java
@@ -67,6 +67,10 @@ public class SessionControllerUnitTest
 
     private SessionController mSessionController;
 
+    public SessionControllerUnitTest() {
+        super(NO_LOG_TAGS);
+    }
+
     private static final class TestSessionControllerCallback implements
             SessionController.SessionControllerCallback {
         public SessionAnnotation annotation;
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 db4630ff54..b08568f680 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,6 +101,10 @@ public class CarUserNoticeServiceTest extends AbstractExtendedMockitoCarServiceT
 
     private boolean mIsKeyguardLocked = false;
 
+    public CarUserNoticeServiceTest() {
+        super(CarUserNoticeService.TAG);
+    }
+
     @Override
     protected void onSessionBuilder(CustomMockitoSessionBuilder session) {
         session