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

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

Merge changes I37c5df89,I453d8359 

* changes:
  Move password test package to sdk 26
  Add resourceImpl shadow to tests for sdk 26
parents 7e315a93 a442405a

tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ import java.util.regex.Pattern; 
@RunWith(SettingsRobolectricTestRunner.class)

@Config(

        manifest = TestConfig.MANIFEST_PATH,

        sdk = TestConfig.SDK_VERSION,

        sdk = TestConfig.SDK_VERSION_O,

        shadows = {

                SettingsShadowResources.class

        })

tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java

+3 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragme 
import com.android.settings.password.ChooseLockPassword.IntentBuilder;

import com.android.settings.testutils.SettingsRobolectricTestRunner;

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

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

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

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

import com.android.setupwizardlib.GlifLayout;
@@ -47,9 +48,10 @@ import org.robolectric.shadows.ShadowDrawable; 
@RunWith(SettingsRobolectricTestRunner.class)

@Config(

        manifest = TestConfig.MANIFEST_PATH,

        sdk = TestConfig.SDK_VERSION,

        sdk = TestConfig.SDK_VERSION_O,

        shadows = {

                SettingsShadowResources.class,

                SettingsShadowResourcesImpl.class,

                SettingsShadowResources.SettingsShadowTheme.class,

                ShadowEventLogWriter.class,

                ShadowUtils.class

tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java

+3 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import com.android.settings.password.ChooseLockPattern.ChooseLockPatternFragment 
import com.android.settings.password.ChooseLockPattern.IntentBuilder;

import com.android.settings.testutils.SettingsRobolectricTestRunner;

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

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

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

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

import com.android.setupwizardlib.GlifLayout;
@@ -43,9 +44,10 @@ import org.robolectric.shadows.ShadowDrawable; 
@RunWith(SettingsRobolectricTestRunner.class)

@Config(

        manifest = TestConfig.MANIFEST_PATH,

        sdk = TestConfig.SDK_VERSION,

        sdk = TestConfig.SDK_VERSION_O,

        shadows = {

                SettingsShadowResources.class,

                SettingsShadowResourcesImpl.class,

                SettingsShadowResources.SettingsShadowTheme.class,

                ShadowEventLogWriter.class,

                ShadowUtils.class

tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,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 = {

                ShadowUserManager.class,

                ShadowUtils.class

tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ import org.robolectric.util.FragmentTestUtil; 
@RunWith(SettingsRobolectricTestRunner.class)

@Config(

        manifest = TestConfig.MANIFEST_PATH,

        sdk = TestConfig.SDK_VERSION,

        sdk = TestConfig.SDK_VERSION_O,

        shadows = {

                ShadowEventLogWriter.class,

                ShadowUserManager.class,