Merge "Remove ignore test case" into rvc-dev am: ad30345078
am: e94cbd98ff
Change-Id: I53566a529f76c804004941076c4549ab873b470c
This commit is contained in:
@@ -41,7 +41,6 @@ import com.android.settings.testutils.shadow.ShadowSecureSettings;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Answers;
|
||||
@@ -81,7 +80,6 @@ public class AssistFlashScreenPreferenceControllerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore
|
||||
@Config(shadows = {ShadowSecureSettings.class})
|
||||
public void isAvailable_hasAssistantAndAllowDisclosure_shouldReturnTrue() {
|
||||
ReflectionHelpers.setField(mController, "mContext", mMockContext);
|
||||
@@ -93,7 +91,6 @@ public class AssistFlashScreenPreferenceControllerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore
|
||||
@Config(shadows = {ShadowSecureSettings.class})
|
||||
public void isAvailable_hasAssistantAndDisallowDisclosure_shouldReturnTrue() {
|
||||
ReflectionHelpers.setField(mController, "mContext", mMockContext);
|
||||
@@ -112,7 +109,6 @@ public class AssistFlashScreenPreferenceControllerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore
|
||||
@Config(shadows = {ShadowSecureSettings.class})
|
||||
public void onResume_shouldUpdatePreference() {
|
||||
Settings.Secure.putString(mContext.getContentResolver(),
|
||||
|
@@ -44,7 +44,6 @@ import com.android.settings.testutils.shadow.ShadowSecureSettings;
|
||||
import com.android.settingslib.applications.DefaultAppInfo;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
@@ -95,7 +94,6 @@ public class DefaultAssistPreferenceControllerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore
|
||||
@Config(shadows = {ShadowSecureSettings.class})
|
||||
public void getDefaultAppInfo_hasDefaultAssist_shouldReturnKey() {
|
||||
final String flattenKey = "com.android.settings/assist";
|
||||
|
@@ -45,7 +45,6 @@ import com.android.settings.testutils.shadow.ShadowSecureSettings;
|
||||
import com.android.settingslib.applications.DefaultAppInfo;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Answers;
|
||||
@@ -107,7 +106,6 @@ public class DefaultAutofillPickerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore
|
||||
public void setAndGetDefaultAppKey_shouldUpdateDefaultAutoFill() {
|
||||
mPicker.onAttach((Context) mActivity);
|
||||
|
||||
|
@@ -28,7 +28,6 @@ import android.provider.Settings;
|
||||
import com.android.settings.testutils.shadow.ShadowSecureSettings;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
@@ -61,7 +60,6 @@ public class StyleSuggestionActivityTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore
|
||||
@Config(shadows = ShadowSecureSettings.class)
|
||||
public void hasStyleSet_yes_shouldReturnTrue() {
|
||||
when(mResources.getBoolean(com.android.internal.R.bool.config_enableWallpaperService))
|
||||
@@ -73,7 +71,6 @@ public class StyleSuggestionActivityTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore
|
||||
@Config(shadows = ShadowSecureSettings.class)
|
||||
public void hasStyleSet_no_shouldReturnFalse() {
|
||||
when(mResources.getBoolean(com.android.internal.R.bool.config_enableWallpaperService))
|
||||
|
Reference in New Issue
Block a user