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

Revert "Update "Open networks available" toggle to instead open notification channel preferences." am: dfa9bb8914

Browse Source 
am: c3666f1c35

Change-Id: I1a7446265677c35ef6d000a77383916d584a3a72
This commit is contained in:
Amin Shaikh
2017-05-12 09:00:24 +00:00
committed by android-build-merger
parent 031bb4e3a5 c3666f1c35
commit 1383a9e882
5 changed files with 136 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java
View File

@@ -16,29 +16,26 @@
package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.anyBoolean;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.when;
import static android.provider.Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED;
import static android.provider.Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import android.app.NotificationManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.PackageManager;
import android.net.NetworkScorerAppData;
import android.os.RemoteException;
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import com.android.settings.R;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.network.NetworkScoreManagerWrapper;
import com.android.settings.utils.NotificationChannelHelper;
import com.android.settings.utils.NotificationChannelHelper.NotificationChannelWrapper;
import com.android.settings.core.lifecycle.Lifecycle;
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;
@@ -47,123 +44,71 @@ import org.robolectric.annotation.Config;
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class NotifyOpenNetworkPreferenceControllerTest {
private static final String TEST_SCORER_PACKAGE = "Test Package";
private static final String TEST_SCORER_CLASS = "Test Class";
private static final String TEST_SCORER_LABEL = "Test Label";
private static final String NOTIFICATION_ID = "Notification Id";
private static final CharSequence NOTIFICATION_NAME = "Notification Name";
private Context mContext;
private NotifyOpenNetworksPreferenceController mController;
@Mock private NetworkScoreManagerWrapper mNetworkScorer;
@Mock private NotificationChannelHelper mNotificationChannelHelper;
@Mock private PackageManager mPackageManager;
@Mock private NotificationChannelWrapper mChannel;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new NotifyOpenNetworksPreferenceController(
mContext, mNetworkScorer, mNotificationChannelHelper, mPackageManager);
ComponentName scorer = new ComponentName(TEST_SCORER_PACKAGE, TEST_SCORER_CLASS);
NetworkScorerAppData scorerAppData = new NetworkScorerAppData(
0, scorer, TEST_SCORER_LABEL, null /* enableUseOpenWifiActivity */,
NOTIFICATION_ID);
when(mNetworkScorer.getActiveScorer()).thenReturn(scorerAppData);
mController = new NotifyOpenNetworksPreferenceController(mContext, mock(Lifecycle.class));
}
@Test
public void testIsAvailable_shouldReturnFalseWhenScorerDoesNotExist()
throws RemoteException {
when(mNetworkScorer.getActiveScorer()).thenReturn(null);
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void testIsAvailable_shouldReturnFalseWhenNotificationChannelIdDoesNotExist()
throws RemoteException {
ComponentName scorer = new ComponentName(TEST_SCORER_PACKAGE, TEST_SCORER_CLASS);
NetworkScorerAppData scorerAppData = new NetworkScorerAppData(
0, scorer, TEST_SCORER_LABEL, null /* enableUseOpenWifiActivity */,
null /* networkAvailableNotificationChannelId */);
when(mNetworkScorer.getActiveScorer()).thenReturn(scorerAppData);
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void testIsAvailable_shouldReturnFalseWhenNotificationChannelDoesNotExist()
throws RemoteException {
when(mNotificationChannelHelper.getNotificationChannelForPackage(
anyString(), anyInt(), anyString(), anyBoolean())).thenReturn(null);
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void testIsAvailable_shouldReturnTrueWhenNotificationChannelExists()
throws RemoteException {
when(mNotificationChannelHelper.getNotificationChannelForPackage(
anyString(), anyInt(), anyString(), anyBoolean())).thenReturn(mChannel);
public void testIsAvailable_shouldAlwaysReturnTrue() {
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void handlePreferenceTreeClick_nonMatchingKey_shouldDoNothing() {
final Preference pref = new Preference(mContext);
final SwitchPreference pref = new SwitchPreference(mContext);
assertThat(mController.handlePreferenceTreeClick(pref)).isFalse();
}
@Test
public void handlePreferenceTreeClick_nullScorer_shouldDoNothing() {
public void handlePreferenceTreeClick_nonMatchingType_shouldDoNothing() {
final Preference pref = new Preference(mContext);
pref.setKey(mController.getPreferenceKey());
when(mNetworkScorer.getActiveScorer()).thenReturn(null);
assertThat(mController.handlePreferenceTreeClick(pref)).isFalse();
}
@Test
public void handlePreferenceTreeClick_matchingKeyAndScorerExists_shouldLaunchActivity()
throws RemoteException {
final Preference pref = new Preference(mContext);
public void handlePreferenceTreeClick_matchingKeyAndType_shouldUpdateSetting() {
final SwitchPreference pref = new SwitchPreference(mContext);
pref.setChecked(true);
pref.setKey(mController.getPreferenceKey());
when(mNotificationChannelHelper.getNotificationChannelForPackage(
anyString(), anyInt(), anyString(), anyBoolean())).thenReturn(mChannel);
assertThat(mController.handlePreferenceTreeClick(pref)).isTrue();
assertThat(Settings.Global.getInt(mContext.getContentResolver(),
WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0))
.isEqualTo(1);
}
@Test
public void updateState_notificationsEnabled_shouldShowEnabledSummary() throws RemoteException {
final Preference pref = new Preference(mContext);
pref.setKey(mController.getPreferenceKey());
when(mNotificationChannelHelper.getNotificationChannelForPackage(
anyString(), anyInt(), anyString(), anyBoolean())).thenReturn(mChannel);
when(mChannel.getImportance()).thenReturn(NotificationManager.IMPORTANCE_DEFAULT);
mController.updateState(pref);
public void updateState_preferenceSetCheckedAndSetEnabledWhenSettingsAreEnabled() {
final SwitchPreference preference = mock(SwitchPreference.class);
Settings.System.putInt(mContext.getContentResolver(), NETWORK_RECOMMENDATIONS_ENABLED, 1);
Settings.System.putInt(mContext.getContentResolver(),
WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 1);
assertThat(pref.getSummary()).isEqualTo(
mContext.getString(R.string.notification_toggle_on));
mController.updateState(preference);
verify(preference).setChecked(true);
verify(preference).setEnabled(true);
}
@Test
public void updateState_notificationsEnabled_shouldShowDisabledSummary()
throws RemoteException {
final Preference pref = new Preference(mContext);
pref.setKey(mController.getPreferenceKey());
when(mNotificationChannelHelper.getNotificationChannelForPackage(
anyString(), anyInt(), anyString(), anyBoolean())).thenReturn(mChannel);
when(mChannel.getImportance()).thenReturn(NotificationManager.IMPORTANCE_NONE);
mController.updateState(pref);
public void updateState_preferenceSetCheckedAndSetEnabledWhenSettingsAreDisabled() {
final SwitchPreference preference = mock(SwitchPreference.class);
Settings.System.putInt(mContext.getContentResolver(), NETWORK_RECOMMENDATIONS_ENABLED, 0);
Settings.System.putInt(mContext.getContentResolver(),
WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0);
assertThat(pref.getSummary()).isEqualTo(
mContext.getString(R.string.notification_toggle_off));
mController.updateState(preference);
verify(preference).setChecked(false);
verify(preference).setEnabled(false);
}
}