Use external/robolectric-shadows/run_robotests.mk
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:
@@ -16,35 +16,30 @@
|
||||
|
||||
package com.android.settings.datetime;
|
||||
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.provider.Settings;
|
||||
import android.support.v14.preference.SwitchPreference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
import android.text.format.DateFormat;
|
||||
import com.android.settings.TestConfig;
|
||||
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.shadows.ShadowApplication;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class AutoTimeFormatPreferenceControllerTest {
|
||||
|
||||
@Mock(answer = RETURNS_DEEP_STUBS)
|
||||
private PreferenceScreen mScreen;
|
||||
@Mock
|
||||
private UpdateTimeAndDateCallback mCallback;
|
||||
|
||||
@@ -57,7 +52,7 @@ public class AutoTimeFormatPreferenceControllerTest {
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mApplication = ShadowApplication.getInstance();
|
||||
mContext = mApplication.getApplicationContext();
|
||||
mContext = RuntimeEnvironment.application;
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -158,7 +153,7 @@ public class AutoTimeFormatPreferenceControllerTest {
|
||||
}
|
||||
|
||||
/**
|
||||
* Extend class under test to change {@link #is24HourLocale()} to not call
|
||||
* Extend class under test to change {@link #is24HourLocale} to not call
|
||||
* {@link DateFormat#is24HourLocale(Locale)} because that's not available in roboelectric.
|
||||
*/
|
||||
private static class TestAutoTimeFormatPreferenceController
|
||||
@@ -166,7 +161,7 @@ public class AutoTimeFormatPreferenceControllerTest {
|
||||
|
||||
private boolean is24HourLocale = false;
|
||||
|
||||
public TestAutoTimeFormatPreferenceController(Context context,
|
||||
private TestAutoTimeFormatPreferenceController(Context context,
|
||||
UpdateTimeAndDateCallback callback) {
|
||||
super(context, callback);
|
||||
}
|
||||
|
@@ -16,11 +16,13 @@
|
||||
|
||||
package com.android.settings.datetime;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.content.Context;
|
||||
import android.provider.Settings;
|
||||
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settingslib.RestrictedSwitchPreference;
|
||||
|
||||
import org.junit.Before;
|
||||
@@ -28,14 +30,9 @@ import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.shadows.ShadowApplication;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class AutoTimePreferenceControllerTest {
|
||||
|
||||
@Mock
|
||||
@@ -48,7 +45,7 @@ public class AutoTimePreferenceControllerTest {
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = ShadowApplication.getInstance().getApplicationContext();
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mPreference = new RestrictedSwitchPreference(mContext);
|
||||
mController = new AutoTimePreferenceController(mContext, mCallback);
|
||||
}
|
||||
@@ -56,13 +53,11 @@ public class AutoTimePreferenceControllerTest {
|
||||
@Test
|
||||
public void testIsEnabled_shouldReadFromSettingsProvider() {
|
||||
// Disabled
|
||||
Settings.Global.putInt(mContext.getContentResolver(),
|
||||
Settings.Global.AUTO_TIME, 0);
|
||||
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AUTO_TIME, 0);
|
||||
assertThat(mController.isEnabled()).isFalse();
|
||||
|
||||
// Enabled
|
||||
Settings.Global.putInt(mContext.getContentResolver(),
|
||||
Settings.Global.AUTO_TIME, 1);
|
||||
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AUTO_TIME, 1);
|
||||
assertThat(mController.isEnabled()).isTrue();
|
||||
}
|
||||
|
||||
|
@@ -17,7 +17,6 @@
|
||||
package com.android.settings.datetime;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.robolectric.shadow.api.Shadow.extract;
|
||||
|
||||
@@ -26,7 +25,6 @@ import android.net.ConnectivityManager;
|
||||
import android.provider.Settings;
|
||||
import android.support.v7.preference.Preference;
|
||||
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
|
||||
|
||||
@@ -39,8 +37,7 @@ import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
|
||||
shadows = ShadowConnectivityManager.class)
|
||||
@Config(shadows = ShadowConnectivityManager.class)
|
||||
public class AutoTimeZonePreferenceControllerTest {
|
||||
|
||||
@Mock
|
||||
@@ -49,15 +46,14 @@ public class AutoTimeZonePreferenceControllerTest {
|
||||
private Context mContext;
|
||||
private AutoTimeZonePreferenceController mController;
|
||||
private Preference mPreference;
|
||||
|
||||
private ShadowConnectivityManager connectivityManager;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mPreference = new Preference(mContext);
|
||||
ShadowConnectivityManager connectivityManager =
|
||||
extract(mContext.getSystemService(ConnectivityManager.class));
|
||||
connectivityManager = extract(mContext.getSystemService(ConnectivityManager.class));
|
||||
connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, true);
|
||||
}
|
||||
|
||||
@@ -79,32 +75,28 @@ public class AutoTimeZonePreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void isWifiOnly_notAvailable() {
|
||||
ShadowConnectivityManager connectivityManager =
|
||||
extract(mContext.getSystemService(ConnectivityManager.class));
|
||||
connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, false);
|
||||
|
||||
mController = new AutoTimeZonePreferenceController(
|
||||
mContext, null /* callback */, false /* isFromSUW */);
|
||||
mContext, null /* callback */, false /* fromSUW */);
|
||||
|
||||
assertThat(mController.isAvailable()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isFromSUW_notEnable() {
|
||||
mController = new AutoTimeZonePreferenceController(
|
||||
mContext, null /* callback */, true /* isFromSUW */);
|
||||
mController =
|
||||
new AutoTimeZonePreferenceController(mContext, null /* callback */, true /* fromSUW */);
|
||||
|
||||
assertThat(mController.isEnabled()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isWifiOnly_notEnable() {
|
||||
ShadowConnectivityManager connectivityManager =
|
||||
extract(mContext.getSystemService(ConnectivityManager.class));
|
||||
connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, false);
|
||||
|
||||
mController = new AutoTimeZonePreferenceController(
|
||||
mContext, null /* callback */, false /* isFromSUW */);
|
||||
mContext, null /* callback */, false /* fromSUW */);
|
||||
|
||||
assertThat(mController.isEnabled()).isFalse();
|
||||
}
|
||||
@@ -112,23 +104,21 @@ public class AutoTimeZonePreferenceControllerTest {
|
||||
@Test
|
||||
public void testIsEnabled_shouldReadFromSettingsProvider() {
|
||||
mController = new AutoTimeZonePreferenceController(
|
||||
mContext, null /* callback */, false /* isFromSUW */);
|
||||
mContext, null /* callback */, false /* fromSUW */);
|
||||
|
||||
// Disabled
|
||||
Settings.Global.putInt(mContext.getContentResolver(),
|
||||
Settings.Global.AUTO_TIME_ZONE, 0);
|
||||
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AUTO_TIME_ZONE, 0);
|
||||
assertThat(mController.isEnabled()).isFalse();
|
||||
|
||||
// Enabled
|
||||
Settings.Global.putInt(mContext.getContentResolver(),
|
||||
Settings.Global.AUTO_TIME_ZONE, 1);
|
||||
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AUTO_TIME_ZONE, 1);
|
||||
assertThat(mController.isEnabled()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updatePreferenceChange_prefIsChecked_shouldUpdatePreferenceAndNotifyCallback() {
|
||||
mController = new AutoTimeZonePreferenceController(
|
||||
mContext, mCallback, false /* isFromSUW */);
|
||||
mController =
|
||||
new AutoTimeZonePreferenceController(mContext, mCallback, false /* fromSUW */);
|
||||
|
||||
mController.onPreferenceChange(mPreference, true);
|
||||
|
||||
@@ -138,8 +128,8 @@ public class AutoTimeZonePreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void updatePreferenceChange_prefIsUnchecked_shouldUpdatePreferenceAndNotifyCallback() {
|
||||
mController = new AutoTimeZonePreferenceController(
|
||||
mContext, mCallback, false /* isFromSUW */);
|
||||
mController =
|
||||
new AutoTimeZonePreferenceController(mContext, mCallback, false /* fromSUW */);
|
||||
|
||||
mController.onPreferenceChange(mPreference, false);
|
||||
|
||||
|
@@ -16,11 +16,14 @@
|
||||
|
||||
package com.android.settings.datetime;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.AlarmManager;
|
||||
import android.content.Context;
|
||||
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settingslib.RestrictedPreference;
|
||||
|
||||
import org.junit.Before;
|
||||
@@ -28,15 +31,9 @@ import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.shadows.ShadowApplication;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class DatePreferenceControllerTest {
|
||||
|
||||
@Mock
|
||||
@@ -55,8 +52,7 @@ public class DatePreferenceControllerTest {
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
when(mContext.getSystemService(Context.ALARM_SERVICE)).thenReturn(mAlarmManager);
|
||||
mPreference = new RestrictedPreference(ShadowApplication.getInstance().
|
||||
getApplicationContext());
|
||||
mPreference = new RestrictedPreference(RuntimeEnvironment.application);
|
||||
mController = new DatePreferenceController(mContext, mHost, mAutoTimePreferenceController);
|
||||
}
|
||||
|
||||
|
@@ -16,11 +16,15 @@
|
||||
|
||||
package com.android.settings.datetime;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.times;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
||||
import com.android.settingslib.core.lifecycle.events.OnPause;
|
||||
import com.android.settingslib.core.lifecycle.events.OnResume;
|
||||
@@ -30,16 +34,9 @@ import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.shadows.ShadowApplication;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.times;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class TimeChangeListenerMixinTest {
|
||||
|
||||
@Mock
|
||||
@@ -51,7 +48,7 @@ public class TimeChangeListenerMixinTest {
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = ShadowApplication.getInstance().getApplicationContext();
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mMixin = new TimeChangeListenerMixin(mContext, mCallback);
|
||||
}
|
||||
|
||||
|
@@ -16,6 +16,8 @@
|
||||
|
||||
package com.android.settings.datetime;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
@@ -24,24 +26,18 @@ import android.support.v14.preference.SwitchPreference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.TestConfig;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.shadows.ShadowApplication;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import java.util.List;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class TimeFormatPreferenceControllerTest {
|
||||
|
||||
@Mock(answer = RETURNS_DEEP_STUBS)
|
||||
@@ -58,7 +54,7 @@ public class TimeFormatPreferenceControllerTest {
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mApplication = ShadowApplication.getInstance();
|
||||
mContext = mApplication.getApplicationContext();
|
||||
mContext = RuntimeEnvironment.application;
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@@ -16,10 +16,13 @@
|
||||
|
||||
package com.android.settings.datetime;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settingslib.RestrictedPreference;
|
||||
|
||||
import org.junit.Before;
|
||||
@@ -27,16 +30,9 @@ import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.shadows.ShadowApplication;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class TimePreferenceControllerTest {
|
||||
|
||||
@Mock
|
||||
@@ -52,8 +48,7 @@ public class TimePreferenceControllerTest {
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mPreference = new RestrictedPreference(
|
||||
ShadowApplication.getInstance().getApplicationContext());
|
||||
mPreference = new RestrictedPreference(RuntimeEnvironment.application);
|
||||
mController = new TimePreferenceController(mContext, mHost, mAutoTimePreferenceController);
|
||||
}
|
||||
|
||||
@@ -96,5 +91,4 @@ public class TimePreferenceControllerTest {
|
||||
// Should show date picker
|
||||
verify(mHost).showTimePicker();
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -16,10 +16,14 @@
|
||||
|
||||
package com.android.settings.datetime;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settingslib.RestrictedPreference;
|
||||
|
||||
import org.junit.Before;
|
||||
@@ -27,16 +31,9 @@ import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.shadows.ShadowApplication;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.when;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class TimeZonePreferenceControllerTest {
|
||||
|
||||
@Mock
|
||||
@@ -49,7 +46,7 @@ public class TimeZonePreferenceControllerTest {
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = ShadowApplication.getInstance().getApplicationContext();
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mPreference = new RestrictedPreference(mContext);
|
||||
mController = spy(new TimeZonePreferenceController(mContext,
|
||||
mAutoTimeZonePreferenceController));
|
||||
|
@@ -1,46 +1,42 @@
|
||||
package com.android.settings.datetime;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settingslib.datetime.ZoneGetter;
|
||||
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.TimeZone;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class ZonePickerComparatorTest {
|
||||
|
||||
// Strings in Chinese are sorted by alphabet order of their Pinyin.
|
||||
// "伦敦" -> "lundun"; "纽约" -> "niuyue"; "悉尼" -> "xini"
|
||||
// "开罗" -> "kailuo"; "雅典" -> "yadian"; "上海" -> "shanghai"
|
||||
private static final String[] TEST_CHINESE_NAME =
|
||||
new String[]{"伦敦", "纽约", "悉尼", "开罗", "雅典", "上海"};
|
||||
{"伦敦", "纽约", "悉尼", "开罗", "雅典", "上海"};
|
||||
private static final String[] ORDERED_CHINESE_NAME =
|
||||
new String[]{"开罗", "伦敦", "纽约", "上海", "悉尼", "雅典"};
|
||||
{"开罗", "伦敦", "纽约", "上海", "悉尼", "雅典"};
|
||||
|
||||
private static final String[] TEST_ENGLISH_NAME =
|
||||
new String[]{"London", "New York", "Sydney", "Cairo", "Athens", "Shanghai"};
|
||||
{"London", "New York", "Sydney", "Cairo", "Athens", "Shanghai"};
|
||||
private static final String[] ORDERED_ENGLISH_NAME =
|
||||
new String[]{"Athens", "Cairo", "London", "New York", "Shanghai", "Sydney"};
|
||||
{"Athens", "Cairo", "London", "New York", "Shanghai", "Sydney"};
|
||||
|
||||
private static final Locale INIT_LOCALE = Locale.getDefault();
|
||||
|
||||
private Map<String, List> mTestDataMap;
|
||||
private Map<String, List<String>> mTestDataMap;
|
||||
private List<Map<String, Object>> mTestList;
|
||||
|
||||
@Before
|
||||
@@ -60,12 +56,9 @@ public class ZonePickerComparatorTest {
|
||||
String sortKey = ZoneGetter.KEY_DISPLAY_LABEL;
|
||||
mTestList = getMockZonesList("zh_CN");
|
||||
Locale.setDefault(new Locale("zh"));
|
||||
final ZonePicker.MyComparator comparator = new ZonePicker.MyComparator(sortKey);
|
||||
assertThat(comparator).isNotNull();
|
||||
Collections.sort(mTestList, comparator);
|
||||
mTestList.sort(new ZonePicker.MyComparator(sortKey));
|
||||
for (int i = 0; i < mTestList.size(); i++) {
|
||||
assertThat(mTestList.get(i).get(sortKey).toString())
|
||||
.isEqualTo(ORDERED_CHINESE_NAME[i]);
|
||||
assertThat(mTestList.get(i).get(sortKey).toString()).isEqualTo(ORDERED_CHINESE_NAME[i]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,12 +67,9 @@ public class ZonePickerComparatorTest {
|
||||
String sortKey = ZoneGetter.KEY_DISPLAY_LABEL;
|
||||
mTestList = getMockZonesList("en_US");
|
||||
Locale.setDefault(new Locale("en"));
|
||||
final ZonePicker.MyComparator comparator = new ZonePicker.MyComparator(sortKey);
|
||||
assertThat(comparator).isNotNull();
|
||||
Collections.sort(mTestList, comparator);
|
||||
mTestList.sort(new ZonePicker.MyComparator(sortKey));
|
||||
for (int i = 0; i < mTestList.size(); i++) {
|
||||
assertThat(mTestList.get(i).get(sortKey).toString())
|
||||
.isEqualTo(ORDERED_ENGLISH_NAME[i]);
|
||||
assertThat(mTestList.get(i).get(sortKey).toString()).isEqualTo(ORDERED_ENGLISH_NAME[i]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -88,9 +78,7 @@ public class ZonePickerComparatorTest {
|
||||
String sortKey = ZoneGetter.KEY_OFFSET;
|
||||
// TestList of any locale can be selected to test integer sorting.
|
||||
mTestList = getMockZonesList("en_US");
|
||||
final ZonePicker.MyComparator comparator = new ZonePicker.MyComparator(sortKey);
|
||||
assertThat(comparator).isNotNull();
|
||||
Collections.sort(mTestList, comparator);
|
||||
mTestList.sort(new ZonePicker.MyComparator(sortKey));
|
||||
for (int i = 0; i < mTestList.size(); i++) {
|
||||
assertThat(mTestList.get(i).get(sortKey)).isEqualTo(i);
|
||||
}
|
||||
@@ -102,8 +90,7 @@ public class ZonePickerComparatorTest {
|
||||
TimeZone tz = TimeZone.getDefault();
|
||||
int testSize = testData.size();
|
||||
for (int i = 0; i < testSize; i++) {
|
||||
zones.add(createMockDisplayEntry(tz, "GMT+08:00",
|
||||
testData.get(i), testSize - i - 1));
|
||||
zones.add(createMockDisplayEntry(tz, "GMT+08:00", testData.get(i), testSize - i - 1));
|
||||
}
|
||||
return zones;
|
||||
}
|
||||
|
@@ -27,7 +27,6 @@ import android.view.LayoutInflater;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.testutils.shadow.ShadowZoneGetter;
|
||||
import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
|
||||
|
||||
@@ -39,7 +38,6 @@ import org.robolectric.annotation.Config;
|
||||
import org.robolectric.util.ReflectionHelpers;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class ZonePickerTest {
|
||||
|
||||
private Activity mActivity;
|
||||
@@ -57,10 +55,7 @@ public class ZonePickerTest {
|
||||
@Config(shadows = ShadowZoneGetter.class)
|
||||
public void testLaunch() {
|
||||
// Shouldn't crash
|
||||
mActivity.getFragmentManager()
|
||||
.beginTransaction()
|
||||
.add(mZonePicker, "test_tag")
|
||||
.commit();
|
||||
mActivity.getFragmentManager().beginTransaction().add(mZonePicker, "test_tag").commit();
|
||||
|
||||
// Should render
|
||||
verify(mZonePicker).onCreateView(
|
||||
|
@@ -20,18 +20,15 @@ import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.junit.Assert.fail;
|
||||
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class DataLoaderTest {
|
||||
|
||||
@Test
|
||||
|
@@ -15,16 +15,15 @@
|
||||
*/
|
||||
package com.android.settings.datetime.timezone;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import android.content.Context;
|
||||
import android.icu.util.TimeZone;
|
||||
import android.provider.Settings;
|
||||
import android.text.TextUtils;
|
||||
import android.view.View;
|
||||
import android.widget.FrameLayout;
|
||||
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.testutils.shadow.SettingsShadowResources;
|
||||
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
@@ -40,15 +39,10 @@ import org.robolectric.annotation.Implements;
|
||||
import java.util.Collections;
|
||||
import java.util.Locale;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
|
||||
shadows = {
|
||||
SettingsShadowResources.class,
|
||||
SettingsShadowResources.SettingsShadowTheme.class,
|
||||
TimeZoneAdapterTest.ShadowDataFormat.class})
|
||||
@Config(shadows = TimeZoneAdapterTest.ShadowDataFormat.class)
|
||||
public class TimeZoneAdapterTest {
|
||||
|
||||
@Mock
|
||||
private View.OnClickListener mOnClickListener;
|
||||
|
||||
@@ -58,7 +52,7 @@ public class TimeZoneAdapterTest {
|
||||
private Locale mDefaultLocale;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mTimeZoneAdapter = new TimeZoneAdapter(mOnClickListener, mContext);
|
||||
@@ -66,26 +60,16 @@ public class TimeZoneAdapterTest {
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() throws Exception {
|
||||
public void tearDown() {
|
||||
Locale.setDefault(mDefaultLocale);
|
||||
}
|
||||
|
||||
@Implements(android.text.format.DateFormat.class)
|
||||
public static class ShadowDataFormat {
|
||||
|
||||
public static String mTimeFormatString = "";
|
||||
|
||||
@Implementation
|
||||
public static String getTimeFormatString(Context context) {
|
||||
return mTimeFormatString;
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getItemViewType_onDefaultTimeZone_returnsTypeSelected() {
|
||||
final TimeZoneInfo tzi = dummyTimeZoneInfo(TimeZone.getDefault());
|
||||
mTimeZoneAdapter.setTimeZoneInfos(Collections.singletonList(tzi));
|
||||
assertThat(mTimeZoneAdapter.getItemViewType(0)).isEqualTo(TimeZoneAdapter.VIEW_TYPE_SELECTED);
|
||||
assertThat(mTimeZoneAdapter.getItemViewType(0))
|
||||
.isEqualTo(TimeZoneAdapter.VIEW_TYPE_SELECTED);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -102,8 +86,10 @@ public class TimeZoneAdapterTest {
|
||||
|
||||
final FrameLayout parent = new FrameLayout(RuntimeEnvironment.application);
|
||||
|
||||
final ViewHolder viewHolder = (ViewHolder) mTimeZoneAdapter.createViewHolder(parent, TimeZoneAdapter.VIEW_TYPE_NORMAL);
|
||||
final ViewHolder viewHolder =
|
||||
(ViewHolder) mTimeZoneAdapter.createViewHolder(parent, TimeZoneAdapter.VIEW_TYPE_NORMAL);
|
||||
mTimeZoneAdapter.bindViewHolder(viewHolder, 0);
|
||||
assertThat(viewHolder.mDstView).isNotNull();
|
||||
assertThat(viewHolder.mDstView.getVisibility()).isEqualTo(View.VISIBLE);
|
||||
}
|
||||
|
||||
@@ -114,8 +100,10 @@ public class TimeZoneAdapterTest {
|
||||
|
||||
final FrameLayout parent = new FrameLayout(RuntimeEnvironment.application);
|
||||
|
||||
final ViewHolder viewHolder = (ViewHolder) mTimeZoneAdapter.createViewHolder(parent, TimeZoneAdapter.VIEW_TYPE_NORMAL);
|
||||
final ViewHolder viewHolder =
|
||||
(ViewHolder) mTimeZoneAdapter.createViewHolder(parent, TimeZoneAdapter.VIEW_TYPE_NORMAL);
|
||||
mTimeZoneAdapter.bindViewHolder(viewHolder, 0);
|
||||
assertThat(viewHolder.mDstView).isNotNull();
|
||||
assertThat(viewHolder.mDstView.getVisibility()).isEqualTo(View.GONE);
|
||||
}
|
||||
|
||||
@@ -130,8 +118,10 @@ public class TimeZoneAdapterTest {
|
||||
|
||||
final FrameLayout parent = new FrameLayout(RuntimeEnvironment.application);
|
||||
|
||||
final ViewHolder viewHolder = (ViewHolder) mTimeZoneAdapter.createViewHolder(parent, TimeZoneAdapter.VIEW_TYPE_NORMAL);
|
||||
final ViewHolder viewHolder =
|
||||
(ViewHolder) mTimeZoneAdapter.createViewHolder(parent, TimeZoneAdapter.VIEW_TYPE_NORMAL);
|
||||
mTimeZoneAdapter.bindViewHolder(viewHolder, 0);
|
||||
assertThat(viewHolder.mTimeView).isNotNull();
|
||||
assertThat(viewHolder.mTimeView.getText().toString()).hasLength(5);
|
||||
}
|
||||
|
||||
@@ -146,8 +136,10 @@ public class TimeZoneAdapterTest {
|
||||
|
||||
final FrameLayout parent = new FrameLayout(RuntimeEnvironment.application);
|
||||
|
||||
final ViewHolder viewHolder = (ViewHolder) mTimeZoneAdapter.createViewHolder(parent, TimeZoneAdapter.VIEW_TYPE_NORMAL);
|
||||
final ViewHolder viewHolder =
|
||||
(ViewHolder) mTimeZoneAdapter.createViewHolder(parent, TimeZoneAdapter.VIEW_TYPE_NORMAL);
|
||||
mTimeZoneAdapter.bindViewHolder(viewHolder, 0);
|
||||
assertThat(viewHolder.mTimeView).isNotNull();
|
||||
assertThat(viewHolder.mTimeView.getText().toString()).hasLength(8);
|
||||
}
|
||||
|
||||
@@ -164,4 +156,15 @@ public class TimeZoneAdapterTest {
|
||||
private TimeZoneInfo dummyTimeZoneInfo(TimeZone timeZone) {
|
||||
return new TimeZoneInfo.Builder(timeZone).setGmtOffset("GMT+0").setItemId(1).build();
|
||||
}
|
||||
|
||||
@Implements(android.text.format.DateFormat.class)
|
||||
public static class ShadowDataFormat {
|
||||
|
||||
private static String mTimeFormatString = "";
|
||||
|
||||
@Implementation
|
||||
public static String getTimeFormatString(Context context) {
|
||||
return mTimeFormatString;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -16,23 +16,18 @@
|
||||
|
||||
package com.android.settings.datetime.timezone;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.Locale;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class TimeZoneInfoTest {
|
||||
|
||||
@Test
|
||||
|
@@ -16,29 +16,25 @@
|
||||
|
||||
package com.android.settings.datetime.timezone.model;
|
||||
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import libcore.util.CountryTimeZones;
|
||||
import libcore.util.CountryZonesFinder;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
import libcore.util.CountryTimeZones;
|
||||
import libcore.util.CountryTimeZones.TimeZoneMapping;
|
||||
import libcore.util.CountryZonesFinder;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.Set;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.junit.Assert.assertSame;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class TimeZoneDataTest {
|
||||
|
||||
private CountryZonesFinder mCountryZonesFinder;
|
||||
@@ -61,7 +57,7 @@ public class TimeZoneDataTest {
|
||||
|
||||
@Test
|
||||
public void testGetRegionIds() {
|
||||
when(mCountryZonesFinder.lookupAllCountryIsoCodes()).thenReturn(Arrays.asList());
|
||||
when(mCountryZonesFinder.lookupAllCountryIsoCodes()).thenReturn(Collections.emptyList());
|
||||
TimeZoneData timeZoneData = new TimeZoneData(mCountryZonesFinder);
|
||||
assertThat(timeZoneData.getRegionIds()).isEmpty();
|
||||
|
||||
@@ -82,8 +78,8 @@ public class TimeZoneDataTest {
|
||||
));
|
||||
CountryTimeZones GB = mock(CountryTimeZones.class);
|
||||
when(GB.getCountryIso()).thenReturn("gb");
|
||||
when(GB.getTimeZoneMappings()).thenReturn(Arrays.asList(
|
||||
new CountryTimeZones.TimeZoneMapping("Unknown/Secret_City", true)
|
||||
when(GB.getTimeZoneMappings()).thenReturn(Collections.singletonList(
|
||||
new TimeZoneMapping("Unknown/Secret_City", true)
|
||||
));
|
||||
when(mCountryZonesFinder.lookupCountryTimeZonesForZoneId("Unknown/Secret_City"))
|
||||
.thenReturn(Arrays.asList(US, GB));
|
||||
|
Reference in New Issue
Block a user