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

Merge "Update top level menu items summary text."

Browse Source
This commit is contained in:
Fan Zhang
2017-02-10 01:27:01 +00:00
committed by Android (Google) Code Review
parent 5c29cfad84 7520e81ab5
commit ec463f8f1b
11 changed files with 157 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
tests/robotests/src/com/android/settings/DisplaySettingsTest.java
View File

@@ -1,78 +0,0 @@
/*
* Copyright (C) 2016 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;
import android.app.Activity;
import android.provider.Settings.System;
import com.android.settings.dashboard.SummaryLoader;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
import static junit.framework.Assert.assertEquals;
import static org.mockito.Mockito.never;
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 DisplaySettingsTest {
private Activity mActivity;
@Mock private SummaryLoader mSummaryLoader;
private SummaryLoader.SummaryProvider mSummaryProvider;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mActivity = Robolectric.buildActivity(Activity.class).get();
mSummaryProvider = DisplaySettings.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(
mActivity, mSummaryLoader);
}
@Test
public void testInvalidTimeouts_summaryShouldBeEmpty() {
System.putLong(mActivity.getContentResolver(), SCREEN_OFF_TIMEOUT, -1);
assertEquals(System.getLong(mActivity.getContentResolver(), SCREEN_OFF_TIMEOUT, 0), -1);
mSummaryProvider.setListening(true);
System.putLong(mActivity.getContentResolver(), SCREEN_OFF_TIMEOUT, 1234);
mSummaryProvider.setListening(true);
verify(mSummaryLoader, times(2)).setSummary(mSummaryProvider, "");
}
@Test
public void testValidTimeouts_summaryShouldNotBeEmpty() {
final CharSequence[] values =
mActivity.getResources().getTextArray(R.array.screen_timeout_values);
for (CharSequence value : values) {
long timeout = Long.parseLong(value.toString());
System.putLong(mActivity.getContentResolver(), SCREEN_OFF_TIMEOUT, timeout);
assertEquals(System.getLong(mActivity.getContentResolver(), SCREEN_OFF_TIMEOUT, 0), timeout);
mSummaryProvider.setListening(true);
}
verify(mSummaryLoader, never()).setSummary(mSummaryProvider, "");
}
}

28
tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java
View File

@@ -15,11 +15,16 @@
*/
package com.android.settings.accounts;
import android.app.Activity;
import android.content.Context;
import android.content.pm.UserInfo;
import android.os.Bundle;
import android.os.UserManager;
import android.provider.SearchIndexableResource;
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.drawer.CategoryKey;
import com.android.settingslib.drawer.Tile;
@@ -37,6 +42,9 @@ import org.robolectric.shadows.ShadowApplication;
import java.util.List;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(RobolectricTestRunner.class)
@@ -48,6 +56,8 @@ public class UserAndAccountDashboardFragmentTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
@Mock
private UserManager mUserManager;
private UserAndAccountDashboardFragment mFragment;
@Before
@@ -86,6 +96,24 @@ public class UserAndAccountDashboardFragmentTest {
assertThat(mFragment.displayTile(tile)).isTrue();
}
@Test
public void updateSummary_shouldDisplaySignedInUser() {
final Activity activity = mock(Activity.class);
final SummaryLoader loader = mock(SummaryLoader.class);
final UserInfo userInfo = new UserInfo();
userInfo.name = "test_name";
when(activity.getSystemService(UserManager.class)).thenReturn(mUserManager);
when(mUserManager.getUserInfo(anyInt())).thenReturn(userInfo);
final SummaryLoader.SummaryProvider provider = mFragment.SUMMARY_PROVIDER_FACTORY
.createSummaryProvider(activity, loader);
provider.setListening(true);
verify(activity).getString(R.string.user_summary,
userInfo.name);
}
@Test
public void testSearchIndexProvider_shouldIndexResource() {
final List<SearchIndexableResource> indexRes =

78
tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
View File

@@ -1,78 +0,0 @@
/*
* Copyright (C) 2016 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.system;
import android.app.Activity;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.FakeFeatureFactory;
import com.google.common.truth.Truth;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
import static com.android.settings.system.SystemDashboardFragment.SUMMARY_PROVIDER_FACTORY;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SystemDashboardFragmentTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Activity mActivity;
@Mock
private SummaryLoader mSummaryLoader;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
FakeFeatureFactory.setupForTest(mActivity);
}
@Test
public void hasSummaryProvider() {
Truth.assertThat(SUMMARY_PROVIDER_FACTORY).isNotNull();
}
@Test
public void updateSummary_isListening_shouldNotifySummaryLoader() {
final SummaryLoader.SummaryProvider summaryProvider =
SUMMARY_PROVIDER_FACTORY.createSummaryProvider(mActivity, mSummaryLoader);
summaryProvider.setListening(true);
verify(mSummaryLoader).setSummary(eq(summaryProvider), anyString());
}
@Test
public void updateSummary_notListening_shouldNotNotifySummaryLoader() {
final SummaryLoader.SummaryProvider summaryProvider =
SUMMARY_PROVIDER_FACTORY.createSummaryProvider(mActivity, mSummaryLoader);
summaryProvider.setListening(false);
verify(mSummaryLoader, never()).setSummary(eq(summaryProvider), anyString());
}
}