commit d40f746ea062bf38ef377e1b7406b7b60ec9c4bc
author Chiachang Wang <chiachangwang@google.com> Tue May 12 05:36:50 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 12 05:36:50 2020 +0000
tree 5818340d5697989a283e884d473f98985c5db8e7
parent c23b2ac096c0874ba651a0f380b9a4e11556ce13
parent 8ddd0227a9e7d3f382b9a944fdeb90d58bcf5109

Merge "Move testInvariantInCanBeSatisfiedBy to be its own test"

tests/cts/net/src/android/net/cts/NetworkRequestTest.java

diff --git a/tests/cts/net/src/android/net/cts/NetworkRequestTest.java b/tests/cts/net/src/android/net/cts/NetworkRequestTest.java
index 5dfcffb..f32ee9e 100644
--- a/tests/cts/net/src/android/net/cts/NetworkRequestTest.java
+++ b/tests/cts/net/src/android/net/cts/NetworkRequestTest.java
@@ -190,11 +190,11 @@
         assertTrue(requestCellularInternet.canBeSatisfiedBy(capCellularMmsInternetSpecifier2));
         assertFalse(requestCellularInternet.canBeSatisfiedBy(capVpnInternetSpecifier1));
         assertTrue(requestCellularInternet.canBeSatisfiedBy(capCellularVpnMmsInternet));
-
-        testInvariantInCanBeSatisfiedBy();
     }
 
-    private void testInvariantInCanBeSatisfiedBy() {
+    @Test
+    @IgnoreUpTo(Build.VERSION_CODES.Q)
+    public void testInvariantInCanBeSatisfiedBy() {
         // Test invariant that result of NetworkRequest.canBeSatisfiedBy() should be the same with
         // NetworkCapabilities.satisfiedByNetworkCapabilities().
         final LocalNetworkSpecifier specifier1 = new LocalNetworkSpecifier(1234 /* id */);