commit ac0845af4a05f4e7a2c0a3501a7f12e4374976fe
author Andreas Gampe <agampe@google.com> Fri Feb 16 16:28:12 2018 -0800
committer Andreas Gampe <agampe@google.com> Wed Feb 28 11:49:30 2018 -0800
tree ab55bb2ca977b2865b6ece25d04e075099897108
parent abeaedde0d1780e4f616771ed10d57e6b05e8b83

Wifi: Mark disabled tests with @Ignore

Mark disabled tests so that Errorprone stops complaining about
unannotated test methods.

Cleanup from update to Errorprone 2.2.0, which warns on more
cases, and enforces JUnit4 style (@Ignore + @Test).

(cherry picked from commit 03ba3e6683b20c22d6dd4fb32c93bcaf7858cfa2)

Bug: 72076216
Test: m javac-check-FrameworksWifiTests RUN_ERROR_PRONE=true
Merged-In: Ie93ca0ac40ee71465a1e82a9cb055043e4096425
Change-Id: Ie93ca0ac40ee71465a1e82a9cb055043e4096425

tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java
index 6b93e05..30d4d8f 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiDiagnosticsTest.java
@@ -37,6 +37,7 @@
 import com.android.internal.R;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
@@ -246,7 +247,8 @@
     /**
      * Verifies that we discard extraneous ring-buffer data.
      */
-    // TODO(b/36811399): re-enabled this @Test
+    @Ignore("TODO(b/36811399): re-enabled this @Test")
+    @Test
     public void loggerDiscardsExtraneousData() throws Exception {
         final boolean verbosityToggle = false;
         setBuildPropertiesToEnableRingBuffers();
@@ -617,7 +619,8 @@
     }
 
     /** Verifies that the default size of our ring buffers is small. */
-    // TODO(b/36811399): re-enable this @Test
+    @Ignore("TODO(b/36811399): re-enable this @Test")
+    @Test
     public void ringBufferSizeIsSmallByDefault() throws Exception {
         final boolean verbosityToggle = false;
         mWifiDiagnostics.startLogging(verbosityToggle);
@@ -628,7 +631,8 @@
     }
 
     /** Verifies that we use small ring buffers by default, on userdebug builds. */
-    // TODO(b/36811399): re-enable this @Test
+    @Ignore("TODO(b/36811399): re-enable this @Test")
+    @Test
     public void ringBufferSizeIsSmallByDefaultOnUserdebugBuilds() throws Exception {
         final boolean verbosityToggle = false;
         when(mBuildProperties.isUserdebugBuild()).thenReturn(true);
@@ -642,7 +646,8 @@
     }
 
     /** Verifies that we use small ring buffers by default, on eng builds. */
-    // TODO(b/36811399): re-enable this @Test
+    @Ignore("TODO(b/36811399): re-enable this @Test")
+    @Test
     public void ringBufferSizeIsSmallByDefaultOnEngBuilds() throws Exception {
         final boolean verbosityToggle = false;
         when(mBuildProperties.isEngBuild()).thenReturn(true);
@@ -682,7 +687,8 @@
     }
 
     /** Verifies that we use small ring buffers when switched from verbose to normal mode. */
-    // TODO(b/36811399): re-enabled this @Test
+    @Ignore("TODO(b/36811399): re-enabled this @Test")
+    @Test
     public void startLoggingShrinksRingBuffersIfNeeded() throws Exception {
         setBuildPropertiesToEnableRingBuffers();