From 356139091d40f29eb2dae9846092d95abda3b559 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Fri, 6 Apr 2018 22:40:37 +0900 Subject: [PATCH] Revert "Add cts to test unwanted capabilities api" This reverts commit bf6a2ad00c25114bf07d12480d72e97cb115f06e. Bug: 77601789 Test: atest android.net.cts.NetworkRequestTest Change-Id: Ib3db82e889ed4ca050a837b1169a9da8e17bb424 --- .../android/net/cts/NetworkRequestTest.java | 29 ------------------- 1 file changed, 29 deletions(-) diff --git a/tests/cts/net/src/android/net/cts/NetworkRequestTest.java b/tests/cts/net/src/android/net/cts/NetworkRequestTest.java index 2a5ef31847..c862c77bc7 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 @@ public class NetworkRequestTest extends AndroidTestCase { .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));