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

Merge "Show security info in saved network list" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-16 15:25:52 +00:00
committed by Android (Google) Code Review
parent 49b86b5c6a 8b23c35954
commit ecd1df1076
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -372,7 +372,11 @@ public class WifiConfigController implements TextWatcher,
group.addView(row); group.addView(row);
} }
private String getSignalString() { @VisibleForTesting
String getSignalString() {
if (!mAccessPoint.isReachable()) {
return null;
}
final int level = mAccessPoint.getLevel(); final int level = mAccessPoint.getLevel();
return (level > -1 && level < mLevels.length) ? mLevels[level] : null; return (level > -1 && level < mLevels.length) ? mLevels[level] : null;

15
tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
View File

@@ -16,10 +16,6 @@
package com.android.settings.wifi; package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@@ -40,6 +36,9 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
shadows = ShadowConnectivityManager.class) shadows = ShadowConnectivityManager.class)
@@ -109,6 +108,7 @@ public class WifiConfigControllerTest {
when(mAccessPoint.isSaved()).thenReturn(true); when(mAccessPoint.isSaved()).thenReturn(true);
assertThat(mController.isSubmittable()).isTrue(); assertThat(mController.isSubmittable()).isTrue();
} }
@Test @Test
public void isSubmittable_nullAccessPoint_noException() { public void isSubmittable_nullAccessPoint_noException() {
mController = new TestWifiConfigController(mConfigUiBase, mView, null, mController = new TestWifiConfigController(mConfigUiBase, mView, null,
@@ -116,6 +116,13 @@ public class WifiConfigControllerTest {
mController.isSubmittable(); mController.isSubmittable();
} }
@Test
public void getSignalString_notReachable_shouldHaveNoSignalString() {
when(mAccessPoint.isReachable()).thenReturn(false);
assertThat(mController.getSignalString()).isNull();
}
public class TestWifiConfigController extends WifiConfigController { public class TestWifiConfigController extends WifiConfigController {
public TestWifiConfigController(WifiConfigUiBase parent, View view, public TestWifiConfigController(WifiConfigUiBase parent, View view,