commit 356139091d40f29eb2dae9846092d95abda3b559
author Lorenzo Colitti <lorenzo@google.com> Fri Apr 06 22:40:37 2018 +0900
committer Lorenzo Colitti <lorenzo@google.com> Fri Apr 06 22:44:19 2018 +0900
tree 80ca5489f3519d96804a56addbea9ee72ff5ec88
parent 4997cbc5ae39d40b67832e48fe95dde4640ae8aa

Revert "Add cts to test unwanted capabilities api"

This reverts commit bf6a2ad00c25114bf07d12480d72e97cb115f06e.

Bug: 77601789
Test: atest android.net.cts.NetworkRequestTest
Change-Id: Ib3db82e889ed4ca050a837b1169a9da8e17bb424

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 2a5ef31..c862c77 100644
--- a/tests/cts/net/src/android/net/cts/NetworkRequestTest.java
+++ b/tests/cts/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));