disable failing tests

Disable failing unit tests, except for the ones where
a) we already have fixes up for review, or
b) the test was failing before the Mockito update

The tests are disabled via a new annotation, so that
we can more easily track progress on updating the
tests to work with the new version of Mockito.

Bug: 36407367
Test: runtests.sh -e notClass com.android.server.wifi.WifiVendorHalTest,com.android.server.wifi.hotspot2.PasspointManagerTest,com.android.server.wifi.WifiConfigManagerTest,com.android.server.wifi.p2p.SupplicantP2pIfaceHalTest#testCancelServiceDiscovery_exception

Change-Id: Idca42fe735821a29a6dc0ca975bf5d39909ec508

8 files changed, 65 insertions, 1 deletions

diff --git a/tests/wifitests/runtests.sh b/tests/wifitests/runtests.sh
index cd1b84483..529a535e6 100755
--- a/tests/wifitests/runtests.sh
+++ b/tests/wifitests/runtests.sh
@@ -40,4 +40,6 @@ adb wait-for-device
 
 adb install -r -g "$OUT/data/app/FrameworksWifiTests/FrameworksWifiTests.apk"
 
-adb shell am instrument -w "$@" 'com.android.server.wifi.test/android.support.test.runner.AndroidJUnitRunner'
+adb shell am instrument -w "$@" \
+  -e notAnnotation com.android.server.wifi.DisabledForUpdateToAnyMatcher \
+  'com.android.server.wifi.test/android.support.test.runner.AndroidJUnitRunner'
diff --git a/tests/wifitests/src/com/android/server/wifi/DisabledForUpdateToAnyMatcher.java b/tests/wifitests/src/com/android/server/wifi/DisabledForUpdateToAnyMatcher.java
new file mode 100644
index 000000000..6f1df4784
--- /dev/null
+++ b/tests/wifitests/src/com/android/server/wifi/DisabledForUpdateToAnyMatcher.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.wifi;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface DisabledForUpdateToAnyMatcher {
+}
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateMachinePrimeTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateMachinePrimeTest.java
index 879862bf9..398be0cf0 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiStateMachinePrimeTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiStateMachinePrimeTest.java
@@ -143,6 +143,7 @@ public class WifiStateMachinePrimeTest {
      * Test that WifiStateMachinePrime properly enters the SoftApModeActiveState from the
      * WifiDisabled state.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testEnterSoftApModeFromDisabled() throws Exception {
         enterSoftApActiveMode();
@@ -153,6 +154,7 @@ public class WifiStateMachinePrimeTest {
      * Expectations: When going from one state to another, any interfaces that are still up are torn
      * down.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testEnterSoftApModeFromDifferentState() throws Exception {
         when(mWifiInjector.makeWificond()).thenReturn(mWificond);
@@ -165,6 +167,7 @@ public class WifiStateMachinePrimeTest {
     /**
      * Test that we can disable wifi fully from the SoftApModeActiveState.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testDisableWifiFromSoftApModeActiveState() throws Exception {
         enterSoftApActiveMode();
@@ -198,6 +201,7 @@ public class WifiStateMachinePrimeTest {
      * Expectation: When switching out of SoftApModeActiveState we stop the SoftApManager and tear
      * down existing interfaces.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testSwitchModeWhenSoftApActiveMode() throws Exception {
         enterSoftApActiveMode();
@@ -243,6 +247,7 @@ public class WifiStateMachinePrimeTest {
      * Expectations: We should exit the current SoftApModeState and re-enter before successfully
      * entering the SoftApModeActiveState.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testEnterSoftApModeActiveWhenAlreadyInSoftApMode() throws Exception {
         when(mWifiInjector.makeWificond()).thenReturn(mWificond);
@@ -259,6 +264,7 @@ public class WifiStateMachinePrimeTest {
      * SoftApModeActiveState.
      * Expectations: We should exit the SoftApModeActiveState and stop the SoftApManager.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testSoftApFailureWhenActive() throws Exception {
         enterSoftApActiveMode();
@@ -274,6 +280,7 @@ public class WifiStateMachinePrimeTest {
      * SoftApModeActiveState.
      * Expectations: We should exit the SoftApModeActiveState and stop the SoftApManager.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testSoftApDisabledWhenActive() throws Exception {
         enterSoftApActiveMode();
@@ -305,6 +312,7 @@ public class WifiStateMachinePrimeTest {
      *
      * Expectations: WifiInjector should be called with a null config.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testNullConfigIsPassedToWifiInjector() throws Exception {
         enterSoftApActiveMode(null);
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateTrackerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateTrackerTest.java
index 428364dbe..1f2af10ab 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiStateTrackerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiStateTrackerTest.java
@@ -53,6 +53,7 @@ public class WifiStateTrackerTest {
      * Ensure BatteryStats's noteWifiState() is called when the method
      * updateState() is invoked on WifiStateTracker for relevant states.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testBatteryStatsUpdated() throws Exception {
         int[] relevantStates = new int[] { WifiStateTracker.SCAN_MODE,
diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
index 724a4b053..4eab95c51 100644
--- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
@@ -65,6 +65,7 @@ import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Pair;
 
 import com.android.internal.util.AsyncChannel;
+import com.android.server.wifi.DisabledForUpdateToAnyMatcher;
 
 import libcore.util.HexEncoding;
 
@@ -241,6 +242,7 @@ public class WifiAwareDataPathStateManagerTest {
      * Validate the success flow of the Initiator: using session network specifier with a non-null
      * token.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testDataPathInitiatorMacTokenSuccess() throws Exception {
         testDataPathInitiatorUtility(false, true, true, true, false);
@@ -250,6 +252,7 @@ public class WifiAwareDataPathStateManagerTest {
      * Validate the fail flow of the Initiator: using session network specifier with a 0
      * peer ID.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test(expected = IllegalArgumentException.class)
     public void testDataPathInitiatorNoMacFail() throws Exception {
         testDataPathInitiatorUtility(false, false, true, true, false);
@@ -259,6 +262,7 @@ public class WifiAwareDataPathStateManagerTest {
      * Validate the success flow of the Initiator: using a direct network specifier with a non-null
      * peer mac and non-null token.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testDataPathInitiatorDirectMacTokenSuccess() throws Exception {
         testDataPathInitiatorUtility(true, true, true, true, false);
@@ -268,6 +272,7 @@ public class WifiAwareDataPathStateManagerTest {
      * Validate the fail flow of the Initiator: using a direct network specifier with a null peer
      * mac and non-null token.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test(expected = IllegalArgumentException.class)
     public void testDataPathInitiatorDirectNoMacTokenFail() throws Exception {
         testDataPathInitiatorUtility(true, false, true, true, false);
@@ -277,6 +282,7 @@ public class WifiAwareDataPathStateManagerTest {
      * Validate the fail flow of the Initiator: using a direct network specifier with a null peer
      * mac and null token.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test(expected = IllegalArgumentException.class)
     public void testDataPathInitiatorDirectNoMacNoTokenFail() throws Exception {
         testDataPathInitiatorUtility(true, false, false, true, false);
@@ -286,6 +292,7 @@ public class WifiAwareDataPathStateManagerTest {
      * Validate the fail flow of the Initiator: use a session network specifier with a non-null
      * token, but don't get a confirmation.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testDataPathInitiatorNoConfirmationTimeoutFail() throws Exception {
         testDataPathInitiatorUtility(false, true, true, false, false);
@@ -295,6 +302,7 @@ public class WifiAwareDataPathStateManagerTest {
      * Validate the fail flow of the Initiator: use a session network specifier with a non-null
      * token, but get an immediate failure
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testDataPathInitiatorNoConfirmationHalFail() throws Exception {
         testDataPathInitiatorUtility(false, true, true, true, true);
@@ -303,6 +311,7 @@ public class WifiAwareDataPathStateManagerTest {
     /**
      * Validate the fail flow of a mis-configured request: Publisher as Initiator
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testDataPathInitiatorOnPublisherError() throws Exception {
         testDataPathInitiatorResponderMismatchUtility(true);
@@ -316,6 +325,7 @@ public class WifiAwareDataPathStateManagerTest {
      * Validate the success flow of the Responder: using session network specifier with a non-null
      * token.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testDataPathResonderMacTokenSuccess() throws Exception {
         testDataPathResponderUtility(false, true, true, true);
@@ -325,6 +335,7 @@ public class WifiAwareDataPathStateManagerTest {
      * Validate the success flow of the Responder: using session network specifier with a null
      * token.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testDataPathResonderMacNoTokenSuccess() throws Exception {
         testDataPathResponderUtility(false, true, false, true);
@@ -334,6 +345,7 @@ public class WifiAwareDataPathStateManagerTest {
      * Validate the success flow of the Responder: using session network specifier with a
      * token and no peer ID (i.e. 0).
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testDataPathResonderMacTokenNoPeerIdSuccess() throws Exception {
         testDataPathResponderUtility(false, false, true, true);
@@ -343,6 +355,7 @@ public class WifiAwareDataPathStateManagerTest {
      * Validate the success flow of the Responder: using session network specifier with a null
      * token and no peer ID (i.e. 0).
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testDataPathResonderMacTokenNoPeerIdNoTokenSuccess() throws Exception {
         testDataPathResponderUtility(false, false, false, true);
@@ -352,6 +365,7 @@ public class WifiAwareDataPathStateManagerTest {
      * Validate the success flow of the Responder: using a direct network specifier with a non-null
      * peer mac and non-null token.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testDataPathResonderDirectMacTokenSuccess() throws Exception {
         testDataPathResponderUtility(true, true, true, true);
@@ -361,6 +375,7 @@ public class WifiAwareDataPathStateManagerTest {
      * Validate the success flow of the Responder: using a direct network specifier with a non-null
      * peer mac and null token.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testDataPathResonderDirectMacNoTokenSuccess() throws Exception {
         testDataPathResponderUtility(true, true, false, true);
@@ -370,6 +385,7 @@ public class WifiAwareDataPathStateManagerTest {
      * Validate the success flow of the Responder: using a direct network specifier with a null peer
      * mac and non-null token.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testDataPathResonderDirectNoMacTokenSuccess() throws Exception {
         testDataPathResponderUtility(true, false, true, true);
@@ -379,6 +395,7 @@ public class WifiAwareDataPathStateManagerTest {
      * Validate the success flow of the Responder: using a direct network specifier with a null peer
      * mac and null token.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testDataPathResonderDirectNoMacNoTokenSuccess() throws Exception {
         testDataPathResponderUtility(true, false, false, true);
@@ -388,6 +405,7 @@ public class WifiAwareDataPathStateManagerTest {
      * Validate the fail flow of the Responder: use a session network specifier with a non-null
      * token, but don't get a confirmation.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testDataPathResponderNoConfirmationTimeoutFail() throws Exception {
         testDataPathResponderUtility(false, true, true, false);
@@ -396,6 +414,7 @@ public class WifiAwareDataPathStateManagerTest {
     /**
      * Validate the fail flow of a mis-configured request: Subscriber as Responder
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testDataPathResponderOnSubscriberError() throws Exception {
         testDataPathInitiatorResponderMismatchUtility(false);
diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareNativeManagerTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareNativeManagerTest.java
index 89e258693..e60cc9e49 100644
--- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareNativeManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareNativeManagerTest.java
@@ -31,6 +31,7 @@ import android.hardware.wifi.V1_0.WifiStatus;
 import android.hardware.wifi.V1_0.WifiStatusCode;
 import android.os.Looper;
 
+import com.android.server.wifi.DisabledForUpdateToAnyMatcher;
 import com.android.server.wifi.HalDeviceManager;
 
 import org.junit.Before;
@@ -92,6 +93,7 @@ public class WifiAwareNativeManagerTest {
      * 8. onDestroyed -> disableUsage
      * 9. onStatusChange (!started)
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testControlFlow() {
         // configure HalDeviceManager as ready/wifi started
diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareServiceImplTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareServiceImplTest.java
index 0f75300c9..97b8ab378 100644
--- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareServiceImplTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareServiceImplTest.java
@@ -44,6 +44,8 @@ import android.test.suitebuilder.annotation.SmallTest;
 import android.util.SparseArray;
 import android.util.SparseIntArray;
 
+import com.android.server.wifi.DisabledForUpdateToAnyMatcher;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
@@ -56,6 +58,7 @@ import java.lang.reflect.Field;
 /**
  * Unit test harness for WifiAwareStateManager.
  */
+@DisabledForUpdateToAnyMatcher
 @SmallTest
 public class WifiAwareServiceImplTest {
     private static final int MAX_LENGTH = 255;
diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java
index 4201deb78..0109bf77c 100644
--- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java
@@ -58,6 +58,8 @@ import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Log;
 import android.util.SparseArray;
 
+import com.android.server.wifi.DisabledForUpdateToAnyMatcher;
+
 import libcore.util.HexEncoding;
 
 import org.junit.Before;
@@ -1679,6 +1681,7 @@ public class WifiAwareStateManagerTest {
      * Validate that the host-side message queue functions. Tests the perfect case of queue always
      * succeeds and all messages are received on first attempt.
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testSendMessageQueueSequence() throws Exception {
         final int clientId = 1005;
@@ -1774,6 +1777,7 @@ public class WifiAwareStateManagerTest {
      * - Failure to transmit: OTA (which will be retried)
      * - Failure to transmit: other
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testSendMessageQueueSequenceImperfect() throws Exception {
         final int clientId = 1005;
@@ -1902,6 +1906,7 @@ public class WifiAwareStateManagerTest {
     /**
      * Validate that can send empty message successfully: null, byte[0], ""
      */
+    @DisabledForUpdateToAnyMatcher
     @Test
     public void testSendEmptyMessages() throws Exception {
         final int clientId = 1005;