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

Commit 758dbeb8 authored by Jeffrey Huang's avatar Jeffrey Huang Committed by Android (Google) Code Review
Browse files

Merge changes Ieefdc9d1,Id2dad12b 

* changes:
  Move fingerprint package to sdk 26
  Update DeleteFingerprintDialogTest to sdk 26
parents e62023cd fd0e057c

tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java

+12 −9
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ 
package com.android.settings.fingerprint;





import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;



import android.app.Dialog;

import android.hardware.fingerprint.Fingerprint;
@@ -26,6 +30,7 @@ import com.android.settings.fingerprint.FingerprintSettings.FingerprintSettingsF 
        .DeleteFingerprintDialog;

import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settings.testutils.shadow.ShadowEventLogWriter;

import com.android.settings.testutils.shadow.ShadowFragment;



import org.junit.Before;

import org.junit.Test;
@@ -35,27 +40,25 @@ import org.mockito.MockitoAnnotations; 
import org.robolectric.annotation.Config;

import org.robolectric.util.FragmentTestUtil;



import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,

        shadows = {

                ShadowEventLogWriter.class

                ShadowEventLogWriter.class,

                ShadowFragment.class

        })

public class DeleteFingerprintDialogTest {



    @Mock

    private FingerprintSettingsFragment mTarget;

    @Mock

    private Fingerprint mFingerprint;

    private DeleteFingerprintDialog mFragment;

    @Mock

    private FingerprintSettingsFragment mTarget;



    private DeleteFingerprintDialog mFragment;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mFragment = DeleteFingerprintDialog.newInstance(mFingerprint, mTarget);

        mFragment = spy(DeleteFingerprintDialog.newInstance(mFingerprint, mTarget));

    }



    @Test

tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ import java.util.concurrent.TimeUnit; 
@RunWith(SettingsRobolectricTestRunner.class)

@Config(

        manifest = TestConfig.MANIFEST_PATH,

        sdk = Config.NEWEST_SDK,

        sdk = TestConfig.SDK_VERSION_O,

        shadows = {

                ShadowUtils.class,

                ShadowVibrator.class

tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ import org.robolectric.shadows.ShadowActivity.IntentForResult; 
@RunWith(SettingsRobolectricTestRunner.class)

@Config(

        manifest = TestConfig.MANIFEST_PATH,

        sdk = TestConfig.SDK_VERSION,

        sdk = TestConfig.SDK_VERSION_O,

        shadows = {

                SettingsShadowResources.class,

                SettingsShadowResources.SettingsShadowTheme.class,

tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import org.mockito.MockitoAnnotations; 
import org.robolectric.annotation.Config;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class FingerprintEnrollSuggestionActivityTest {



    @Mock

tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import static org.mockito.Mockito.spy; 
import static org.mockito.Mockito.when;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class FingerprintLocationAnimationVideoViewTest {



    private Context mContext;