Merge "Fix broken test cases" into rvc-dev (15254e3b) · Commits · e / os / android_packages_apps_Settings

tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java

+14 −12

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ import com.android.settings.SettingsPreferenceFragment;
		import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
		import com.android.settings.testutils.shadow.ShadowAccountManager;
		import com.android.settings.testutils.shadow.ShadowContentResolver;
		import com.android.settings.testutils.shadow.ShadowSettingsLibUtils;
		import com.android.settingslib.search.SearchIndexableRaw;

		import org.junit.After;
		@@ -67,7 +68,8 @@ import java.util.ArrayList;
		import java.util.List;

		@RunWith(RobolectricTestRunner.class)
		@Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
		@Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class,
		ShadowSettingsLibUtils.class})
		public class AccountPreferenceControllerTest {

		@Mock(answer = RETURNS_DEEP_STUBS)

+6 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.content.Context;
		import android.content.pm.ApplicationInfo;
		import android.graphics.drawable.ColorDrawable;
		import android.graphics.drawable.Drawable;
		import android.os.UserHandle;

		import com.android.settingslib.Utils;

		@@ -29,6 +30,11 @@ import org.robolectric.annotation.Implements;
		@Implements(Utils.class)
		public class ShadowSettingsLibUtils {

		@Implementation
		protected static Drawable getBadgedIcon(Context context, Drawable icon, UserHandle user) {
		return new ColorDrawable(0);
		}

		@Implementation
		protected static Drawable getBadgedIcon(Context context, ApplicationInfo appInfo) {
		return new ColorDrawable(0);