PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use external/robolectric-shadows/run_robotests.mk

Browse Source 
This allows Settings to test against the latest framework changes.

Also replaced TestConfig with traditional robolectric.properties.

Bug: 73173204
Bug: 73892008
Test: make -j56 RunSettingsRoboTests
Change-Id: I3135b4fa5f095ba79b282a76f45dd9baa2584bc7
This commit is contained in:
James Lemieux
2018-02-26 00:51:42 -08:00
parent 229a6a2bc4
commit 22a39c2b93
752 changed files with 5096 additions and 9182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
View File

@@ -16,12 +16,9 @@
package com.android.settings.widget;
import static android.arch.lifecycle.Lifecycle.Event.ON_START;
import static android.arch.lifecycle.Lifecycle.Event.ON_STOP;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -33,7 +30,6 @@ import android.arch.lifecycle.LifecycleOwner;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -43,10 +39,8 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ActionBarShadowControllerTest {
@Mock
@@ -116,5 +110,4 @@ public class ActionBarShadowControllerTest {
controller.mScrollChangeWatcher.onScrolled(mRecyclerView, 10 /* dx */, 10 /* dy */);
// no crash
}
}

4
tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
@@ -30,17 +29,14 @@ import android.view.View;
import android.widget.Button;
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ActionButtonPreferenceTest {
private Context mContext;

3
tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java
View File

@@ -21,17 +21,14 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppCheckBoxPreferenceTest {
private Context mContext;

11
tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java
View File

@@ -23,21 +23,16 @@ import android.support.v7.preference.PreferenceViewHolder;
import android.view.View;
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppPreferenceTest {
private static final int EXPECTED_APP_ICON_SIZE_DP = 32;
private Context mContext;
private View mRootView;
private AppPreference mPref;
@@ -80,9 +75,7 @@ public class AppPreferenceTest {
@Test
public void foobar_testName() {
// Can't use isEquals() to compare float. Use isWithIn().of() instead.
assertThat(mContext.getResources().getDimension(R.dimen.secondary_app_icon_size))
.isWithin(0.01f)
.of(EXPECTED_APP_ICON_SIZE_DP);
float iconSize = mContext.getResources().getDimension(R.dimen.secondary_app_icon_size);
assertThat(Float.floatToIntBits(iconSize)).isEqualTo(Float.floatToIntBits(32));
}
}

3
tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java
View File

@@ -23,17 +23,14 @@ import android.support.v7.preference.PreferenceViewHolder;
import android.view.View;
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppSwitchPreferenceTest {
private Context mContext;

3
tests/robotests/src/com/android/settings/widget/AspectRatioFrameLayoutTest.java
View File

@@ -21,18 +21,15 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.view.View;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AspectRatioFrameLayoutTest {
private Context mContext;

8
tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java
View File

@@ -16,20 +16,17 @@
package com.android.settings.widget;
import static junit.framework.Assert.assertEquals;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import static junit.framework.Assert.assertEquals;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultIndicatorSeekBarTest {
private DefaultIndicatorSeekBar mDefaultIndicatorSeekBar;
@@ -50,5 +47,4 @@ public class DefaultIndicatorSeekBarTest {
mDefaultIndicatorSeekBar.setDefaultProgress(40);
assertEquals(40, mDefaultIndicatorSeekBar.getDefaultProgress());
}
}

50
tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
View File

@@ -43,7 +43,6 @@ import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -55,10 +54,8 @@ import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class EntityHeaderControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -115,8 +112,8 @@ public class EntityHeaderControllerTest {
@Test
public void bindViews_shouldBindAllData() {
final String testString = "test";
final View header = mLayoutInflater.inflate(
R.layout.settings_entity_header, null /* root */);
final View header =
mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */);
final TextView label = header.findViewById(R.id.entity_header_title);
final TextView version = header.findViewById(R.id.entity_header_summary);
@@ -126,7 +123,9 @@ public class EntityHeaderControllerTest {
mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add));
mController.done(mActivity);
assertThat(label).isNotNull();
assertThat(label.getText()).isEqualTo(testString);
assertThat(version).isNotNull();
assertThat(version.getText()).isEqualTo(testString);
}
@@ -136,8 +135,8 @@ public class EntityHeaderControllerTest {
info.activityInfo = new ActivityInfo();
info.activityInfo.packageName = "123";
info.activityInfo.name = "321";
final View appLinks = mLayoutInflater
.inflate(R.layout.settings_entity_header, null /* root */);
final View appLinks =
mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */);
when(mActivity.getApplicationContext()).thenReturn(mContext);
when(mContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
.thenReturn(info);
@@ -149,6 +148,7 @@ public class EntityHeaderControllerTest {
mController.done(mActivity);
final ImageButton button1 = appLinks.findViewById(android.R.id.button1);
assertThat(button1).isNotNull();
assertThat(button1.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(button1.getDrawable()).isNotNull();
assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
@@ -186,10 +186,10 @@ public class EntityHeaderControllerTest {
mController.done(mActivity);
final ImageButton button1 = view.findViewById(android.R.id.button1);
assertThat(button1).isNotNull();
assertThat(button1.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(button1.getDrawable()).isNotNull();
assertThat(view.findViewById(android.R.id.button2).getVisibility())
.isEqualTo(View.GONE);
assertThat(view.findViewById(android.R.id.button2).getVisibility()).isEqualTo(View.GONE);
}
@Test
@@ -198,8 +198,7 @@ public class EntityHeaderControllerTest {
info.activityInfo = new ActivityInfo();
info.activityInfo.packageName = "123";
info.activityInfo.name = "321";
final View view = mLayoutInflater
.inflate(R.layout.settings_entity_header, null /* root */);
final View view = mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */);
when(mActivity.getApplicationContext()).thenReturn(mContext);
mController = EntityHeaderController.newInstance(mActivity, mFragment, view);
@@ -208,19 +207,17 @@ public class EntityHeaderControllerTest {
EntityHeaderController.ActionType.ACTION_NONE);
mController.done(mActivity);
assertThat(view.findViewById(android.R.id.button1).getVisibility())
.isEqualTo(View.GONE);
assertThat(view.findViewById(android.R.id.button2).getVisibility())
.isEqualTo(View.GONE);
assertThat(view.findViewById(android.R.id.button1).getVisibility()).isEqualTo(View.GONE);
assertThat(view.findViewById(android.R.id.button2).getVisibility()).isEqualTo(View.GONE);
}
@Test
public void bindButton_noAppPref_shouldNotShowButton() {
final View appLinks = mLayoutInflater
.inflate(R.layout.settings_entity_header, null /* root */);
final View appLinks =
mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */);
when(mContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
.thenReturn(null);
.thenReturn(null);
mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
mController.setButtonActions(
@@ -229,6 +226,7 @@ public class EntityHeaderControllerTest {
mController.done(mActivity);
final ImageButton button1 = appLinks.findViewById(android.R.id.button1);
assertThat(button1).isNotNull();
assertThat(button1.getVisibility()).isEqualTo(View.GONE);
assertThat(button1.getDrawable()).isNull();
assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
@@ -237,8 +235,8 @@ public class EntityHeaderControllerTest {
@Test
public void bindButton_noAppInfo_shouldNotAttachClickListener() {
final View appLinks = mLayoutInflater
.inflate(R.layout.settings_entity_header, null /* root */);
final View appLinks =
mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */);
final Activity activity = mock(Activity.class);
when(mFragment.getActivity()).thenReturn(activity);
@@ -262,8 +260,8 @@ public class EntityHeaderControllerTest {
@Test
public void bindButton_hasAppInfo_shouldAttachClickListener() {
final View appLinks = mLayoutInflater
.inflate(R.layout.settings_entity_header, null /* root */);
final View appLinks =
mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */);
final Activity activity = mock(Activity.class);
when(mFragment.getActivity()).thenReturn(activity);
when(mContext.getString(eq(R.string.application_info_label))).thenReturn("App Info");
@@ -278,14 +276,14 @@ public class EntityHeaderControllerTest {
mController.done(mActivity);
appLinks.findViewById(R.id.entity_header_content).performClick();
verify(activity).startActivityForResultAsUser(
any(Intent.class), anyInt(), any(UserHandle.class));
verify(activity)
.startActivityForResultAsUser(any(Intent.class), anyInt(), any(UserHandle.class));
}
@Test
public void iconContentDescription_shouldWorkWithSetIcon() {
final View view = mLayoutInflater
.inflate(R.layout.settings_entity_header, null /* root */);
final View view =
mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */);
when(mFragment.getActivity()).thenReturn(mock(Activity.class));
mController = EntityHeaderController.newInstance(mActivity, mFragment, view);
String description = "Fake Description";

15
tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java
View File

@@ -15,6 +15,10 @@
*/
package com.android.settings.widget;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.support.v7.preference.PreferenceViewHolder;
import android.view.LayoutInflater;
@@ -23,7 +27,6 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -31,14 +34,8 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class FixedLineSummaryPreferenceTest {
@Mock
@@ -55,8 +52,8 @@ public class FixedLineSummaryPreferenceTest {
mContext = RuntimeEnvironment.application;
mPreference = new FixedLineSummaryPreference(mContext, null);
LayoutInflater inflater = LayoutInflater.from(mContext);
final View view = inflater.inflate(mPreference.getLayoutResource(),
new LinearLayout(mContext), false);
final View view =
inflater.inflate(mPreference.getLayoutResource(), new LinearLayout(mContext), false);
mHolder = spy(PreferenceViewHolder.createInstanceForTests(view));
when(mHolder.findViewById(android.R.id.summary)).thenReturn(mSummary);
}

5
tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
@@ -39,7 +38,6 @@ import android.view.View;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -48,11 +46,9 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class HighlightablePreferenceGroupAdapterTest {
private static final String TEST_KEY = "key";
@@ -207,5 +203,4 @@ public class HighlightablePreferenceGroupAdapterTest {
assertThat(mViewHolder.itemView.getBackground()).isNotInstanceOf(ColorDrawable.class);
assertThat(mViewHolder.itemView.getTag(R.id.preference_highlighted)).isEqualTo(false);
}
}

4
tests/robotests/src/com/android/settings/widget/LinearColorBarTest.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -24,7 +23,6 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.graphics.Canvas;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,11 +30,9 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowCanvas;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LinearColorBarTest {
private static final int HEIGHT = 100;

28
tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java
View File

@@ -16,28 +16,25 @@
package com.android.settings.widget;
import android.content.Context;
import android.os.Handler;
import android.view.View;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import android.content.Context;
import android.os.Handler;
import android.view.View;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LoadingViewControllerTest {
private Context mContext;
@@ -70,5 +67,4 @@ public class LoadingViewControllerTest {
verify(handler).postDelayed(any(Runnable.class), anyLong());
}
}

10
tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -26,21 +25,18 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.PreferenceViewHolder;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.CheckBox;
import android.widget.LinearLayout;
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class MasterCheckBoxPreferenceTest {
private Context mContext;
@@ -129,6 +125,8 @@ public class MasterCheckBoxPreferenceTest {
final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
inflater.inflate(R.layout.preference_two_target, null));
final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame);
assertThat(widgetView).isNotNull();
inflater.inflate(R.layout.preference_widget_master_checkbox, widgetView, true);
final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
mPreference.onBindViewHolder(holder);
@@ -146,6 +144,8 @@ public class MasterCheckBoxPreferenceTest {
final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
inflater.inflate(R.layout.preference_two_target, null));
final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame);
assertThat(widgetView).isNotNull();
inflater.inflate(R.layout.preference_widget_master_checkbox, widgetView, true);
final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
mPreference.onBindViewHolder(holder);

15
tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
View File

@@ -16,6 +16,10 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import android.content.Context;
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.PreferenceViewHolder;
@@ -26,21 +30,14 @@ import android.widget.Switch;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class MasterSwitchPreferenceTest {
private Context mContext;
@@ -110,6 +107,8 @@ public class MasterSwitchPreferenceTest {
final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
inflater.inflate(R.layout.preference_two_target, null));
final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame);
assertThat(widgetView).isNotNull();
inflater.inflate(R.layout.preference_widget_master_switch, widgetView, true);
final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget);
preference.onBindViewHolder(holder);
@@ -128,6 +127,8 @@ public class MasterSwitchPreferenceTest {
final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
inflater.inflate(R.layout.preference_two_target, null));
final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame);
assertThat(widgetView).isNotNull();
inflater.inflate(R.layout.preference_widget_master_switch, widgetView, true);
final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget);
preference.onBindViewHolder(holder);

3
tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java
View File

@@ -22,7 +22,6 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -30,13 +29,11 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PreferenceCategoryControllerTest {
private Context mContext;

3
tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
View File

@@ -27,7 +27,6 @@ import android.content.Context;
import android.os.UserManager;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.DefaultAppInfo;
@@ -39,13 +38,11 @@ import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class RadioButtonPickerFragmentTest {

7
tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java
View File

@@ -16,22 +16,19 @@
package com.android.settings.widget;
import static junit.framework.Assert.assertEquals;
import android.content.Context;
import android.view.View.MeasureSpec;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import static junit.framework.Assert.assertEquals;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class RingProgressBarTest {
private Context mContext = RuntimeEnvironment.application;

20
tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
View File

@@ -16,29 +16,24 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
import android.os.Parcelable;
import android.support.v4.view.PagerAdapter;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.testutils.shadow.ShadowTextUtils;
import java.util.Locale;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.RuntimeEnvironment;
import static com.google.common.truth.Truth.assertThat;
import java.util.Locale;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(
manifest = TestConfig.MANIFEST_PATH,
sdk = TestConfig.SDK_VERSION,
shadows = {ShadowTextUtils.class}
)
public class RtlCompatibleViewPagerTest {
private Locale mLocaleEn;
@@ -47,8 +42,7 @@ public class RtlCompatibleViewPagerTest {
@Before
public void setUp() {
mViewPager = new RtlCompatibleViewPager(
ShadowApplication.getInstance().getApplicationContext());
mViewPager = new RtlCompatibleViewPager(RuntimeEnvironment.application);
mViewPager.setAdapter(new ViewPagerAdapter());
mLocaleEn = new Locale("en");
mLocaleHe = new Locale("he");

9
tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.eq;
@@ -31,17 +30,14 @@ import android.graphics.Rect;
import android.widget.FrameLayout;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowView;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ScrollToParentEditTextTest {
private static final int EDIT_TEXT_SIZE = 20;
@@ -53,9 +49,8 @@ public class ScrollToParentEditTextTest {
@Before
public void setUp() {
mEditText = new ScrollToParentEditText(
application,
Robolectric.buildAttributeSet().build());
mEditText =
new ScrollToParentEditText(application, Robolectric.buildAttributeSet().build());
mEditText.layout(0, 0, EDIT_TEXT_SIZE, EDIT_TEXT_SIZE);
mParent = spy(new FrameLayout(application));

4
tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java
View File

@@ -21,18 +21,16 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.os.Parcelable;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SeekBarPreferenceTest {
private static final int MAX = 75;
private static final int MIN = 5;
private static final int PROGRESS = 16;

10
tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java
View File

@@ -16,10 +16,12 @@
package com.android.settings.widget;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import android.content.Context;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -27,14 +29,8 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SummaryUpdaterTest {
private Context mContext;

3
tests/robotests/src/com/android/settings/widget/SwitchBarTest.java
View File

@@ -24,7 +24,6 @@ import android.graphics.drawable.ColorDrawable;
import android.widget.TextView;
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,10 +31,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SwitchBarTest {
private static final int COLOR_BACKGROUND = 1;

9
tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceControllerTest.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -27,7 +26,6 @@ import android.support.v7.preference.PreferenceScreen;
import android.view.View;
import android.widget.Button;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -36,11 +34,10 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class TwoStateButtonPreferenceControllerTest {
private static final String KEY = "pref_key";
@Mock
@@ -101,8 +98,8 @@ public class TwoStateButtonPreferenceControllerTest {
/**
* Controller to test methods in {@link TwoStateButtonPreferenceController}
*/
public static class TestButtonsPreferenceController extends
TwoStateButtonPreferenceController {
public static class TestButtonsPreferenceController
extends TwoStateButtonPreferenceController {
TestButtonsPreferenceController(Context context, String key) {
super(context, key);

4
tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
@@ -30,7 +29,6 @@ import android.text.TextWatcher;
import android.view.View;
import android.widget.EditText;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -39,10 +37,8 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ValidatedEditTextPreferenceTest {
@Mock