PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove ignore test case" into rvc-dev am: ad30345078 am: e94cbd98ff

Browse Source 
Change-Id: I772373e7815dceac04431d16cb1de055a6d1634e
This commit is contained in:
Automerger Merge Worker
2020-03-13 05:14:59 +00:00
parent 857f09a45d e94cbd98ff
commit 9d37d5df00
4 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
View File

@@ -41,7 +41,6 @@ import com.android.settings.testutils.shadow.ShadowSecureSettings;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Answers; import org.mockito.Answers;
@@ -81,7 +80,6 @@ public class AssistFlashScreenPreferenceControllerTest {
} }
@Test @Test
@Ignore
@Config(shadows = {ShadowSecureSettings.class}) @Config(shadows = {ShadowSecureSettings.class})
public void isAvailable_hasAssistantAndAllowDisclosure_shouldReturnTrue() { public void isAvailable_hasAssistantAndAllowDisclosure_shouldReturnTrue() {
ReflectionHelpers.setField(mController, "mContext", mMockContext); ReflectionHelpers.setField(mController, "mContext", mMockContext);
@@ -93,7 +91,6 @@ public class AssistFlashScreenPreferenceControllerTest {
} }
@Test @Test
@Ignore
@Config(shadows = {ShadowSecureSettings.class}) @Config(shadows = {ShadowSecureSettings.class})
public void isAvailable_hasAssistantAndDisallowDisclosure_shouldReturnTrue() { public void isAvailable_hasAssistantAndDisallowDisclosure_shouldReturnTrue() {
ReflectionHelpers.setField(mController, "mContext", mMockContext); ReflectionHelpers.setField(mController, "mContext", mMockContext);
@@ -112,7 +109,6 @@ public class AssistFlashScreenPreferenceControllerTest {
} }
@Test @Test
@Ignore
@Config(shadows = {ShadowSecureSettings.class}) @Config(shadows = {ShadowSecureSettings.class})
public void onResume_shouldUpdatePreference() { public void onResume_shouldUpdatePreference() {
Settings.Secure.putString(mContext.getContentResolver(), Settings.Secure.putString(mContext.getContentResolver(),

2
tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
View File

@@ -44,7 +44,6 @@ import com.android.settings.testutils.shadow.ShadowSecureSettings;
import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.applications.DefaultAppInfo;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
@@ -95,7 +94,6 @@ public class DefaultAssistPreferenceControllerTest {
} }
@Test @Test
@Ignore
@Config(shadows = {ShadowSecureSettings.class}) @Config(shadows = {ShadowSecureSettings.class})
public void getDefaultAppInfo_hasDefaultAssist_shouldReturnKey() { public void getDefaultAppInfo_hasDefaultAssist_shouldReturnKey() {
final String flattenKey = "com.android.settings/assist"; final String flattenKey = "com.android.settings/assist";

2
tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
View File

@@ -45,7 +45,6 @@ import com.android.settings.testutils.shadow.ShadowSecureSettings;
import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.applications.DefaultAppInfo;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Answers; import org.mockito.Answers;
@@ -107,7 +106,6 @@ public class DefaultAutofillPickerTest {
} }
@Test @Test
@Ignore
public void setAndGetDefaultAppKey_shouldUpdateDefaultAutoFill() { public void setAndGetDefaultAppKey_shouldUpdateDefaultAutoFill() {
mPicker.onAttach((Context) mActivity); mPicker.onAttach((Context) mActivity);

3
tests/robotests/src/com/android/settings/wallpaper/StyleSuggestionActivityTest.java
View File

@@ -28,7 +28,6 @@ import android.provider.Settings;
import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settings.testutils.shadow.ShadowSecureSettings;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
@@ -61,7 +60,6 @@ public class StyleSuggestionActivityTest {
} }
@Test @Test
@Ignore
@Config(shadows = ShadowSecureSettings.class) @Config(shadows = ShadowSecureSettings.class)
public void hasStyleSet_yes_shouldReturnTrue() { public void hasStyleSet_yes_shouldReturnTrue() {
when(mResources.getBoolean(com.android.internal.R.bool.config_enableWallpaperService)) when(mResources.getBoolean(com.android.internal.R.bool.config_enableWallpaperService))
@@ -73,7 +71,6 @@ public class StyleSuggestionActivityTest {
} }
@Test @Test
@Ignore
@Config(shadows = ShadowSecureSettings.class) @Config(shadows = ShadowSecureSettings.class)
public void hasStyleSet_no_shouldReturnFalse() { public void hasStyleSet_no_shouldReturnFalse() {
when(mResources.getBoolean(com.android.internal.R.bool.config_enableWallpaperService)) when(mResources.getBoolean(com.android.internal.R.bool.config_enableWallpaperService))