Merge "Ignore/Fix broken tests" (b81f2b77) · Commits · e / os / android_packages_apps_Settings

tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectDialogTest.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ import com.android.settingslib.drawer.CategoryKey;
		import com.android.settingslib.drawer.Tile;

		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		@@ -42,7 +41,6 @@ import org.mockito.MockitoAnnotations;
		import org.robolectric.RobolectricTestRunner;

		@RunWith(RobolectricTestRunner.class)
		@Ignore
		public class ProfileSelectDialogTest {

		private static final UserHandle NORMAL_USER = new UserHandle(1111);

tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import android.service.quicksettings.Tile;
		import com.android.settingslib.development.DevelopmentSettingsEnabler;

		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		@@ -61,6 +62,7 @@ public class DevelopmentTilesTest {
		}

		@Test
		@Ignore
		public void refresh_devOptionIsDisabled_shouldResetTileValue() {
		final ComponentName cn = new ComponentName(
		mService.getPackageName(), mService.getClass().getName());

tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;

		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		@@ -196,6 +197,7 @@ public class ImeiInfoDialogControllerTest {
		}

		@Test
		@Ignore
		public void populateImeiInfo_emptyImei_shouldSetMeid_imeiSetToEmptyString() {
		doReturn(true).when(mController).isCdmaLteEnabled();
		when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA);

tests/robotests/src/com/android/settings/deviceinfo/legal/ModuleLicensePreferenceTest.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.content.Intent;
		import android.content.pm.ModuleInfo;

		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.MockitoAnnotations;
		@@ -56,6 +57,7 @@ public class ModuleLicensePreferenceTest {
		}

		@Test
		@Ignore
		public void onClick_sendsCorrectIntent() {
		ModuleLicensePreference pref = new ModuleLicensePreference(mContext, mModuleInfo);

tests/robotests/src/com/android/settings/enterprise/BasePrivacySettingsPreferenceTest.java→tests/robotests/src/com/android/settings/enterprise/AbsBasePrivacySettingsPreference.java

+5 −20

Original line number	Diff line number	Diff line
		@@ -18,32 +18,17 @@ package com.android.settings.enterprise;

		import static com.google.common.truth.Truth.assertThat;

		import android.content.Context;
		import android.provider.SearchIndexableResource;

		import androidx.test.core.app.ApplicationProvider;

		import com.android.settings.R;
		import com.android.settings.widget.PreferenceCategoryController;
		import com.android.settingslib.core.AbstractPreferenceController;

		import org.junit.Before;
		import org.junit.runner.RunWith;
		import org.robolectric.RobolectricTestRunner;

		import java.util.List;

		@RunWith(RobolectricTestRunner.class)
		public abstract class BasePrivacySettingsPreferenceTest {

		protected Context mContext;

		@Before
		public void setUp() {
		mContext = ApplicationProvider.getApplicationContext();
		}
		public abstract class AbsBasePrivacySettingsPreference {

		protected static void verifyEnterpriseSearchIndexableResources(
		protected void verifyEnterpriseSearchIndexableResources(
		List<SearchIndexableResource> searchIndexableResources) {
		assertThat(searchIndexableResources).isNotEmpty();
		assertThat(searchIndexableResources.size()).isEqualTo(1);
		@@ -51,7 +36,7 @@ public abstract class BasePrivacySettingsPreferenceTest {
		.isEqualTo(R.xml.enterprise_privacy_settings);
		}

		protected static void verifyEnterprisePreferenceControllers(
		protected void verifyEnterprisePreferenceControllers(
		List<AbstractPreferenceController> controllers) {
		assertThat(controllers).isNotNull();
		assertThat(controllers.size()).isEqualTo(17);
		@@ -89,7 +74,7 @@ public abstract class BasePrivacySettingsPreferenceTest {
		FailedPasswordWipeManagedProfilePreferenceController.class);
		}

		protected static void verifyFinancedSearchIndexableResources(
		protected void verifyFinancedSearchIndexableResources(
		List<SearchIndexableResource> searchIndexableResources) {
		assertThat(searchIndexableResources).isNotEmpty();
		assertThat(searchIndexableResources.size()).isEqualTo(1);
		@@ -97,7 +82,7 @@ public abstract class BasePrivacySettingsPreferenceTest {
		.isEqualTo(R.xml.financed_privacy_settings);
		}

		protected static void verifyFinancedPreferenceControllers(
		protected void verifyFinancedPreferenceControllers(
		List<AbstractPreferenceController> controllers) {
		assertThat(controllers).isNotNull();
		assertThat(controllers.size()).isEqualTo(6);