commit b5cd542daad1ac7d9f739f8130357823630e2092
author David Su <dysu@google.com> Fri Jan 10 18:05:06 2020 -0800
committer David Su <dysu@google.com> Mon Jan 13 11:05:00 2020 -0800
tree 672eb8e262c57f0e35a9931308a54251ef07082d
parent 47a4a384c41776ef6c3904e14bcc86cf55057c42

Fix CTS usages of @hide WifiSsid

Migrate to WifiInfo.getSSID() and ScanResult.SSID.

Bug: 144036594
Test: atest android.net.wifi.cts.ScanResultTest
Change-Id: I402978d9455b0ce9e7dbcdb90836f7b0efa0fdc5

tests/cts/net/src/android/net/wifi/cts/ScanResultTest.java

diff --git a/tests/cts/net/src/android/net/wifi/cts/ScanResultTest.java b/tests/cts/net/src/android/net/wifi/cts/ScanResultTest.java
index 9bd1226..3347cb6 100644
--- a/tests/cts/net/src/android/net/wifi/cts/ScanResultTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/ScanResultTest.java
@@ -227,7 +227,14 @@
         }
         assertNotNull("Current network not found in scan results", currentNetwork);
 
-        assertEquals(wifiInfo.getWifiSsid(), currentNetwork.wifiSsid);
+        String wifiInfoSsidQuoted = wifiInfo.getSSID();
+        String scanResultSsidUnquoted = currentNetwork.SSID;
+
+        assertEquals(
+                "SSID mismatch: make sure this isn't a hidden network or an SSID containing "
+                        + "non-UTF-8 characters - neither is supported by this CTS test.",
+                wifiInfoSsidQuoted,
+                "\"" + scanResultSsidUnquoted + "\"");
         assertEquals(wifiInfo.getFrequency(), currentNetwork.frequency);
     }
 }