Merge "Replace hidden API with public API" (7283a692) · Commits · e / os / android_frameworks_base

packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

+14 −4

Original line number	Original line	Diff line number	Diff line
	@@ -683,6 +683,16 @@ public class AccessPointTest {
	assertThat(ap.getTitle()).isEqualTo(providerFriendlyName);		assertThat(ap.getTitle()).isEqualTo(providerFriendlyName);
	}		}

			// This method doesn't copy mIsFailover, mIsAvailable and mIsRoaming because NetworkInfo
			// doesn't expose those three set methods. But that's fine since the tests don't use those three
			// variables.
			private NetworkInfo copyNetworkInfo(NetworkInfo ni) {
			final NetworkInfo copy = new NetworkInfo(ni.getType(), ni.getSubtype(), ni.getTypeName(),
			ni.getSubtypeName());
			copy.setDetailedState(ni.getDetailedState(), ni.getReason(), ni.getExtraInfo());
			return copy;
			}

	@Test		@Test
	public void testUpdateNetworkInfo_returnsTrue() {		public void testUpdateNetworkInfo_returnsTrue() {
	int networkId = 123;		int networkId = 123;
	@@ -704,7 +714,7 @@ public class AccessPointTest {
	.setWifiInfo(wifiInfo)		.setWifiInfo(wifiInfo)
	.build();		.build();

	NetworkInfo newInfo = new NetworkInfo(networkInfo);		NetworkInfo newInfo = copyNetworkInfo(networkInfo);
	newInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, "", "");		newInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, "", "");
	assertThat(ap.update(config, wifiInfo, newInfo)).isTrue();		assertThat(ap.update(config, wifiInfo, newInfo)).isTrue();
	}		}
	@@ -730,7 +740,7 @@ public class AccessPointTest {
	.setWifiInfo(wifiInfo)		.setWifiInfo(wifiInfo)
	.build();		.build();

	NetworkInfo newInfo = new NetworkInfo(networkInfo); // same values		NetworkInfo newInfo = copyNetworkInfo(networkInfo); // same values
	assertThat(ap.update(config, wifiInfo, newInfo)).isFalse();		assertThat(ap.update(config, wifiInfo, newInfo)).isFalse();
	}		}

	@@ -755,7 +765,7 @@ public class AccessPointTest {
	.setWifiInfo(wifiInfo)		.setWifiInfo(wifiInfo)
	.build();		.build();

	NetworkInfo newInfo = new NetworkInfo(networkInfo); // same values		NetworkInfo newInfo = copyNetworkInfo(networkInfo); // same values
	wifiInfo.setRssi(rssi + 1);		wifiInfo.setRssi(rssi + 1);
	assertThat(ap.update(config, wifiInfo, newInfo)).isTrue();		assertThat(ap.update(config, wifiInfo, newInfo)).isTrue();
	}		}
	@@ -781,7 +791,7 @@ public class AccessPointTest {
	.setWifiInfo(wifiInfo)		.setWifiInfo(wifiInfo)
	.build();		.build();

	NetworkInfo newInfo = new NetworkInfo(networkInfo); // same values		NetworkInfo newInfo = copyNetworkInfo(networkInfo); // same values
	wifiInfo.setRssi(WifiInfo.INVALID_RSSI);		wifiInfo.setRssi(WifiInfo.INVALID_RSSI);
	assertThat(ap.update(config, wifiInfo, newInfo)).isFalse();		assertThat(ap.update(config, wifiInfo, newInfo)).isFalse();
	}		}