diff options
Diffstat (limited to 'wifi/tests/src')
3 files changed, 30 insertions, 30 deletions
diff --git a/wifi/tests/src/android/net/wifi/WifiNetworkAgentSpecifierTest.java b/wifi/tests/src/android/net/wifi/WifiNetworkAgentSpecifierTest.java index 0233ee2e2785..d479aacdd296 100644 --- a/wifi/tests/src/android/net/wifi/WifiNetworkAgentSpecifierTest.java +++ b/wifi/tests/src/android/net/wifi/WifiNetworkAgentSpecifierTest.java @@ -155,8 +155,8 @@ public class WifiNetworkAgentSpecifierTest { public void testWifiNetworkAgentSpecifierSatisifiesNullAndAllMatch() { WifiNetworkAgentSpecifier specifier = createDefaultNetworkAgentSpecifier(); - assertTrue(specifier.satisfiedBy(null)); - assertTrue(specifier.satisfiedBy(new MatchAllNetworkSpecifier())); + assertTrue(specifier.canBeSatisfiedBy(null)); + assertTrue(specifier.canBeSatisfiedBy(new MatchAllNetworkSpecifier())); } /** @@ -170,7 +170,7 @@ public class WifiNetworkAgentSpecifierTest { WifiNetworkAgentSpecifier specifier1 = createDefaultNetworkAgentSpecifier(); WifiNetworkAgentSpecifier specifier2 = createDefaultNetworkAgentSpecifier(); - assertTrue(specifier2.satisfiedBy(specifier1)); + assertTrue(specifier2.canBeSatisfiedBy(specifier1)); } /** @@ -196,8 +196,8 @@ public class WifiNetworkAgentSpecifierTest { bssidPattern, wificonfigurationNetworkSpecifier); - assertTrue(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier)); - assertTrue(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier)); + assertTrue(wifiNetworkSpecifier.canBeSatisfiedBy(wifiNetworkAgentSpecifier)); + assertTrue(wifiNetworkAgentSpecifier.canBeSatisfiedBy(wifiNetworkSpecifier)); } /** @@ -224,8 +224,8 @@ public class WifiNetworkAgentSpecifierTest { bssidPattern, wificonfigurationNetworkSpecifier); - assertTrue(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier)); - assertTrue(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier)); + assertTrue(wifiNetworkSpecifier.canBeSatisfiedBy(wifiNetworkAgentSpecifier)); + assertTrue(wifiNetworkAgentSpecifier.canBeSatisfiedBy(wifiNetworkSpecifier)); } /** @@ -252,8 +252,8 @@ public class WifiNetworkAgentSpecifierTest { bssidPattern, wificonfigurationNetworkSpecifier); - assertTrue(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier)); - assertTrue(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier)); + assertTrue(wifiNetworkSpecifier.canBeSatisfiedBy(wifiNetworkAgentSpecifier)); + assertTrue(wifiNetworkAgentSpecifier.canBeSatisfiedBy(wifiNetworkSpecifier)); } /** @@ -283,8 +283,8 @@ public class WifiNetworkAgentSpecifierTest { bssidPattern, wificonfigurationNetworkSpecifier); - assertFalse(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier)); - assertFalse(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier)); + assertFalse(wifiNetworkSpecifier.canBeSatisfiedBy(wifiNetworkAgentSpecifier)); + assertFalse(wifiNetworkAgentSpecifier.canBeSatisfiedBy(wifiNetworkSpecifier)); } /** @@ -315,8 +315,8 @@ public class WifiNetworkAgentSpecifierTest { bssidPattern, wificonfigurationNetworkSpecifier); - assertFalse(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier)); - assertFalse(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier)); + assertFalse(wifiNetworkSpecifier.canBeSatisfiedBy(wifiNetworkAgentSpecifier)); + assertFalse(wifiNetworkAgentSpecifier.canBeSatisfiedBy(wifiNetworkSpecifier)); } /** @@ -347,8 +347,8 @@ public class WifiNetworkAgentSpecifierTest { bssidPattern, wificonfigurationNetworkSpecifier); - assertFalse(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier)); - assertFalse(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier)); + assertFalse(wifiNetworkSpecifier.canBeSatisfiedBy(wifiNetworkAgentSpecifier)); + assertFalse(wifiNetworkAgentSpecifier.canBeSatisfiedBy(wifiNetworkSpecifier)); } /** @@ -374,8 +374,8 @@ public class WifiNetworkAgentSpecifierTest { bssidPattern, wificonfigurationNetworkSpecifier); - assertFalse(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier)); - assertFalse(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier)); + assertFalse(wifiNetworkSpecifier.canBeSatisfiedBy(wifiNetworkAgentSpecifier)); + assertFalse(wifiNetworkAgentSpecifier.canBeSatisfiedBy(wifiNetworkSpecifier)); } diff --git a/wifi/tests/src/android/net/wifi/WifiNetworkSpecifierTest.java b/wifi/tests/src/android/net/wifi/WifiNetworkSpecifierTest.java index 3b6723613c50..53a7d032da42 100644 --- a/wifi/tests/src/android/net/wifi/WifiNetworkSpecifierTest.java +++ b/wifi/tests/src/android/net/wifi/WifiNetworkSpecifierTest.java @@ -396,8 +396,8 @@ public class WifiNetworkSpecifierTest { MacAddress.fromString(TEST_BSSID_OUI_MASK)), wifiConfiguration); - assertTrue(specifier.satisfiedBy(null)); - assertTrue(specifier.satisfiedBy(new MatchAllNetworkSpecifier())); + assertTrue(specifier.canBeSatisfiedBy(null)); + assertTrue(specifier.canBeSatisfiedBy(new MatchAllNetworkSpecifier())); } /** @@ -424,7 +424,7 @@ public class WifiNetworkSpecifierTest { MacAddress.fromString(TEST_BSSID_OUI_MASK)), wifiConfiguration); - assertTrue(specifier2.satisfiedBy(specifier1)); + assertTrue(specifier2.canBeSatisfiedBy(specifier1)); } /** @@ -453,7 +453,7 @@ public class WifiNetworkSpecifierTest { MacAddress.fromString(TEST_BSSID_OUI_MASK)), wifiConfiguration2); - assertFalse(specifier2.satisfiedBy(specifier1)); + assertFalse(specifier2.canBeSatisfiedBy(specifier1)); } /** @@ -480,7 +480,7 @@ public class WifiNetworkSpecifierTest { MacAddress.fromString(TEST_BSSID_OUI_MASK)), wifiConfiguration); - assertFalse(specifier2.satisfiedBy(specifier1)); + assertFalse(specifier2.canBeSatisfiedBy(specifier1)); } /** @@ -507,6 +507,6 @@ public class WifiNetworkSpecifierTest { WifiManager.ALL_ZEROS_MAC_ADDRESS), wifiConfiguration); - assertFalse(specifier2.satisfiedBy(specifier1)); + assertFalse(specifier2.canBeSatisfiedBy(specifier1)); } } diff --git a/wifi/tests/src/android/net/wifi/aware/WifiAwareAgentNetworkSpecifierTest.java b/wifi/tests/src/android/net/wifi/aware/WifiAwareAgentNetworkSpecifierTest.java index 81b02fa5f801..f2961db4eb14 100644 --- a/wifi/tests/src/android/net/wifi/aware/WifiAwareAgentNetworkSpecifierTest.java +++ b/wifi/tests/src/android/net/wifi/aware/WifiAwareAgentNetworkSpecifierTest.java @@ -79,7 +79,7 @@ public class WifiAwareAgentNetworkSpecifierTest { public void testEmptyDoesntMatchAnything() { WifiAwareAgentNetworkSpecifier dut = new WifiAwareAgentNetworkSpecifier(); WifiAwareNetworkSpecifier ns = getDummyNetworkSpecifier(6); - collector.checkThat("No match expected", ns.satisfiedBy(dut), equalTo(false)); + collector.checkThat("No match expected", ns.canBeSatisfiedBy(dut), equalTo(false)); } /** @@ -91,8 +91,8 @@ public class WifiAwareAgentNetworkSpecifierTest { WifiAwareNetworkSpecifier nsThis = getDummyNetworkSpecifier(6); WifiAwareAgentNetworkSpecifier dut = new WifiAwareAgentNetworkSpecifier(nsThis); WifiAwareNetworkSpecifier nsOther = getDummyNetworkSpecifier(8); - collector.checkThat("Match expected", nsThis.satisfiedBy(dut), equalTo(true)); - collector.checkThat("No match expected", nsOther.satisfiedBy(dut), equalTo(false)); + collector.checkThat("Match expected", nsThis.canBeSatisfiedBy(dut), equalTo(true)); + collector.checkThat("No match expected", nsOther.canBeSatisfiedBy(dut), equalTo(false)); } /** @@ -113,9 +113,9 @@ public class WifiAwareAgentNetworkSpecifierTest { WifiAwareNetworkSpecifier nsOther = getDummyNetworkSpecifier(10000); for (WifiAwareNetworkSpecifier nsThis: nsSet) { - collector.checkThat("Match expected", nsThis.satisfiedBy(dut), equalTo(true)); + collector.checkThat("Match expected", nsThis.canBeSatisfiedBy(dut), equalTo(true)); } - collector.checkThat("No match expected", nsOther.satisfiedBy(dut), equalTo(false)); + collector.checkThat("No match expected", nsOther.canBeSatisfiedBy(dut), equalTo(false)); } /** @@ -137,7 +137,7 @@ public class WifiAwareAgentNetworkSpecifierTest { WifiAwareAgentNetworkSpecifier newNs = new WifiAwareAgentNetworkSpecifier( nsSet.toArray(new WifiAwareNetworkSpecifier[nsSet.size()])); - collector.checkThat("Match expected", oldNs.satisfiedBy(newNs), equalTo(true)); + collector.checkThat("Match expected", oldNs.canBeSatisfiedBy(newNs), equalTo(true)); } /** @@ -159,7 +159,7 @@ public class WifiAwareAgentNetworkSpecifierTest { WifiAwareAgentNetworkSpecifier oldNs = new WifiAwareAgentNetworkSpecifier( nsSet.toArray(new WifiAwareNetworkSpecifier[nsSet.size()])); - collector.checkThat("Match unexpected", oldNs.satisfiedBy(newNs), equalTo(false)); + collector.checkThat("Match unexpected", oldNs.canBeSatisfiedBy(newNs), equalTo(false)); } // utilities |