Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1320086 authored by Milton Wu's avatar Milton Wu
Browse files

Relocate biometrics enrollment v2 tests 

Put biometrics enrollment v2 tests into tests/robotests/

Bug: 265723532
Test: RunSettingsRoboTests2 FingerprintRepositoryTest
      CredentialModelTest AutoCredentialViewModelTest
      FingerprintEnrollIntroViewModelTest
      FingerprintEnrollmentViewModelTest

Change-Id: I94804c07e0278713fcfb6e9889edc5092cfd9d13
parent 96e6398e

tests/unit/src/com/android/settings/biometrics2/data/repository/FingerprintRepositoryTest.java→tests/robotests/src/com/android/settings/biometrics2/data/repository/FingerprintRepositoryTest.java

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.content.res.Resources; 
import android.hardware.fingerprint.FingerprintManager;



import androidx.test.core.app.ApplicationProvider;

import androidx.test.ext.junit.runners.AndroidJUnit4;



import org.junit.Before;

import org.junit.Rule;
@@ -43,8 +42,9 @@ import org.junit.runner.RunWith; 
import org.mockito.Mock;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;

import org.robolectric.RobolectricTestRunner;



@RunWith(AndroidJUnit4.class)

@RunWith(RobolectricTestRunner.class)

public class FingerprintRepositoryTest {



    @Rule public final MockitoRule mockito = MockitoJUnit.rule();

tests/unit/src/com/android/settings/biometrics2/ui/model/CredentialModelTest.java→tests/robotests/src/com/android/settings/biometrics2/ui/model/CredentialModelTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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(AndroidJUnit4.class)

@RunWith(RobolectricTestRunner.class)

public class CredentialModelTest {



    private final Clock mClock = SystemClock.elapsedRealtimeClock();

tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/AutoCredentialViewModelTest.java→tests/robotests/src/com/android/settings/biometrics2/ui/viewmodel/AutoCredentialViewModelTest.java

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ 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;
@@ -71,10 +70,11 @@ 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(AndroidJUnit4.class)

@RunWith(RobolectricTestRunner.class)

public class AutoCredentialViewModelTest {



    @Rule public final MockitoRule mockito = MockitoJUnit.rule();

tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollIntroViewModelTest.java→tests/robotests/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollIntroViewModelTest.java

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ 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;
@@ -62,8 +61,9 @@ import org.junit.runner.RunWith; 
import org.mockito.Mock;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;

import org.robolectric.RobolectricTestRunner;



@RunWith(AndroidJUnit4.class)

@RunWith(RobolectricTestRunner.class)

public class FingerprintEnrollIntroViewModelTest {



    @Rule public final MockitoRule mockito = MockitoJUnit.rule();

tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollmentViewModelTest.java→tests/robotests/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollmentViewModelTest.java

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 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;
@@ -51,8 +50,9 @@ import org.junit.runner.RunWith; 
import org.mockito.Mock;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;

import org.robolectric.RobolectricTestRunner;



@RunWith(AndroidJUnit4.class)

@RunWith(RobolectricTestRunner.class)

public class FingerprintEnrollmentViewModelTest {



    @Rule public final MockitoRule mockito = MockitoJUnit.rule();