From 0f48bc83d9a6c49e12c700c2fcd25384f97bc359 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Fri, 1 Dec 2017 14:52:12 -0800 Subject: [PATCH 1/2] Update OwnerInfoPrefCtrlTest to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: I506edc8aa9e4111eb7aefcf509c74f10f9af0285 --- .../OwnerInfoPreferenceControllerTest.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java index 71e2d8b352f..9bf8606d07a 100644 --- a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java @@ -16,13 +16,14 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Answers.RETURNS_DEEP_STUBS; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,6 +31,7 @@ import android.app.FragmentManager; import android.app.FragmentTransaction; import android.content.Context; import android.support.v14.preference.PreferenceFragment; +import android.support.v7.preference.PreferenceManager; import android.support.v7.preference.PreferenceScreen; import com.android.internal.widget.LockPatternUtils; @@ -49,14 +51,16 @@ import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class OwnerInfoPreferenceControllerTest { - @Mock(answer = RETURNS_DEEP_STUBS) + @Mock private PreferenceFragment mFragment; @Mock private PreferenceScreen mScreen; @Mock + private PreferenceManager mPreferenceManager; + @Mock private FragmentManager mFragmentManager; @Mock private FragmentTransaction mFragmentTransaction; @@ -76,7 +80,8 @@ public class OwnerInfoPreferenceControllerTest { when(mFragment.isAdded()).thenReturn(true); when(mFragment.getPreferenceScreen()).thenReturn(mScreen); - when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext); + when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager); + when(mPreference.getContext()).thenReturn(mContext); when(mFragment.getFragmentManager()).thenReturn(mFragmentManager); when(mFragmentManager.beginTransaction()).thenReturn(mFragmentTransaction); @@ -187,7 +192,8 @@ public class OwnerInfoPreferenceControllerTest { preference.performClick(); - verify(mFragment).getFragmentManager(); + // Called once in setTargetFragment, and a second time to display the fragment. + verify(mFragment, times(2)).getFragmentManager(); verify(mFragment.getFragmentManager().beginTransaction()) .add(any(OwnerInfoSettings.class), anyString()); } From cf8b912343fc7b28a4abb0b1f69718435c46d229 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Fri, 1 Dec 2017 14:53:27 -0800 Subject: [PATCH 2/2] move security test package to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: Icc02469b5bcfab4be55caeab948275d3f4ca08ae --- .../android/settings/security/ConfigureKeyGuardDialogTest.java | 2 +- .../android/settings/security/EncryptionAndCredentialTest.java | 2 +- .../settings/security/LockscreenDashboardFragmentTest.java | 2 +- .../settings/security/SecurityFeatureProviderImplTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java index ab7512fd580..df0cc2e826e 100644 --- a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java +++ b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java @@ -36,7 +36,7 @@ import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) @Config( manifest = TestConfig.MANIFEST_PATH, - sdk = TestConfig.SDK_VERSION, + sdk = TestConfig.SDK_VERSION_O, shadows = ShadowEventLogWriter.class ) public class ConfigureKeyGuardDialogTest { diff --git a/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java b/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java index 60e7dee6d21..f5f0bb34533 100644 --- a/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java +++ b/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java @@ -42,7 +42,7 @@ import java.util.ArrayList; import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class EncryptionAndCredentialTest { @Mock diff --git a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java index bb667f2ab1c..1a41c2d786d 100644 --- a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java @@ -30,7 +30,7 @@ import org.robolectric.annotation.Config; import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class LockscreenDashboardFragmentTest { private LockscreenDashboardFragment mFragment; diff --git a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java index 627ecf507dc..62ed3ab4650 100644 --- a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java @@ -53,7 +53,7 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLooper; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class SecurityFeatureProviderImplTest { private static final String MOCK_KEY = "key";