drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev

Browse Source
This commit is contained in:
Jason Monk
2014-12-12 18:36:24 +00:00
committed by Gerrit Code Review
parent c28fa2cdd4 d8e4bf4e43
commit a686970051
3 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java
View File

@ -4,9 +4,17 @@ package com.android.systemui.statusbar.policy;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.List;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
import android.content.Intent; import android.content.Intent;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkInfo; import android.net.NetworkCapabilities;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.telephony.PhoneStateListener; import android.telephony.PhoneStateListener;
import android.telephony.ServiceState; import android.telephony.ServiceState;
@ -22,14 +30,6 @@ import com.android.systemui.statusbar.policy.NetworkController.NetworkSignalChan
import com.android.systemui.statusbar.policy.NetworkControllerImpl.Config; import com.android.systemui.statusbar.policy.NetworkControllerImpl.Config;
import com.android.systemui.statusbar.policy.NetworkControllerImpl.SignalCluster; import com.android.systemui.statusbar.policy.NetworkControllerImpl.SignalCluster;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.List;
public class NetworkControllerBaseTest extends AndroidTestCase { public class NetworkControllerBaseTest extends AndroidTestCase {
private static final String TAG = "NetworkControllerBaseTest"; private static final String TAG = "NetworkControllerBaseTest";
protected static final int DEFAULT_LEVEL = 2; protected static final int DEFAULT_LEVEL = 2;
@ -52,6 +52,8 @@ public class NetworkControllerBaseTest extends AndroidTestCase {
protected TelephonyManager mMockTm; protected TelephonyManager mMockTm;
protected Config mConfig; protected Config mConfig;
private NetworkCapabilities mNetCapabilities;
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
@ -63,7 +65,10 @@ public class NetworkControllerBaseTest extends AndroidTestCase {
mMockTm = mock(TelephonyManager.class); mMockTm = mock(TelephonyManager.class);
mMockSm = mock(SubscriptionManager.class); mMockSm = mock(SubscriptionManager.class);
mMockCm = mock(ConnectivityManager.class); mMockCm = mock(ConnectivityManager.class);
mNetCapabilities = new NetworkCapabilities();
when(mMockCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(true); when(mMockCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(true);
when(mMockCm.getDefaultNetworkCapabilitiesForUser(0)).thenReturn(
new NetworkCapabilities[] { mNetCapabilities });
mSignalStrength = mock(SignalStrength.class); mSignalStrength = mock(SignalStrength.class);
mServiceState = mock(ServiceState.class); mServiceState = mock(ServiceState.class);
@ -115,13 +120,18 @@ public class NetworkControllerBaseTest extends AndroidTestCase {
public void setConnectivity(int inetCondition, int networkType, boolean isConnected) { public void setConnectivity(int inetCondition, int networkType, boolean isConnected) {
Intent i = new Intent(ConnectivityManager.INET_CONDITION_ACTION); Intent i = new Intent(ConnectivityManager.INET_CONDITION_ACTION);
NetworkInfo networkInfo = mock(NetworkInfo.class); // TODO: Separate out into several NetworkCapabilities.
when(networkInfo.isConnected()).thenReturn(isConnected); if (isConnected) {
when(networkInfo.getType()).thenReturn(networkType); mNetCapabilities.addTransportType(networkType);
when(networkInfo.getTypeName()).thenReturn(""); } else {
when(mMockCm.getActiveNetworkInfo()).thenReturn(networkInfo); mNetCapabilities.removeTransportType(networkType);
}
if (inetCondition != 0) {
mNetCapabilities.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
} else {
mNetCapabilities.removeCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
}
i.putExtra(ConnectivityManager.EXTRA_INET_CONDITION, inetCondition);
mNetworkController.onReceive(mContext, i); mNetworkController.onReceive(mContext, i);
} }

2
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java
View File

@ -60,7 +60,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest {
DEFAULT_ICON); DEFAULT_ICON);
// Verify low inet number indexing. // Verify low inet number indexing.
setConnectivity(10, ConnectivityManager.TYPE_MOBILE, true); setConnectivity(0, ConnectivityManager.TYPE_MOBILE, true);
verifyLastMobileDataIndicators(true, verifyLastMobileDataIndicators(true,
TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH[0][testStrength], 0); TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH[0][testStrength], 0);
} }

20
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java
View File

@ -27,7 +27,7 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest {
setConnectivity(100, ConnectivityManager.TYPE_WIFI, true); setConnectivity(100, ConnectivityManager.TYPE_WIFI, true);
verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[1][testLevel]); verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[1][testLevel]);
setConnectivity(10, ConnectivityManager.TYPE_WIFI, true); setConnectivity(0, ConnectivityManager.TYPE_WIFI, true);
verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[0][testLevel]); verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[0][testLevel]);
} }
} }
@ -48,7 +48,7 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest {
setConnectivity(100, ConnectivityManager.TYPE_WIFI, true); setConnectivity(100, ConnectivityManager.TYPE_WIFI, true);
verifyLastQsWifiIcon(true, true, WifiIcons.QS_WIFI_SIGNAL_STRENGTH[1][testLevel], verifyLastQsWifiIcon(true, true, WifiIcons.QS_WIFI_SIGNAL_STRENGTH[1][testLevel],
testSsid); testSsid);
setConnectivity(10, ConnectivityManager.TYPE_WIFI, true); setConnectivity(0, ConnectivityManager.TYPE_WIFI, true);
verifyLastQsWifiIcon(true, true, WifiIcons.QS_WIFI_SIGNAL_STRENGTH[0][testLevel], verifyLastQsWifiIcon(true, true, WifiIcons.QS_WIFI_SIGNAL_STRENGTH[0][testLevel],
testSsid); testSsid);
} }
@ -75,22 +75,6 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest {
verifyLastQsDataDirection(true, true); verifyLastQsDataDirection(true, true);
} }
public void testNoDataIconDuringWifi() {
// Setup normal connection
String testSsid = "Test SSID";
int testLevel = 2;
setWifiEnabled(true);
setWifiState(true, testSsid);
setWifiLevel(testLevel);
setConnectivity(100, ConnectivityManager.TYPE_WIFI, true);
verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[1][testLevel]);
setupDefaultSignal();
// Still be on wifi though.
setConnectivity(100, ConnectivityManager.TYPE_WIFI, true);
verifyLastMobileDataIndicators(true, DEFAULT_SIGNAL_STRENGTH, 0 /* No icon */);
}
public void testRoamingIconDuringWifi() { public void testRoamingIconDuringWifi() {
// Setup normal connection // Setup normal connection
String testSsid = "Test SSID"; String testSsid = "Test SSID";