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

Show wifi status label in preference summary.

Browse Source 
Bug: 74075761
Test: m RunSettingsRoboTests && manual
Change-Id: I286fac5d9390634facc0f04b845ef668c55d1331
This commit is contained in:
Amin Shaikh
2018-03-21 15:08:54 -04:00
parent 396e91abf0
commit c685d0fe9b
3 changed files with 41 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
View File

@@ -36,45 +36,41 @@ import com.android.settingslib.wifi.WifiStatusTracker;
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.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
public class WifiSummaryUpdaterTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private WifiManager mWifiManager;
@Mock
private SummaryListener mListener;
@Mock private WifiStatusTracker mWifiTracker;
@Mock private SummaryListener mListener;
private Context mContext;
private WifiSummaryUpdater mSummaryUpdater;
private WifiStatusTracker mWifiTracker;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mWifiTracker = new WifiStatusTracker(mWifiManager);
mContext = spy(RuntimeEnvironment.application.getApplicationContext());
mSummaryUpdater = new WifiSummaryUpdater(mContext, mListener, mWifiTracker);
}
@Test
public void register_true_shouldRegisterListener() {
public void register_true_shouldRegisterListenerAndTracker() {
mSummaryUpdater.register(true);
verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
verify(mWifiTracker).setListening(true);
}
@Test
public void register_false_shouldUnregisterListener() {
public void register_false_shouldUnregisterListenerAndTracker() {
mSummaryUpdater.register(true);
mSummaryUpdater.register(false);
verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
verify(mWifiTracker).setListening(false);
}
@Test
@@ -82,7 +78,6 @@ public class WifiSummaryUpdaterTest {
mSummaryUpdater.register(true);
mContext.sendBroadcast(new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION));
verify(mListener).onSummaryChanged(anyString());
}
@@ -91,7 +86,6 @@ public class WifiSummaryUpdaterTest {
mSummaryUpdater.register(true);
mContext.sendBroadcast(new Intent(WifiManager.RSSI_CHANGED_ACTION));
verify(mListener).onSummaryChanged(anyString());
}
@@ -121,6 +115,16 @@ public class WifiSummaryUpdaterTest {
assertThat(mSummaryUpdater.getSummary()).isEqualTo("Test Ssid");
}
@Test
public void getSummary_wifiConnected_withSpeedLabel_shouldReturnSsid_withSpeedLabel() {
mWifiTracker.enabled = true;
mWifiTracker.connected = true;
mWifiTracker.ssid = "Test Ssid";
mWifiTracker.statusLabel = "Very Fast";
assertThat(mSummaryUpdater.getSummary()).isEqualTo("Test Ssid / Very Fast");
}
private class SummaryListener implements OnSummaryChangeListener {
String summary;