From 53e5c05d838e6a5431c4e8edbab6556726f07351 Mon Sep 17 00:00:00 2001 From: Erik Kline Date: Wed, 5 Jul 2017 19:55:45 +0900 Subject: [PATCH] DO NOT MERGE ANYWHERE This reverts a duplicate test method resulting from a bad merge. Test: as follows - built Change-Id: I8ca7c97a28fbf7d20753bb4d1f942e5c04a4edf8 --- .../android/server/connectivity/TetheringTest.java | 26 ---------------------- 1 file changed, 26 deletions(-) diff --git a/tests/net/java/com/android/server/connectivity/TetheringTest.java b/tests/net/java/com/android/server/connectivity/TetheringTest.java index 8b1a0721dcf1..a21422394ab1 100644 --- a/tests/net/java/com/android/server/connectivity/TetheringTest.java +++ b/tests/net/java/com/android/server/connectivity/TetheringTest.java @@ -327,32 +327,6 @@ public class TetheringTest { } @Test - public void testUsbConfiguredBroadcastStartsTethering() throws Exception { - when(mConnectivityManager.isTetheringSupported()).thenReturn(true); - - // Emulate pressing the USB tethering button in Settings UI. - mTethering.startTethering(TETHERING_USB, null, false); - mLooper.dispatchAll(); - verify(mUsbManager, times(1)).setCurrentFunction(UsbManager.USB_FUNCTION_RNDIS, false); - - // Pretend we receive a USB connected broadcast. Here we also pretend - // that the RNDIS function is somehow enabled, so that we see if we - // might trip ourselves up. - sendUsbBroadcast(true, false, true); - mLooper.dispatchAll(); - // This should produce no activity of any kind. - verifyNoMoreInteractions(mConnectivityManager); - verifyNoMoreInteractions(mNMService); - - // Pretend we then receive USB configured broadcast. - sendUsbBroadcast(true, true, true); - mLooper.dispatchAll(); - // Now we should see the start of tethering mechanics (in this case: - // tetherMatchingInterfaces() which starts by fetching all interfaces). - verify(mNMService, times(1)).listInterfaces(); - } - - @Test public void failingLocalOnlyHotspotLegacyApBroadcastWithIfaceStatusChanged() throws Exception { failingLocalOnlyHotspotLegacyApBroadcast(true); } -- 2.11.0