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

Merge changes from topic "tz_picker"

Browse Source 
* changes:
  New manual time zone picker.
  Data loading component for new time zone picker.
This commit is contained in:
Joachim Sauer
2018-01-12 11:25:32 +00:00
committed by Android (Google) Code Review
parent 21303fa16b 0cdbe1897c
commit cff4bcb554
13 changed files with 1198 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
tests/robotests/src/com/android/settings/datetime/timezone/DataLoaderTest.java Normal file
View File

@@ -0,0 +1,94 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.datetime.timezone;
import static org.junit.Assert.assertEquals;
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 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
public void testHasData() {
List<RegionInfo> regions = new DataLoader(Locale.US).loadRegionInfos();
// Sanity check. Real size is closer to 200.
assertNotNull(regions);
assertTrue(regions.size() > 100);
assertEquals("Afghanistan", regions.get(0).getName());
assertEquals("Zimbabwe", regions.get(regions.size() - 1).getName());
}
@Test
public void testRegionsWithTimeZone() {
List<RegionInfo> regions = new DataLoader(Locale.US).loadRegionInfos();
checkRegionHasTimeZone(regions, "AT", "Europe/Vienna");
checkRegionHasTimeZone(regions, "US", "America/Los_Angeles");
checkRegionHasTimeZone(regions, "CN", "Asia/Shanghai");
checkRegionHasTimeZone(regions, "AU", "Australia/Sydney");
}
@Test
public void testFixedOffsetTimeZones() {
List<TimeZoneInfo> timeZones = new DataLoader(Locale.US).loadFixedOffsets();
// Etc/GMT would be equivalent to Etc/UTC, except for how it is labelled. Users have
// explicitly asked for UTC to be supported, so make sure we label it as such.
checkHasTimeZone(timeZones, "Etc/UTC");
checkHasTimeZone(timeZones, "Etc/GMT-1");
checkHasTimeZone(timeZones, "Etc/GMT-14");
checkHasTimeZone(timeZones, "Etc/GMT+1");
checkHasTimeZone(timeZones, "Etc/GMT+12");
}
private void checkRegionHasTimeZone(List<RegionInfo> regions, String regionId, String tzId) {
RegionInfo ri = findRegion(regions, regionId);
assertTrue("Region " + regionId + " does not have time zone " + tzId,
ri.getTimeZoneIds().contains(tzId));
}
private void checkHasTimeZone(List<TimeZoneInfo> timeZoneInfos, String tzId) {
for (TimeZoneInfo tz : timeZoneInfos) {
if (tz.getId().equals(tzId)) {
return;
}
}
fail("Fixed offset time zones do not contain " + tzId);
}
private RegionInfo findRegion(List<RegionInfo> regions, String regionId) {
for (RegionInfo region : regions) {
if (region.getId().equals(regionId)) {
assertNotNull(region.getName());
return region;
}
}
fail("No region with id " + regionId + " found.");
return null; // can't reach.
}
}

105
tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneAdapterTest.java Normal file
View File

@@ -0,0 +1,105 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.datetime.timezone;
import android.icu.util.TimeZone;
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.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import java.util.Collections;
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})
public class TimeZoneAdapterTest {
@Mock
private View.OnClickListener mOnClickListener;
private TimeZoneAdapter mTimeZoneAdapter;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mTimeZoneAdapter = new TimeZoneAdapter(mOnClickListener, RuntimeEnvironment.application);
}
@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);
}
@Test
public void getItemViewType_onNonDefaultTimeZone_returnsTypeNormal() {
final TimeZoneInfo tzi = dummyTimeZoneInfo(getNonDefaultTimeZone());
mTimeZoneAdapter.setTimeZoneInfos(Collections.singletonList(tzi));
assertThat(mTimeZoneAdapter.getItemViewType(0)).isEqualTo(TimeZoneAdapter.VIEW_TYPE_NORMAL);
}
@Test
public void bindViewHolder_onDstTimeZone_showsDstLabel() {
final TimeZoneInfo tzi = dummyTimeZoneInfo(TimeZone.getTimeZone("America/Los_Angeles"));
mTimeZoneAdapter.setTimeZoneInfos(Collections.singletonList(tzi));
final FrameLayout parent = new FrameLayout(RuntimeEnvironment.application);
final ViewHolder viewHolder = (ViewHolder) mTimeZoneAdapter.createViewHolder(parent, TimeZoneAdapter.VIEW_TYPE_NORMAL);
mTimeZoneAdapter.bindViewHolder(viewHolder, 0);
assertThat(viewHolder.mDstView.getVisibility()).isEqualTo(View.VISIBLE);
}
@Test
public void bindViewHolder_onNonDstTimeZone_hidesDstLabel() {
final TimeZoneInfo tzi = dummyTimeZoneInfo(TimeZone.getTimeZone("Etc/UTC"));
mTimeZoneAdapter.setTimeZoneInfos(Collections.singletonList(tzi));
final FrameLayout parent = new FrameLayout(RuntimeEnvironment.application);
final ViewHolder viewHolder = (ViewHolder) mTimeZoneAdapter.createViewHolder(parent, TimeZoneAdapter.VIEW_TYPE_NORMAL);
mTimeZoneAdapter.bindViewHolder(viewHolder, 0);
assertThat(viewHolder.mDstView.getVisibility()).isEqualTo(View.GONE);
}
// Pick an arbitrary time zone that's not the current default.
private static TimeZone getNonDefaultTimeZone() {
final String[] availableIDs = TimeZone.getAvailableIDs();
int index = 0;
if (TextUtils.equals(availableIDs[index], TimeZone.getDefault().getID())) {
index++;
}
return TimeZone.getTimeZone(availableIDs[index]);
}
private TimeZoneInfo dummyTimeZoneInfo(TimeZone timeZone) {
return new TimeZoneInfo.Builder(timeZone).setGmtOffset("GMT+0").setItemId(1).build();
}
}