Merge changes I401c064c,I16431a4d am: 84464cae37 am: 2d6a025c1d (16f33e43) · Commits · e / os / android_frameworks_base

core/tests/coretests/src/android/net/NetworkKeyTest.java

+8 −7

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.net;

		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertNull;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.when;

		import android.net.wifi.ScanResult;
		@@ -107,7 +108,7 @@ public class NetworkKeyTest {

		@Test
		public void createFromScanResult_nullSsid() {
		ScanResult scanResult = new ScanResult();
		ScanResult scanResult = mock(ScanResult.class);
		scanResult.BSSID = VALID_BSSID;

		assertNull(NetworkKey.createFromScanResult(scanResult));
		@@ -115,7 +116,7 @@ public class NetworkKeyTest {

		@Test
		public void createFromScanResult_emptySsid() {
		ScanResult scanResult = new ScanResult();
		ScanResult scanResult = mock(ScanResult.class);
		scanResult.SSID = "";
		scanResult.BSSID = VALID_BSSID;

		@@ -124,7 +125,7 @@ public class NetworkKeyTest {

		@Test
		public void createFromScanResult_noneSsid() {
		ScanResult scanResult = new ScanResult();
		ScanResult scanResult = mock(ScanResult.class);
		scanResult.SSID = WifiManager.UNKNOWN_SSID;
		scanResult.BSSID = VALID_BSSID;

		@@ -133,7 +134,7 @@ public class NetworkKeyTest {

		@Test
		public void createFromScanResult_nullBssid() {
		ScanResult scanResult = new ScanResult();
		ScanResult scanResult = mock(ScanResult.class);
		scanResult.SSID = VALID_UNQUOTED_SSID;

		assertNull(NetworkKey.createFromScanResult(scanResult));
		@@ -141,7 +142,7 @@ public class NetworkKeyTest {

		@Test
		public void createFromScanResult_emptyBssid() {
		ScanResult scanResult = new ScanResult();
		ScanResult scanResult = mock(ScanResult.class);
		scanResult.SSID = VALID_UNQUOTED_SSID;
		scanResult.BSSID = "";

		@@ -150,7 +151,7 @@ public class NetworkKeyTest {

		@Test
		public void createFromScanResult_invalidBssid() {
		ScanResult scanResult = new ScanResult();
		ScanResult scanResult = mock(ScanResult.class);
		scanResult.SSID = VALID_UNQUOTED_SSID;
		scanResult.BSSID = INVALID_BSSID;

		@@ -159,7 +160,7 @@ public class NetworkKeyTest {

		@Test
		public void createFromScanResult_validSsid() {
		ScanResult scanResult = new ScanResult();
		ScanResult scanResult = mock(ScanResult.class);
		scanResult.SSID = VALID_UNQUOTED_SSID;
		scanResult.BSSID = VALID_BSSID;

services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import static org.mockito.Matchers.anyString;
		import static org.mockito.Matchers.eq;
		import static org.mockito.Mockito.atLeastOnce;
		import static org.mockito.Mockito.doThrow;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.never;
		import static org.mockito.Mockito.timeout;
		import static org.mockito.Mockito.times;
		@@ -57,7 +58,6 @@ import android.net.wifi.ScanResult;
		import android.net.wifi.WifiConfiguration;
		import android.net.wifi.WifiInfo;
		import android.net.wifi.WifiManager;
		import android.net.wifi.WifiSsid;
		import android.os.Binder;
		import android.os.Handler;
		import android.os.HandlerThread;
		@@ -180,8 +180,8 @@ public class NetworkScoreServiceTest {
		}

		private ScanResult createScanResult(String ssid, String bssid) {
		ScanResult result = new ScanResult();
		result.wifiSsid = WifiSsid.createFromAsciiEncoded(ssid);
		ScanResult result = mock(ScanResult.class);
		result.SSID = ssid;
		result.BSSID = bssid;
		return result;
		}
		@@ -792,7 +792,7 @@ public class NetworkScoreServiceTest {
		@Test
		public void testScanResultsScoreCacheFilter_invalidScanResults() throws Exception {
		List<ScanResult> invalidScanResults = Lists.newArrayList(
		new ScanResult(),
		mock(ScanResult.class),
		createScanResult("", SCORED_NETWORK.networkKey.wifiKey.bssid),
		createScanResult(WifiManager.UNKNOWN_SSID, SCORED_NETWORK.networkKey.wifiKey.bssid),
		createScanResult(SSID, null),