Merge changes I56f77577,If19b8708 into rvc-dev
* changes:
Add test for WifiAwareNetworkSpecifier and ParcelablePeerHandle
Add test for aware rtt
diff --git a/tests/cts/net/src/android/net/wifi/aware/cts/SingleDeviceTest.java b/tests/cts/net/src/android/net/wifi/aware/cts/SingleDeviceTest.java
index 29f091b..8f23324 100644
--- a/tests/cts/net/src/android/net/wifi/aware/cts/SingleDeviceTest.java
+++ b/tests/cts/net/src/android/net/wifi/aware/cts/SingleDeviceTest.java
@@ -16,7 +16,9 @@
package android.net.wifi.aware.cts;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
+import static org.mockito.Mockito.mock;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -30,17 +32,21 @@
import android.net.wifi.WifiManager;
import android.net.wifi.aware.AttachCallback;
import android.net.wifi.aware.Characteristics;
+import android.net.wifi.aware.DiscoverySession;
import android.net.wifi.aware.DiscoverySessionCallback;
import android.net.wifi.aware.IdentityChangedListener;
+import android.net.wifi.aware.ParcelablePeerHandle;
import android.net.wifi.aware.PeerHandle;
import android.net.wifi.aware.PublishConfig;
import android.net.wifi.aware.PublishDiscoverySession;
import android.net.wifi.aware.SubscribeConfig;
import android.net.wifi.aware.SubscribeDiscoverySession;
import android.net.wifi.aware.WifiAwareManager;
+import android.net.wifi.aware.WifiAwareNetworkSpecifier;
import android.net.wifi.aware.WifiAwareSession;
import android.os.Handler;
import android.os.HandlerThread;
+import android.os.Parcel;
import android.platform.test.annotations.AppModeFull;
import android.test.AndroidTestCase;
@@ -812,6 +818,43 @@
session.close();
}
+ /**
+ * Test WifiAwareNetworkSpecifier.
+ */
+ public void testWifiAwareNetworkSpecifier() {
+ DiscoverySession session = mock(DiscoverySession.class);
+ PeerHandle handle = mock(PeerHandle.class);
+ WifiAwareNetworkSpecifier networkSpecifier =
+ new WifiAwareNetworkSpecifier.Builder(session, handle).build();
+ assertFalse(networkSpecifier.satisfiedBy(null));
+ assertTrue(networkSpecifier.satisfiedBy(networkSpecifier));
+
+ WifiAwareNetworkSpecifier anotherNetworkSpecifier =
+ new WifiAwareNetworkSpecifier.Builder(session, handle).setPmk(PMK_VALID).build();
+ assertFalse(networkSpecifier.satisfiedBy(anotherNetworkSpecifier));
+ }
+
+ /**
+ * Test ParcelablePeerHandle parcel.
+ */
+ public void testParcelablePeerHandle() {
+ PeerHandle peerHandle = mock(PeerHandle.class);
+ ParcelablePeerHandle parcelablePeerHandle = new ParcelablePeerHandle(peerHandle);
+ Parcel parcelW = Parcel.obtain();
+ parcelablePeerHandle.writeToParcel(parcelW, 0);
+ byte[] bytes = parcelW.marshall();
+ parcelW.recycle();
+
+ Parcel parcelR = Parcel.obtain();
+ parcelR.unmarshall(bytes, 0, bytes.length);
+ parcelR.setDataPosition(0);
+ ParcelablePeerHandle rereadParcelablePeerHandle =
+ ParcelablePeerHandle.CREATOR.createFromParcel(parcelR);
+
+ assertEquals(parcelablePeerHandle, rereadParcelablePeerHandle);
+ assertEquals(parcelablePeerHandle.hashCode(), rereadParcelablePeerHandle.hashCode());
+ }
+
// local utilities
private WifiAwareSession attachAndGetSession() {
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 25a90b5..49aa47e 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
@@ -18,7 +18,9 @@
import static org.mockito.Mockito.mock;
+import android.net.MacAddress;
import android.net.wifi.ScanResult;
+import android.net.wifi.aware.PeerHandle;
import android.net.wifi.rtt.RangingRequest;
import android.net.wifi.rtt.RangingResult;
import android.net.wifi.rtt.ResponderLocation;
@@ -52,6 +54,9 @@
// Minimum valid RSSI value
private static final int MIN_VALID_RSSI = -100;
+ // Valid Mac Address
+ private static final MacAddress MAC = MacAddress.fromString("00:01:02:03:04:05");
+
/**
* Test Wi-Fi RTT ranging operation:
* - Scan for visible APs for the test AP (which is validated to support IEEE 802.11mc)
@@ -368,4 +373,36 @@
assertNotNull("ColocatedBSSID list should be nonNull",
responderLocation.getColocatedBssids());
}
+
+ /**
+ * Verify ranging request with aware peer Mac address and peer handle.
+ */
+ public void testAwareRttWithMacAddress() throws InterruptedException {
+ RangingRequest request = new RangingRequest.Builder()
+ .addWifiAwarePeer(MAC).build();
+ ResultCallback callback = new ResultCallback();
+ mWifiRttManager.startRanging(request, mExecutor, callback);
+ assertTrue("Wi-Fi RTT results: no callback",
+ callback.waitForCallback());
+ List<RangingResult> rangingResults = callback.getResults();
+ assertNotNull("Wi-Fi RTT results: null results", rangingResults);
+ assertEquals(1, rangingResults.size());
+ assertEquals(RangingResult.STATUS_FAIL, rangingResults.get(0).getStatus());
+ }
+
+ /**
+ * Verify ranging request with aware peer handle.
+ */
+ public void testAwareRttWithPeerHandle() throws InterruptedException {
+ PeerHandle peerHandle = mock(PeerHandle.class);
+ RangingRequest request = new RangingRequest.Builder()
+ .addWifiAwarePeer(peerHandle).build();
+ ResultCallback callback = new ResultCallback();
+ mWifiRttManager.startRanging(request, mExecutor, callback);
+ assertTrue("Wi-Fi RTT results: no callback",
+ callback.waitForCallback());
+ List<RangingResult> rangingResults = callback.getResults();
+ assertNotNull("Wi-Fi RTT results: null results", rangingResults);
+ assertEquals("Invalid peerHandle should return 0 result", 0, rangingResults.size());
+ }
}