Merge "Setup external/robolectric for SettingsRoboTests" into main (dad495d7) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/accessibility/HearingAidCompatibilityPreferenceController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -73,6 +73,6 @@ public class HearingAidCompatibilityPreferenceController extends TogglePreferenc
		}

		private void setAudioParameterHacEnabled(boolean enabled) {
		mAudioManager.setParameters(HAC_KEY + "=" + (enabled ? HAC_VAL_ON : HAC_VAL_OFF));
		mAudioManager.setParameters(HAC_KEY + "=" + (enabled ? HAC_VAL_ON : HAC_VAL_OFF) + ";");
		}
		}

+6 −2

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ android_app {
		"Settings-core",
		"androidx.fragment_fragment-testing",
		"frameworks-base-testutils",
		"androidx.fragment_fragment",
		],

		aaptflags: ["--extra-packages com.android.settings"],
		@@ -48,6 +49,8 @@ android_robolectric_test {
		],

		static_libs: [
		"Robolectric_shadows_androidx_fragment_upstream",
		"Settings_robolectric_meta_service_file",
		"SettingsLib-robo-testutils",
		"Settings-robo-testutils",
		"androidx.test.core",
		@@ -75,15 +78,16 @@ android_robolectric_test {
		"SettingsLib",
		"SettingsLib-search",
		],

		upstream: true,
		}

		java_library {
		name: "Settings-robo-testutils",
		srcs: ["testutils/*/.java"],

		libs: [
		"Robolectric_all-target_upstream",
		"Settings-core",
		"Robolectric_all-target",
		"mockito-robolectric-prebuilt",
		"truth-prebuilt",
		],

+1 −0

Original line number	Diff line number	Diff line
		@@ -2,3 +2,4 @@ sdk=NEWEST_SDK
		shadows=\
		com.android.settings.testutils.shadow.ShadowThreadUtils \
		com.android.settings.network.ShadowServiceManagerExtend
		instrumentedPackages=androidx.preference
		No newline at end of file

+4 −0

Original line number	Diff line number	Diff line
		@@ -40,10 +40,14 @@ import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;
		import org.robolectric.Robolectric;
		import org.robolectric.RobolectricTestRunner;
		import org.robolectric.annotation.Config;

		import java.util.ArrayList;

		@RunWith(RobolectricTestRunner.class)
		@Config(shadows = {
		com.android.settings.testutils.shadow.ShadowFragment.class,
		})
		public class MainClearConfirmTest {

		private FragmentActivity mActivity;

+8 −3

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ import android.widget.ScrollView;

		import androidx.fragment.app.FragmentActivity;

		import com.android.settings.testutils.shadow.ShadowUserManager;
		import com.android.settings.testutils.shadow.ShadowUtils;
		import com.android.settings.utils.ActivityControllerWrapper;
		import com.android.settingslib.development.DevelopmentSettingsEnabler;
		@@ -66,11 +67,15 @@ import org.robolectric.Robolectric;
		import org.robolectric.RobolectricTestRunner;
		import org.robolectric.Shadows;
		import org.robolectric.annotation.Config;
		import org.robolectric.shadow.api.Shadow;
		import org.robolectric.shadows.ShadowActivity;
		import org.robolectric.shadows.ShadowUserManager;

		@RunWith(RobolectricTestRunner.class)
		@Config(shadows = ShadowUtils.class)
		@Config(shadows = {
		ShadowUtils.class,
		ShadowUserManager.class,
		com.android.settings.testutils.shadow.ShadowFragment.class,
		})
		public class MainClearTest {

		private static final String TEST_ACCOUNT_TYPE = "android.test.account.type";
		@@ -112,7 +117,7 @@ public class MainClearTest {
		Robolectric.buildActivity(FragmentActivity.class)).get());
		mShadowActivity = Shadows.shadowOf(mActivity);
		UserManager userManager = mActivity.getSystemService(UserManager.class);
		mShadowUserManager = Shadows.shadowOf(userManager);
		mShadowUserManager = Shadow.extract(userManager);
		mShadowUserManager.setIsAdminUser(true);
		mContentView = LayoutInflater.from(mActivity).inflate(R.layout.main_clear, null);