diff options
Diffstat (limited to 'tests')
4 files changed, 16 insertions, 15 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/NetworkRequestStoreDataTest.java b/tests/wifitests/src/com/android/server/wifi/NetworkRequestStoreDataTest.java index 2f4a85657..7f7c770f2 100644 --- a/tests/wifitests/src/com/android/server/wifi/NetworkRequestStoreDataTest.java +++ b/tests/wifitests/src/com/android/server/wifi/NetworkRequestStoreDataTest.java @@ -19,7 +19,7 @@ package com.android.server.wifi; import static org.junit.Assert.*; import static org.mockito.Mockito.*; -import android.net.MacAddress; +import android.net.util.MacAddressUtils; import android.net.wifi.WifiConfiguration; import android.util.Xml; @@ -116,7 +116,7 @@ public class NetworkRequestStoreDataTest extends WifiBaseTest { AccessPoint accessPoint = new AccessPoint( WifiConfigurationTestUtil.createPskNetwork().SSID, - MacAddress.createRandomUnicastAddress(), WifiConfiguration.SECURITY_TYPE_PSK); + MacAddressUtils.createRandomUnicastAddress(), WifiConfiguration.SECURITY_TYPE_PSK); Set<AccessPoint> accessPoints = new HashSet<AccessPoint>() {{ add(accessPoint); }}; @@ -134,7 +134,7 @@ public class NetworkRequestStoreDataTest extends WifiBaseTest { AccessPoint accessPoint1 = new AccessPoint( WifiConfigurationTestUtil.createPskNetwork().SSID, - MacAddress.createRandomUnicastAddress(), WifiConfiguration.SECURITY_TYPE_PSK); + MacAddressUtils.createRandomUnicastAddress(), WifiConfiguration.SECURITY_TYPE_PSK); Set<AccessPoint> accessPoints1 = new HashSet<AccessPoint>() {{ add(accessPoint1); }}; @@ -142,7 +142,7 @@ public class NetworkRequestStoreDataTest extends WifiBaseTest { AccessPoint accessPoint2 = new AccessPoint( WifiConfigurationTestUtil.createPskNetwork().SSID, - MacAddress.createRandomUnicastAddress(), WifiConfiguration.SECURITY_TYPE_PSK); + MacAddressUtils.createRandomUnicastAddress(), WifiConfiguration.SECURITY_TYPE_PSK); Set<AccessPoint> accessPoints2 = new HashSet<AccessPoint>() {{ add(accessPoint2); }}; @@ -160,10 +160,10 @@ public class NetworkRequestStoreDataTest extends WifiBaseTest { AccessPoint accessPoint1 = new AccessPoint( WifiConfigurationTestUtil.createPskNetwork().SSID, - MacAddress.createRandomUnicastAddress(), WifiConfiguration.SECURITY_TYPE_PSK); + MacAddressUtils.createRandomUnicastAddress(), WifiConfiguration.SECURITY_TYPE_PSK); AccessPoint accessPoint2 = new AccessPoint( WifiConfigurationTestUtil.createOpenNetwork().SSID, - MacAddress.createRandomUnicastAddress(), WifiConfiguration.SECURITY_TYPE_OPEN); + MacAddressUtils.createRandomUnicastAddress(), WifiConfiguration.SECURITY_TYPE_OPEN); Set<AccessPoint> accessPoints1 = new HashSet<AccessPoint>() {{ add(accessPoint1); add(accessPoint2); @@ -172,10 +172,10 @@ public class NetworkRequestStoreDataTest extends WifiBaseTest { AccessPoint accessPoint3 = new AccessPoint( WifiConfigurationTestUtil.createSaeNetwork().SSID, - MacAddress.createRandomUnicastAddress(), WifiConfiguration.SECURITY_TYPE_SAE); + MacAddressUtils.createRandomUnicastAddress(), WifiConfiguration.SECURITY_TYPE_SAE); AccessPoint accessPoint4 = new AccessPoint( WifiConfigurationTestUtil.createOpenNetwork().SSID, - MacAddress.createRandomUnicastAddress(), WifiConfiguration.SECURITY_TYPE_OPEN); + MacAddressUtils.createRandomUnicastAddress(), WifiConfiguration.SECURITY_TYPE_OPEN); Set<AccessPoint> accessPoints2 = new HashSet<AccessPoint>() {{ add(accessPoint3); add(accessPoint4); diff --git a/tests/wifitests/src/com/android/server/wifi/WifiCandidatesTest.java b/tests/wifitests/src/com/android/server/wifi/WifiCandidatesTest.java index 336bdbe24..a0f795233 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiCandidatesTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiCandidatesTest.java @@ -22,6 +22,7 @@ import static org.junit.Assert.*; import static org.mockito.Mockito.*; import android.net.MacAddress; +import android.net.util.MacAddressUtils; import android.net.wifi.ScanResult; import android.net.wifi.WifiConfiguration; @@ -136,8 +137,8 @@ public class WifiCandidatesTest extends WifiBaseTest { ScanResultMatchInfo matchInfo1Prime = ScanResultMatchInfo.fromWifiConfiguration(mConfig1); ScanResultMatchInfo matchInfo2 = ScanResultMatchInfo.fromWifiConfiguration(mConfig2); assertFalse(matchInfo1 == matchInfo1Prime); // Checking assumption - MacAddress mac1 = MacAddress.createRandomUnicastAddress(); - MacAddress mac2 = MacAddress.createRandomUnicastAddress(); + MacAddress mac1 = MacAddressUtils.createRandomUnicastAddress(); + MacAddress mac2 = MacAddressUtils.createRandomUnicastAddress(); assertNotEquals(mac1, mac2); // really tiny probability of failing here WifiCandidates.Key key1 = new WifiCandidates.Key(matchInfo1, mac1, 1); diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSuggestionsManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSuggestionsManagerTest.java index 83e7c686f..257304775 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSuggestionsManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSuggestionsManagerTest.java @@ -43,7 +43,7 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.res.Resources; -import android.net.MacAddress; +import android.net.util.MacAddressUtils; import android.net.wifi.ISuggestionConnectionStatusListener; import android.net.wifi.ScanResult; import android.net.wifi.WifiConfiguration; @@ -778,7 +778,7 @@ public class WifiNetworkSuggestionsManagerTest extends WifiBaseTest { // Now change the bssid of the scan result to a different value, now only the general // (without bssid) suggestion. - scanDetail.getScanResult().BSSID = MacAddress.createRandomUnicastAddress().toString(); + scanDetail.getScanResult().BSSID = MacAddressUtils.createRandomUnicastAddress().toString(); matchingExtNetworkSuggestions = mWifiNetworkSuggestionsManager.getNetworkSuggestionsForScanDetail(scanDetail); expectedMatchingNetworkSuggestions = @@ -2385,7 +2385,7 @@ public class WifiNetworkSuggestionsManagerTest extends WifiBaseTest { */ private ScanDetail createScanDetailForNetwork(WifiConfiguration configuration) { return WifiConfigurationTestUtil.createScanDetailForNetwork(configuration, - MacAddress.createRandomUnicastAddress().toString(), -45, 0, 0, 0); + MacAddressUtils.createRandomUnicastAddress().toString(), -45, 0, 0, 0); } private void validatePostConnectionBroadcastSent( diff --git a/tests/wifitests/src/com/android/server/wifi/util/XmlUtilTest.java b/tests/wifitests/src/com/android/server/wifi/util/XmlUtilTest.java index 36f8b6f76..58991c5e4 100644 --- a/tests/wifitests/src/com/android/server/wifi/util/XmlUtilTest.java +++ b/tests/wifitests/src/com/android/server/wifi/util/XmlUtilTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.*; import static org.mockito.Mockito.*; import android.net.IpConfiguration; -import android.net.MacAddress; +import android.net.util.MacAddressUtils; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration.NetworkSelectionStatus; import android.net.wifi.WifiEnterpriseConfig; @@ -234,7 +234,7 @@ public class XmlUtilTest extends WifiBaseTest { configuration.lastUpdateUid = configuration.lastConnectUid = configuration.creatorUid; configuration.creatorName = configuration.lastUpdateName = TEST_PACKAGE_NAME; configuration.creationTime = "04-04-2016"; - configuration.setRandomizedMacAddress(MacAddress.createRandomUnicastAddress()); + configuration.setRandomizedMacAddress(MacAddressUtils.createRandomUnicastAddress()); configuration.macRandomizationSetting = WifiConfiguration.RANDOMIZATION_PERSISTENT; serializeDeserializeWifiConfigurationForConfigStore(configuration); |