Merge "Create settings page for choosing default Network Scorer."
This commit is contained in:
TreeHugger Robot
committed by
Android (Google) Code Review
Android (Google) Code Review
commit
126d9ae6f4
112
tests/robotests/src/android/net/NetworkScorerAppData.java
Normal file
112
tests/robotests/src/android/net/NetworkScorerAppData.java
Normal file
@@ -0,0 +1,112 @@
|
||||
package android.net;
|
||||
|
||||
import android.annotation.Nullable;
|
||||
import android.content.ComponentName;
|
||||
import android.os.Parcel;
|
||||
import android.os.Parcelable;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* Holds metadata about a discovered network scorer/recommendation application.
|
||||
*
|
||||
* TODO: delete this class once robolectric supports Android O
|
||||
*/
|
||||
public final class NetworkScorerAppData implements Parcelable {
|
||||
/** UID of the scorer app. */
|
||||
public final int packageUid;
|
||||
private final ComponentName mRecommendationService;
|
||||
/** User visible label in Settings for the recommendation service. */
|
||||
private final String mRecommendationServiceLabel;
|
||||
/**
|
||||
* The {@link ComponentName} of the Activity to start before enabling the "connect to open
|
||||
* wifi networks automatically" feature.
|
||||
*/
|
||||
private final ComponentName mEnableUseOpenWifiActivity;
|
||||
|
||||
public NetworkScorerAppData(int packageUid, ComponentName recommendationServiceComp,
|
||||
String recommendationServiceLabel, ComponentName enableUseOpenWifiActivity) {
|
||||
this.packageUid = packageUid;
|
||||
this.mRecommendationService = recommendationServiceComp;
|
||||
this.mRecommendationServiceLabel = recommendationServiceLabel;
|
||||
this.mEnableUseOpenWifiActivity = enableUseOpenWifiActivity;
|
||||
}
|
||||
|
||||
protected NetworkScorerAppData(Parcel in) {
|
||||
packageUid = in.readInt();
|
||||
mRecommendationService = ComponentName.readFromParcel(in);
|
||||
mRecommendationServiceLabel = in.readString();
|
||||
mEnableUseOpenWifiActivity = ComponentName.readFromParcel(in);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToParcel(Parcel dest, int flags) {
|
||||
dest.writeInt(packageUid);
|
||||
ComponentName.writeToParcel(mRecommendationService, dest);
|
||||
dest.writeString(mRecommendationServiceLabel);
|
||||
ComponentName.writeToParcel(mEnableUseOpenWifiActivity, dest);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int describeContents() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
public static final Creator<NetworkScorerAppData> CREATOR =
|
||||
new Creator<NetworkScorerAppData>() {
|
||||
@Override
|
||||
public NetworkScorerAppData createFromParcel(Parcel in) {
|
||||
return new NetworkScorerAppData(in);
|
||||
}
|
||||
|
||||
@Override
|
||||
public NetworkScorerAppData[] newArray(int size) {
|
||||
return new NetworkScorerAppData[size];
|
||||
}
|
||||
};
|
||||
|
||||
public String getRecommendationServicePackageName() {
|
||||
return mRecommendationService.getPackageName();
|
||||
}
|
||||
|
||||
public ComponentName getRecommendationServiceComponent() {
|
||||
return mRecommendationService;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public ComponentName getEnableUseOpenWifiActivity() {
|
||||
return mEnableUseOpenWifiActivity;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public String getRecommendationServiceLabel() {
|
||||
return mRecommendationServiceLabel;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "NetworkScorerAppData{" +
|
||||
"packageUid=" + packageUid +
|
||||
", mRecommendationService=" + mRecommendationService +
|
||||
", mRecommendationServiceLabel=" + mRecommendationServiceLabel +
|
||||
", mEnableUseOpenWifiActivity=" + mEnableUseOpenWifiActivity +
|
||||
'}';
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
if (o == null || getClass() != o.getClass()) return false;
|
||||
NetworkScorerAppData that = (NetworkScorerAppData) o;
|
||||
return packageUid == that.packageUid &&
|
||||
Objects.equals(mRecommendationService, that.mRecommendationService) &&
|
||||
Objects.equals(mRecommendationServiceLabel, that.mRecommendationServiceLabel) &&
|
||||
Objects.equals(mEnableUseOpenWifiActivity, that.mEnableUseOpenWifiActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(packageUid, mRecommendationService, mRecommendationServiceLabel,
|
||||
mEnableUseOpenWifiActivity);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,172 @@
|
||||
/*
|
||||
* 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.network;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Matchers.anyInt;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.net.NetworkScorerAppData;
|
||||
import android.support.v7.preference.PreferenceManager;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.widget.RadioButtonPreference;
|
||||
import com.google.android.collect.Lists;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class NetworkScorerPickerTest {
|
||||
|
||||
private static final String TEST_SCORER_PACKAGE_1 = "Test Package 1";
|
||||
private static final String TEST_SCORER_CLASS_1 = "Test Class 1";
|
||||
private static final String TEST_SCORER_LABEL_1 = "Test Label 1";
|
||||
private static final String TEST_SCORER_PACKAGE_2 = "Test Package 2";
|
||||
|
||||
private Context mContext;
|
||||
@Mock
|
||||
private NetworkScoreManagerWrapper mNetworkScoreManager;
|
||||
@Mock
|
||||
private PreferenceScreen mPreferenceScreen;
|
||||
|
||||
private TestFragment mFragment;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mFragment = new TestFragment(mContext, mPreferenceScreen, mNetworkScoreManager);
|
||||
mFragment.onAttach(mContext);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testOnRadioButtonClicked_success() {
|
||||
RadioButtonPreference pref = new RadioButtonPreference(mContext);
|
||||
pref.setKey(TEST_SCORER_PACKAGE_1);
|
||||
when(mPreferenceScreen.getPreference(anyInt())).thenReturn(pref);
|
||||
when(mPreferenceScreen.getPreferenceCount()).thenReturn(1);
|
||||
when(mNetworkScoreManager.setActiveScorer(TEST_SCORER_PACKAGE_1)).thenReturn(true);
|
||||
when(mNetworkScoreManager.getActiveScorerPackage()).thenReturn(TEST_SCORER_PACKAGE_2);
|
||||
|
||||
mFragment.onRadioButtonClicked(pref);
|
||||
|
||||
verify(mNetworkScoreManager).setActiveScorer(TEST_SCORER_PACKAGE_1);
|
||||
assertThat(pref.isChecked()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testOnRadioButtonClicked_currentScorer_doNothing() {
|
||||
RadioButtonPreference pref = new RadioButtonPreference(mContext);
|
||||
pref.setKey(TEST_SCORER_PACKAGE_1);
|
||||
pref.setChecked(true);
|
||||
when(mPreferenceScreen.getPreference(anyInt())).thenReturn(pref);
|
||||
when(mPreferenceScreen.getPreferenceCount()).thenReturn(1);
|
||||
when(mNetworkScoreManager.setActiveScorer(TEST_SCORER_PACKAGE_1)).thenReturn(true);
|
||||
when(mNetworkScoreManager.getActiveScorerPackage()).thenReturn(TEST_SCORER_PACKAGE_1);
|
||||
|
||||
mFragment.onRadioButtonClicked(pref);
|
||||
|
||||
verify(mNetworkScoreManager, never()).setActiveScorer(any());
|
||||
assertThat(pref.isChecked()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUpdateCandidates_noValidScorers_nonePreference() {
|
||||
when(mNetworkScoreManager.getAllValidScorers()).thenReturn(new ArrayList<>());
|
||||
ArgumentCaptor<RadioButtonPreference> arg =
|
||||
ArgumentCaptor.forClass(RadioButtonPreference.class);
|
||||
|
||||
mFragment.updateCandidates();
|
||||
|
||||
verify(mPreferenceScreen).addPreference(arg.capture());
|
||||
assertThat(arg.getValue().getTitle()).isEqualTo(
|
||||
mContext.getString(R.string.network_scorer_picker_none_preference));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUpdateCandidates_validScorer() {
|
||||
ComponentName scorer = new ComponentName(TEST_SCORER_PACKAGE_1, TEST_SCORER_CLASS_1);
|
||||
NetworkScorerAppData scorerAppData = new NetworkScorerAppData(
|
||||
0, scorer, TEST_SCORER_LABEL_1, null /* enableUseOpenWifiActivity */);
|
||||
when(mNetworkScoreManager.getAllValidScorers()).thenReturn(
|
||||
Lists.newArrayList(scorerAppData));
|
||||
when(mNetworkScoreManager.getActiveScorerPackage()).thenReturn(TEST_SCORER_PACKAGE_1);
|
||||
ArgumentCaptor<RadioButtonPreference> arg =
|
||||
ArgumentCaptor.forClass(RadioButtonPreference.class);
|
||||
|
||||
mFragment.updateCandidates();
|
||||
|
||||
verify(mPreferenceScreen).addPreference(arg.capture());
|
||||
RadioButtonPreference pref = arg.getValue();
|
||||
assertThat(pref.getTitle()).isEqualTo(TEST_SCORER_LABEL_1);
|
||||
assertThat(pref.isChecked()).isTrue();
|
||||
}
|
||||
|
||||
public static class TestFragment extends NetworkScorerPicker {
|
||||
|
||||
private final Context mContext;
|
||||
private final PreferenceScreen mScreen;
|
||||
private final PreferenceManager mPrefManager;
|
||||
private final NetworkScoreManagerWrapper mNetworkScoreManagerWrapper;
|
||||
|
||||
public TestFragment(Context context, PreferenceScreen preferenceScreen,
|
||||
NetworkScoreManagerWrapper networkScoreManagerWrapper) {
|
||||
mContext = context;
|
||||
mScreen = preferenceScreen;
|
||||
mNetworkScoreManagerWrapper = networkScoreManagerWrapper;
|
||||
mPrefManager = mock(PreferenceManager.class);
|
||||
when(mPrefManager.getContext()).thenReturn(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Context getContext() {
|
||||
return mContext;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PreferenceManager getPreferenceManager() {
|
||||
return mPrefManager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PreferenceScreen getPreferenceScreen() {
|
||||
return mScreen;
|
||||
}
|
||||
|
||||
@Override
|
||||
NetworkScoreManagerWrapper createNetworkScorerManagerWrapper(Context context) {
|
||||
return mNetworkScoreManagerWrapper;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user