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

Commit 69b8706b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move bimetrics v2 tests to unit/"

parents 36517a0b 546c507a

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

+6 −4
Original line number Diff line number Diff line 
/*

 * 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();

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

+3 −3
Original line number Diff line number Diff line 
/*

 * 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();

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

+3 −3
Original line number Diff line number Diff line 
/*

 * 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();

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

+3 −3
Original line number Diff line number Diff line 
/*

 * 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();

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

+3 −2
Original line number Diff line number Diff line
@@ -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();