Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16db22a9 authored Oct 11, 2017 by Treehugger Robot Committed by Gerrit Code Review Oct 11, 2017

Merge "Move SettingsRobolectricTestRunner to testutils."

parents c4b0fa58 df943894

tests/robotests/src/com/android/settings/ConfirmCredentialTest.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,9 +21,9 @@ import static com.google.common.truth.Truth.assertThat;

	import android.R;		import android.R;
	import android.app.Activity;		import android.app.Activity;
	import android.app.Fragment;
	import android.app.FragmentManager;		import android.app.FragmentManager;

			import com.android.settings.testutils.SettingsRobolectricTestRunner;
	import com.android.settings.testutils.shadow.SettingsShadowResources;		import com.android.settings.testutils.shadow.SettingsShadowResources;

	import org.junit.Test;		import org.junit.Test;

tests/robotests/src/com/android/settings/DeviceAdminAddTest.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,7 @@ import android.content.Context;

	import com.android.internal.logging.nano.MetricsProto;		import com.android.internal.logging.nano.MetricsProto;
	import com.android.settings.testutils.FakeFeatureFactory;		import com.android.settings.testutils.FakeFeatureFactory;
			import com.android.settings.testutils.SettingsRobolectricTestRunner;

	import org.junit.Before;		import org.junit.Before;
	import org.junit.Test;		import org.junit.Test;

tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@ import android.os.UserManager;
	import android.support.v7.preference.PreferenceScreen;		import android.support.v7.preference.PreferenceScreen;

	import com.android.settings.dashboard.SummaryLoader;		import com.android.settings.dashboard.SummaryLoader;
			import com.android.settings.testutils.SettingsRobolectricTestRunner;
	import com.android.settings.testutils.XmlTestUtils;		import com.android.settings.testutils.XmlTestUtils;
	import com.android.settings.testutils.shadow.ShadowUtils;		import com.android.settings.testutils.shadow.ShadowUtils;
	import com.android.settingslib.DeviceInfoUtils;		import com.android.settingslib.DeviceInfoUtils;

tests/robotests/src/com/android/settings/DisplaySettingsTest.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2,6 +2,7 @@ package com.android.settings;

	import android.content.Context;		import android.content.Context;
	import com.android.settings.core.PreferenceController;		import com.android.settings.core.PreferenceController;
			import com.android.settings.testutils.SettingsRobolectricTestRunner;
	import com.android.settings.testutils.XmlTestUtils;		import com.android.settings.testutils.XmlTestUtils;
	import org.junit.Test;		import org.junit.Test;
	import org.junit.runner.RunWith;		import org.junit.runner.RunWith;

tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	package com.android.settings;		package com.android.settings;

	import com.android.internal.logging.nano.MetricsProto.MetricsEvent;		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
			import com.android.settings.testutils.SettingsRobolectricTestRunner;

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