Merge "ConnectedNetworkScorerTest: Test for a getter in WifiUsabilityStatsEntry" into rvc-dev
diff --git a/tests/cts/net/src/android/net/cts/IpConfigurationTest.java b/tests/cts/net/src/android/net/cts/IpConfigurationTest.java
index 21be351..c6bc077 100644
--- a/tests/cts/net/src/android/net/cts/IpConfigurationTest.java
+++ b/tests/cts/net/src/android/net/cts/IpConfigurationTest.java
@@ -16,6 +16,8 @@
package android.net.cts;
+import static com.android.testutils.ParcelUtilsKt.assertParcelSane;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -37,13 +39,6 @@
@RunWith(AndroidJUnit4.class)
public final class IpConfigurationTest {
- private static final int TYPE_IPASSIGNMENT_STATIC = 0;
- private static final int TYPE_IPASSIGNMENT_DHCP = 1;
-
- private static final int TYPE_PROXY_SETTINGS_NONE = 0;
- private static final int TYPE_PROXY_SETTINGS_STATIC = 1;
- private static final int TYPE_PROXY_SETTINGS_PAC = 2;
-
private static final LinkAddress LINKADDR = new LinkAddress("192.0.2.2/25");
private static final InetAddress GATEWAY = InetAddressUtils.parseNumericAddress("192.0.2.1");
private static final InetAddress DNS1 = InetAddressUtils.parseNumericAddress("8.8.8.8");
@@ -76,24 +71,31 @@
assertIpConfigurationEqual(ipConfig, new IpConfiguration());
assertIpConfigurationEqual(ipConfig, new IpConfiguration(ipConfig));
- ipConfig = createIpConfiguration(TYPE_IPASSIGNMENT_STATIC,
- TYPE_PROXY_SETTINGS_PAC);
+ ipConfig.setStaticIpConfiguration(mStaticIpConfig);
+ ipConfig.setHttpProxy(mProxy);
+
+ ipConfig.setIpAssignment(IpConfiguration.IpAssignment.STATIC);
+ ipConfig.setProxySettings(IpConfiguration.ProxySettings.PAC);
assertIpConfigurationEqual(ipConfig, new IpConfiguration(ipConfig));
- ipConfig = createIpConfiguration(TYPE_IPASSIGNMENT_STATIC,
- TYPE_PROXY_SETTINGS_STATIC);
+ ipConfig.setIpAssignment(IpConfiguration.IpAssignment.STATIC);
+ ipConfig.setProxySettings(IpConfiguration.ProxySettings.STATIC);
assertIpConfigurationEqual(ipConfig, new IpConfiguration(ipConfig));
- ipConfig = createIpConfiguration(TYPE_IPASSIGNMENT_DHCP,
- TYPE_PROXY_SETTINGS_PAC);
+ ipConfig.setIpAssignment(IpConfiguration.IpAssignment.DHCP);
+ ipConfig.setProxySettings(IpConfiguration.ProxySettings.PAC);
assertIpConfigurationEqual(ipConfig, new IpConfiguration(ipConfig));
- ipConfig = createIpConfiguration(TYPE_IPASSIGNMENT_DHCP,
- TYPE_PROXY_SETTINGS_STATIC);
+ ipConfig.setIpAssignment(IpConfiguration.IpAssignment.DHCP);
+ ipConfig.setProxySettings(IpConfiguration.ProxySettings.PAC);
assertIpConfigurationEqual(ipConfig, new IpConfiguration(ipConfig));
- ipConfig = createIpConfiguration(TYPE_IPASSIGNMENT_DHCP,
- TYPE_PROXY_SETTINGS_NONE);
+ ipConfig.setIpAssignment(IpConfiguration.IpAssignment.DHCP);
+ ipConfig.setProxySettings(IpConfiguration.ProxySettings.STATIC);
+ assertIpConfigurationEqual(ipConfig, new IpConfiguration(ipConfig));
+
+ ipConfig.setIpAssignment(IpConfiguration.IpAssignment.DHCP);
+ ipConfig.setProxySettings(IpConfiguration.ProxySettings.NONE);
assertIpConfigurationEqual(ipConfig, new IpConfiguration(ipConfig));
}
@@ -106,46 +108,16 @@
assertNull(config.getHttpProxy());
}
- private IpConfiguration createIpConfiguration(int ipAssignmentType,
- int proxySettingType) {
-
- final IpConfiguration ipConfig = new IpConfiguration();
-
- switch (ipAssignmentType) {
- case TYPE_IPASSIGNMENT_STATIC:
- ipConfig.setIpAssignment(IpConfiguration.IpAssignment.STATIC);
- break;
- case TYPE_IPASSIGNMENT_DHCP:
- ipConfig.setIpAssignment(IpConfiguration.IpAssignment.DHCP);
- break;
- default:
- throw new IllegalArgumentException("Unknown ip assignment type.");
- }
-
- switch (proxySettingType) {
- case TYPE_PROXY_SETTINGS_NONE:
- ipConfig.setProxySettings(IpConfiguration.ProxySettings.NONE);
- break;
- case TYPE_PROXY_SETTINGS_STATIC:
- ipConfig.setProxySettings(IpConfiguration.ProxySettings.STATIC);
- break;
- case TYPE_PROXY_SETTINGS_PAC:
- ipConfig.setProxySettings(IpConfiguration.ProxySettings.PAC);
- break;
- default:
- throw new IllegalArgumentException("Unknown proxy setting type.");
- }
-
- ipConfig.setStaticIpConfiguration(mStaticIpConfig);
- ipConfig.setHttpProxy(mProxy);
-
- return ipConfig;
- }
-
private void assertIpConfigurationEqual(IpConfiguration source, IpConfiguration target) {
assertEquals(source.getIpAssignment(), target.getIpAssignment());
assertEquals(source.getProxySettings(), target.getProxySettings());
assertEquals(source.getHttpProxy(), target.getHttpProxy());
assertEquals(source.getStaticIpConfiguration(), target.getStaticIpConfiguration());
}
+
+ @Test
+ public void testParcel() {
+ final IpConfiguration config = new IpConfiguration();
+ assertParcelSane(config, 4);
+ }
}
diff --git a/tests/cts/net/src/android/net/cts/RssiCurveTest.java b/tests/cts/net/src/android/net/cts/RssiCurveTest.java
new file mode 100644
index 0000000..d651b71
--- /dev/null
+++ b/tests/cts/net/src/android/net/cts/RssiCurveTest.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.net.RssiCurve;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** CTS tests for {@link RssiCurve}. */
+@RunWith(AndroidJUnit4.class)
+public class RssiCurveTest {
+
+ @Test
+ public void lookupScore_constantCurve() {
+ // One bucket from rssi=-100 to 100 with score 10.
+ RssiCurve curve = new RssiCurve(-100, 200, new byte[] { 10 });
+ assertThat(curve.lookupScore(-200)).isEqualTo(10);
+ assertThat(curve.lookupScore(-100)).isEqualTo(10);
+ assertThat(curve.lookupScore(0)).isEqualTo(10);
+ assertThat(curve.lookupScore(100)).isEqualTo(10);
+ assertThat(curve.lookupScore(200)).isEqualTo(10);
+ }
+
+ @Test
+ public void lookupScore_changingCurve() {
+ // One bucket from -100 to 0 with score -10, and one bucket from 0 to 100 with score 10.
+ RssiCurve curve = new RssiCurve(-100, 100, new byte[] { -10, 10 });
+ assertThat(curve.lookupScore(-200)).isEqualTo(-10);
+ assertThat(curve.lookupScore(-100)).isEqualTo(-10);
+ assertThat(curve.lookupScore(-50)).isEqualTo(-10);
+ assertThat(curve.lookupScore(0)).isEqualTo(10);
+ assertThat(curve.lookupScore(50)).isEqualTo(10);
+ assertThat(curve.lookupScore(100)).isEqualTo(10);
+ assertThat(curve.lookupScore(200)).isEqualTo(10);
+ }
+
+ @Test
+ public void lookupScore_linearCurve() {
+ // Curve starting at -110, with 15 buckets of width 10 whose scores increases by 10 with
+ // each bucket. The current active network gets a boost of 15 to its RSSI.
+ RssiCurve curve = new RssiCurve(
+ -110,
+ 10,
+ new byte[] { -20, -10, 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120 },
+ 15);
+
+ assertThat(curve.lookupScore(-120)).isEqualTo(-20);
+ assertThat(curve.lookupScore(-120, false)).isEqualTo(-20);
+ assertThat(curve.lookupScore(-120, true)).isEqualTo(-20);
+
+ assertThat(curve.lookupScore(-111)).isEqualTo(-20);
+ assertThat(curve.lookupScore(-111, false)).isEqualTo(-20);
+ assertThat(curve.lookupScore(-111, true)).isEqualTo(-10);
+
+ assertThat(curve.lookupScore(-110)).isEqualTo(-20);
+ assertThat(curve.lookupScore(-110, false)).isEqualTo(-20);
+ assertThat(curve.lookupScore(-110, true)).isEqualTo(-10);
+
+ assertThat(curve.lookupScore(-105)).isEqualTo(-20);
+ assertThat(curve.lookupScore(-105, false)).isEqualTo(-20);
+ assertThat(curve.lookupScore(-105, true)).isEqualTo(0);
+
+ assertThat(curve.lookupScore(-100)).isEqualTo(-10);
+ assertThat(curve.lookupScore(-100, false)).isEqualTo(-10);
+ assertThat(curve.lookupScore(-100, true)).isEqualTo(0);
+
+ assertThat(curve.lookupScore(-50)).isEqualTo(40);
+ assertThat(curve.lookupScore(-50, false)).isEqualTo(40);
+ assertThat(curve.lookupScore(-50, true)).isEqualTo(50);
+
+ assertThat(curve.lookupScore(0)).isEqualTo(90);
+ assertThat(curve.lookupScore(0, false)).isEqualTo(90);
+ assertThat(curve.lookupScore(0, true)).isEqualTo(100);
+
+ assertThat(curve.lookupScore(30)).isEqualTo(120);
+ assertThat(curve.lookupScore(30, false)).isEqualTo(120);
+ assertThat(curve.lookupScore(30, true)).isEqualTo(120);
+
+ assertThat(curve.lookupScore(40)).isEqualTo(120);
+ assertThat(curve.lookupScore(40, false)).isEqualTo(120);
+ assertThat(curve.lookupScore(40, true)).isEqualTo(120);
+ }
+}
diff --git a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
index 3153149..4cbdf62 100644
--- a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
@@ -1403,13 +1403,13 @@
mWifiManager.setSoftApConfiguration(targetConfig);
// Bssid set dodesn't support for tethered hotspot
SoftApConfiguration currentConfig = mWifiManager.getSoftApConfiguration();
- assertNull(currentConfig.getBssid());
compareSoftApConfiguration(targetConfig, currentConfig);
}
private void compareSoftApConfiguration(SoftApConfiguration currentConfig,
SoftApConfiguration testSoftApConfig) {
assertEquals(currentConfig.getSsid(), testSoftApConfig.getSsid());
+ assertEquals(currentConfig.getBssid(), testSoftApConfig.getBssid());
assertEquals(currentConfig.getSecurityType(), testSoftApConfig.getSecurityType());
assertEquals(currentConfig.getPassphrase(), testSoftApConfig.getPassphrase());
assertEquals(currentConfig.isHiddenSsid(), testSoftApConfig.isHiddenSsid());
diff --git a/tests/cts/net/src/android/net/wifi/rtt/cts/WifiRttTest.java b/tests/cts/net/src/android/net/wifi/rtt/cts/WifiRttTest.java
index 49aa47e..9cbaf39 100644
--- a/tests/cts/net/src/android/net/wifi/rtt/cts/WifiRttTest.java
+++ b/tests/cts/net/src/android/net/wifi/rtt/cts/WifiRttTest.java
@@ -72,10 +72,9 @@
// Scan for IEEE 802.11mc supporting APs
ScanResult testAp = scanForTestAp(NUM_SCANS_SEARCHING_FOR_IEEE80211MC_AP);
- assertTrue(
+ assertNotNull(
"Cannot find any test APs which support RTT / IEEE 802.11mc - please verify that "
- + "your test setup includes them!",
- testAp != null);
+ + "your test setup includes them!", testAp);
// Perform RTT operations
RangingRequest request = new RangingRequest.Builder().addAccessPoint(testAp).build();
@@ -100,16 +99,15 @@
callback.waitForCallback());
List<RangingResult> currentResults = callback.getResults();
- assertTrue("Wi-Fi RTT results: null results (onRangingFailure) on iteration " + i,
- currentResults != null);
- assertTrue("Wi-Fi RTT results: unexpected # of results (expect 1) on iteration " + i,
- currentResults.size() == 1);
+ assertNotNull("Wi-Fi RTT results: null results (onRangingFailure) on iteration " + i,
+ currentResults);
+ assertEquals("Wi-Fi RTT results: unexpected # of results (expect 1) on iteration " + i,
+ 1, currentResults.size());
RangingResult result = currentResults.get(0);
- assertTrue("Wi-Fi RTT results: invalid result (wrong BSSID) entry on iteration " + i,
- result.getMacAddress().toString().equals(testAp.BSSID));
- assertEquals(
- "Wi-Fi RTT results: invalid result (non-null PeerHandle) entry on iteration "
- + i, null, result.getPeerHandle());
+ assertEquals("Wi-Fi RTT results: invalid result (wrong BSSID) entry on iteration " + i,
+ result.getMacAddress().toString(), testAp.BSSID);
+ assertNull("Wi-Fi RTT results: invalid result (non-null PeerHandle) entry on iteration "
+ + i, result.getPeerHandle());
allResults.add(result);
int status = result.getStatus();
@@ -189,23 +187,24 @@
* Validate that when a request contains more range operations than allowed (by API) that we
* get an exception.
*/
- public void testRequestTooLarge() {
+ public void testRequestTooLarge() throws InterruptedException {
if (!shouldTestWifiRtt(getContext())) {
return;
}
-
- ScanResult dummy = mock(ScanResult.class);
- dummy.BSSID = "00:01:02:03:04:05";
+ ScanResult testAp = scanForTestAp(NUM_SCANS_SEARCHING_FOR_IEEE80211MC_AP);
+ assertNotNull(
+ "Cannot find any test APs which support RTT / IEEE 802.11mc - please verify that "
+ + "your test setup includes them!", testAp);
RangingRequest.Builder builder = new RangingRequest.Builder();
for (int i = 0; i < RangingRequest.getMaxPeers() - 2; ++i) {
- builder.addAccessPoint(dummy);
+ builder.addAccessPoint(testAp);
}
List<ScanResult> scanResults = new ArrayList<>();
- scanResults.add(dummy);
- scanResults.add(dummy);
- scanResults.add(dummy);
+ scanResults.add(testAp);
+ scanResults.add(testAp);
+ scanResults.add(testAp);
builder.addAccessPoints(scanResults);
@@ -215,10 +214,8 @@
return;
}
- assertTrue(
- "Did not receive expected IllegalArgumentException when tried to range to too "
- + "many peers",
- false);
+ fail("Did not receive expected IllegalArgumentException when tried to range to too "
+ + "many peers");
}
/**
@@ -230,10 +227,9 @@
}
// Scan for IEEE 802.11mc supporting APs
ScanResult testAp = scanForTestAp(NUM_SCANS_SEARCHING_FOR_IEEE80211MC_AP);
- assertTrue(
+ assertNotNull(
"Cannot find any test APs which support RTT / IEEE 802.11mc - please verify that "
- + "your test setup includes them!",
- testAp != null);
+ + "your test setup includes them!", testAp);
// Perform RTT operations
RangingRequest request = new RangingRequest.Builder().addAccessPoint(testAp).build();