diff --git a/tests/robotests/src/com/android/settings/biometrics2/data/repository/FingerprintRepositoryTest.java b/tests/unit/src/com/android/settings/biometrics2/repository/FingerprintRepositoryTest.java similarity index 95% rename from tests/robotests/src/com/android/settings/biometrics2/data/repository/FingerprintRepositoryTest.java rename to tests/unit/src/com/android/settings/biometrics2/repository/FingerprintRepositoryTest.java index d1be526dcc5..727559b55eb 100644 --- a/tests/robotests/src/com/android/settings/biometrics2/data/repository/FingerprintRepositoryTest.java +++ b/tests/unit/src/com/android/settings/biometrics2/repository/FingerprintRepositoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 The Android Open Source Project + * Copyright (C) 2023 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.settings.biometrics2.data.repository; +package com.android.settings.biometrics2.repository; import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_HOME_BUTTON; import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_POWER_BUTTON; @@ -34,6 +34,9 @@ import android.content.res.Resources; import android.hardware.fingerprint.FingerprintManager; import androidx.test.core.app.ApplicationProvider; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import com.android.settings.biometrics2.data.repository.FingerprintRepository; import org.junit.Before; import org.junit.Rule; @@ -42,9 +45,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; -import org.robolectric.RobolectricTestRunner; -@RunWith(RobolectricTestRunner.class) +@RunWith(AndroidJUnit4.class) public class FingerprintRepositoryTest { @Rule public final MockitoRule mockito = MockitoJUnit.rule(); diff --git a/tests/robotests/src/com/android/settings/biometrics2/ui/model/CredentialModelTest.java b/tests/unit/src/com/android/settings/biometrics2/ui/model/CredentialModelTest.java similarity index 98% rename from tests/robotests/src/com/android/settings/biometrics2/ui/model/CredentialModelTest.java rename to tests/unit/src/com/android/settings/biometrics2/ui/model/CredentialModelTest.java index abfad667fd9..183543093da 100644 --- a/tests/robotests/src/com/android/settings/biometrics2/ui/model/CredentialModelTest.java +++ b/tests/unit/src/com/android/settings/biometrics2/ui/model/CredentialModelTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 The Android Open Source Project + * Copyright (C) 2023 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,18 +31,18 @@ import android.os.Bundle; import android.os.SystemClock; import androidx.annotation.Nullable; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.android.settings.password.ChooseLockSettingsHelper; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import java.time.Clock; import java.util.Arrays; import java.util.Set; -@RunWith(RobolectricTestRunner.class) +@RunWith(AndroidJUnit4.class) public class CredentialModelTest { private final Clock mClock = SystemClock.elapsedRealtimeClock(); diff --git a/tests/robotests/src/com/android/settings/biometrics2/ui/viewmodel/AutoCredentialViewModelTest.java b/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/AutoCredentialViewModelTest.java similarity index 99% rename from tests/robotests/src/com/android/settings/biometrics2/ui/viewmodel/AutoCredentialViewModelTest.java rename to tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/AutoCredentialViewModelTest.java index 05bd68fa33e..c12be68e54d 100644 --- a/tests/robotests/src/com/android/settings/biometrics2/ui/viewmodel/AutoCredentialViewModelTest.java +++ b/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/AutoCredentialViewModelTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 The Android Open Source Project + * Copyright (C) 2023 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,6 +57,7 @@ import android.os.UserHandle; import androidx.activity.result.ActivityResult; import androidx.annotation.Nullable; import androidx.test.core.app.ApplicationProvider; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.VerifyCredentialResponse; @@ -70,11 +71,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; -import org.robolectric.RobolectricTestRunner; import java.util.concurrent.atomic.AtomicBoolean; -@RunWith(RobolectricTestRunner.class) +@RunWith(AndroidJUnit4.class) public class AutoCredentialViewModelTest { @Rule public final MockitoRule mockito = MockitoJUnit.rule(); diff --git a/tests/robotests/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollIntroViewModelTest.java b/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollIntroViewModelTest.java similarity index 99% rename from tests/robotests/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollIntroViewModelTest.java rename to tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollIntroViewModelTest.java index a500a3265b6..06f8924da5b 100644 --- a/tests/robotests/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollIntroViewModelTest.java +++ b/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollIntroViewModelTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 The Android Open Source Project + * Copyright (C) 2023 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,6 +48,7 @@ import androidx.annotation.NonNull; import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.MutableLiveData; import androidx.test.core.app.ApplicationProvider; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.android.settings.biometrics2.data.repository.FingerprintRepository; import com.android.settings.biometrics2.ui.model.EnrollmentRequest; @@ -61,9 +62,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; -import org.robolectric.RobolectricTestRunner; -@RunWith(RobolectricTestRunner.class) +@RunWith(AndroidJUnit4.class) public class FingerprintEnrollIntroViewModelTest { @Rule public final MockitoRule mockito = MockitoJUnit.rule(); diff --git a/tests/robotests/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollProgressViewModelTest.java b/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollProgressViewModelTest.java similarity index 98% rename from tests/robotests/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollProgressViewModelTest.java rename to tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollProgressViewModelTest.java index 89626def4c3..16f7ff6e1af 100644 --- a/tests/robotests/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollProgressViewModelTest.java +++ b/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollProgressViewModelTest.java @@ -38,6 +38,8 @@ import android.app.Application; import android.content.res.Resources; import android.os.CancellationSignal; +import androidx.test.ext.junit.runners.AndroidJUnit4; + import com.android.settings.R; import com.android.settings.biometrics.fingerprint.FingerprintUpdater; import com.android.settings.biometrics2.ui.model.EnrollmentProgress; @@ -50,9 +52,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; -import org.robolectric.RobolectricTestRunner; -@RunWith(RobolectricTestRunner.class) +@RunWith(AndroidJUnit4.class) public class FingerprintEnrollProgressViewModelTest { @Rule public final MockitoRule mockito = MockitoJUnit.rule(); diff --git a/tests/robotests/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollmentViewModelTest.java b/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollmentViewModelTest.java similarity index 98% rename from tests/robotests/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollmentViewModelTest.java rename to tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollmentViewModelTest.java index ff48c3e7836..3ab864f22d3 100644 --- a/tests/robotests/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollmentViewModelTest.java +++ b/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollmentViewModelTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 The Android Open Source Project + * Copyright (C) 2023 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,6 +37,7 @@ import android.os.Bundle; import androidx.activity.result.ActivityResult; import androidx.test.core.app.ApplicationProvider; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.android.settings.biometrics2.data.repository.FingerprintRepository; import com.android.settings.biometrics2.ui.model.EnrollmentRequest; @@ -50,9 +51,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; -import org.robolectric.RobolectricTestRunner; -@RunWith(RobolectricTestRunner.class) +@RunWith(AndroidJUnit4.class) public class FingerprintEnrollmentViewModelTest { @Rule public final MockitoRule mockito = MockitoJUnit.rule(); diff --git a/tests/robotests/src/com/android/settings/biometrics2/utils/EnrollmentRequestUtils.java b/tests/unit/src/com/android/settings/biometrics2/utils/EnrollmentRequestUtils.java similarity index 98% rename from tests/robotests/src/com/android/settings/biometrics2/utils/EnrollmentRequestUtils.java rename to tests/unit/src/com/android/settings/biometrics2/utils/EnrollmentRequestUtils.java index ef781b2337a..ced6debab08 100644 --- a/tests/robotests/src/com/android/settings/biometrics2/utils/EnrollmentRequestUtils.java +++ b/tests/unit/src/com/android/settings/biometrics2/utils/EnrollmentRequestUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 The Android Open Source Project + * Copyright (C) 2023 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tests/robotests/src/com/android/settings/biometrics2/utils/FingerprintRepositoryUtils.java b/tests/unit/src/com/android/settings/biometrics2/utils/FingerprintRepositoryUtils.java similarity index 100% rename from tests/robotests/src/com/android/settings/biometrics2/utils/FingerprintRepositoryUtils.java rename to tests/unit/src/com/android/settings/biometrics2/utils/FingerprintRepositoryUtils.java