Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)

Bug: 166295507
Merged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27
Change-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2
This commit is contained in:
Xin Li
2020-08-31 21:21:38 -07:00
8 changed files with 49 additions and 10 deletions

View File

@@ -19,7 +19,10 @@ package android.net;
import static com.android.testutils.ParcelUtils.assertParcelSane;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import android.net.wifi.WifiNetworkSpecifier;
import android.telephony.SubscriptionManager;
import androidx.test.filters.SmallTest;
@@ -32,6 +35,7 @@ import org.junit.Test;
@SmallTest
public class TelephonyNetworkSpecifierTest {
private static final int TEST_SUBID = 5;
private static final String TEST_SSID = "Test123";
/**
* Validate that IllegalArgumentException will be thrown if build TelephonyNetworkSpecifier
@@ -79,4 +83,31 @@ public class TelephonyNetworkSpecifierTest {
.build();
assertParcelSane(specifier, 1 /* fieldCount */);
}
/**
* Validate the behavior of method canBeSatisfiedBy().
*/
@Test
public void testCanBeSatisfiedBy() {
final TelephonyNetworkSpecifier tns1 = new TelephonyNetworkSpecifier.Builder()
.setSubscriptionId(TEST_SUBID)
.build();
final TelephonyNetworkSpecifier tns2 = new TelephonyNetworkSpecifier.Builder()
.setSubscriptionId(TEST_SUBID)
.build();
final WifiNetworkSpecifier wns = new WifiNetworkSpecifier.Builder()
.setSsid(TEST_SSID)
.build();
final MatchAllNetworkSpecifier mans = new MatchAllNetworkSpecifier();
// Test equality
assertEquals(tns1, tns2);
assertTrue(tns1.canBeSatisfiedBy(tns1));
assertTrue(tns1.canBeSatisfiedBy(tns2));
// Test other edge cases.
assertFalse(tns1.canBeSatisfiedBy(null));
assertFalse(tns1.canBeSatisfiedBy(wns));
assertTrue(tns1.canBeSatisfiedBy(mans));
}
}