commit 02ac7a51c7af65fc1c9562b404c5e852365cd9f6
author Lorenzo Colitti <lorenzo@google.com> Sat Apr 07 02:41:40 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 07 02:41:40 2018 +0000
tree 0fea1e7e51911469979c434791bdb117b3865639
parent 9d1a50589e41a6efbeba79d14f43fc3a40bea803
parent 7ac93cd7f402475654367c47119f34b08de40b02

Merge "Revert "Add cts to test unwanted capabilities api"" into pi-dev

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

diff --git a/tests/tests/net/src/android/net/cts/NetworkRequestTest.java b/tests/tests/net/src/android/net/cts/NetworkRequestTest.java
index 2a5ef31..c862c77 100644
--- a/tests/tests/net/src/android/net/cts/NetworkRequestTest.java
+++ b/tests/tests/net/src/android/net/cts/NetworkRequestTest.java
@@ -30,35 +30,6 @@
                 .hasCapability(NET_CAPABILITY_MMS));
     }
 
-    public void testUnwantedCapabilities() {
-        assertTrue(new NetworkRequest.Builder()
-                .addUnwantedCapability(NET_CAPABILITY_MMS)
-                .build()
-                .hasUnwantedCapability(NET_CAPABILITY_MMS));
-        assertFalse(new NetworkRequest.Builder()
-                .removeCapability(NET_CAPABILITY_MMS)
-                .build()
-                .hasCapability(NET_CAPABILITY_MMS));
-    }
-
-    public void testCapabilityMutualExclusivity() {
-        NetworkRequest.Builder reqBuilder = new NetworkRequest.Builder()
-                .addCapability(NET_CAPABILITY_MMS);
-
-        assertTrue(reqBuilder.build().hasCapability(NET_CAPABILITY_MMS));
-        assertFalse(reqBuilder.build().hasUnwantedCapability(NET_CAPABILITY_MMS));
-
-        // Move capability to unwanted list
-        reqBuilder.addUnwantedCapability(NET_CAPABILITY_MMS);
-        assertFalse(reqBuilder.build().hasCapability(NET_CAPABILITY_MMS));
-        assertTrue(reqBuilder.build().hasUnwantedCapability(NET_CAPABILITY_MMS));
-
-        // Move it back to the list of capabilities
-        reqBuilder.addCapability(NET_CAPABILITY_MMS);
-        assertTrue(reqBuilder.build().hasCapability(NET_CAPABILITY_MMS));
-        assertFalse(reqBuilder.build().hasUnwantedCapability(NET_CAPABILITY_MMS));
-    }
-
     public void testTransports() {
         assertTrue(new NetworkRequest.Builder().addTransportType(TRANSPORT_BLUETOOTH).build()
                 .hasTransport(TRANSPORT_BLUETOOTH));