commit 259f87fcd7985c85da9f35ea22672cc93067e912
author Cole Faust <colefaust@google.com> Thu Aug 12 10:31:28 2021 -0700
committer Colin Cross <ccross@android.com> Fri Oct 08 09:22:49 2021 -0700
tree 2faf41acd5db413fcfa655c8ec1f07067f1c27c6
parent b8435c1b659371ed8088b84d93d5a858872ffb16

Move test into nested class

When using @RunWith(Enclosed.class), tests in the outer
class won't be run. There was even a warning comment
about this on this test class, but it was still missed.

Errorprone is being updated to 3.8.1, and adds a check for
this.

Bug: 190944875
Test: Presubmits
Change-Id: Ifd7534ed81b93182969297e7b75178fa4201ef13
Merged-In: Ifd7534ed81b93182969297e7b75178fa4201ef13
(cherry picked from commit c5863702530d254a5246f87280c534107c20c35f)

service/tests/wifitests/src/com/android/server/wifi/scanner/ChannelHelperTest.java

diff --git a/service/tests/wifitests/src/com/android/server/wifi/scanner/ChannelHelperTest.java b/service/tests/wifitests/src/com/android/server/wifi/scanner/ChannelHelperTest.java
index ce9a761..18c00ba 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/scanner/ChannelHelperTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/scanner/ChannelHelperTest.java
@@ -90,33 +90,29 @@
                     10000, 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
             assertEquals("[2400,5100]", ChannelHelper.toString(scanSettings));
         }
-    }
 
-    /**
-     * Unit tests for
-     * {@link com.android.server.wifi.scanner.ChannelHelper#bandToString}.
-     */
-    @Test
-    public void bandToString_ShouldReturnApproapriateString() {
-        assertEquals("unspecified", ChannelHelper.bandToString(
-                WifiScanner.WIFI_BAND_UNSPECIFIED));
-        assertEquals("24Ghz", ChannelHelper.bandToString(WifiScanner.WIFI_BAND_24_GHZ));
-        assertEquals("5Ghz (no DFS)", ChannelHelper.bandToString(WifiScanner.WIFI_BAND_5_GHZ));
-        assertEquals("5Ghz (DFS only)", ChannelHelper.bandToString(
-                WifiScanner.WIFI_BAND_5_GHZ_DFS_ONLY));
-        assertEquals("5Ghz (DFS incl)", ChannelHelper.bandToString(
-                WifiScanner.WIFI_BAND_5_GHZ_WITH_DFS));
-        assertEquals("24Ghz & 5Ghz (no DFS)", ChannelHelper.bandToString(
-                WifiScanner.WIFI_BAND_BOTH));
-        assertEquals("24Ghz & 5Ghz (DFS incl)", ChannelHelper.bandToString(
-                WifiScanner.WIFI_BAND_BOTH_WITH_DFS));
-        assertEquals("24Ghz & 5Ghz (DFS incl) & 6Ghz", ChannelHelper.bandToString(
-                WifiScanner.WIFI_BAND_24_5_WITH_DFS_6_GHZ));
-        assertEquals("2.4 GHz & 5 GHz (no DFS) & 6GHz & 60GHz", ChannelHelper.bandToString(
-                WifiScanner.WIFI_BAND_24_5_6_60_GHZ));
-        assertEquals("2.4 GHz & 5Ghz (DFS incl) & 6GHz & 60GHz", ChannelHelper.bandToString(
-                WifiScanner.WIFI_BAND_24_5_WITH_DFS_6_60_GHZ));
-        assertEquals("invalid band", ChannelHelper.bandToString(-235342));
+        /**
+         * Unit tests for
+         * {@link com.android.server.wifi.scanner.ChannelHelper#bandToString}.
+         */
+        @Test
+        public void bandToString_ShouldReturnApproapriateString() {
+            assertEquals("unspecified", ChannelHelper.bandToString(
+                    WifiScanner.WIFI_BAND_UNSPECIFIED));
+            assertEquals("24Ghz", ChannelHelper.bandToString(WifiScanner.WIFI_BAND_24_GHZ));
+            assertEquals("5Ghz (no DFS)", ChannelHelper.bandToString(WifiScanner.WIFI_BAND_5_GHZ));
+            assertEquals("5Ghz (DFS only)", ChannelHelper.bandToString(
+                    WifiScanner.WIFI_BAND_5_GHZ_DFS_ONLY));
+            assertEquals("5Ghz (DFS incl)", ChannelHelper.bandToString(
+                    WifiScanner.WIFI_BAND_5_GHZ_WITH_DFS));
+            assertEquals("24Ghz & 5Ghz (no DFS)", ChannelHelper.bandToString(
+                    WifiScanner.WIFI_BAND_BOTH));
+            assertEquals("24Ghz & 5Ghz (DFS incl)", ChannelHelper.bandToString(
+                    WifiScanner.WIFI_BAND_BOTH_WITH_DFS));
+            assertEquals("24Ghz & 5Ghz (DFS incl) & 6Ghz", ChannelHelper.bandToString(
+                    WifiScanner.WIFI_BAND_24_5_WITH_DFS_6_GHZ));
+            assertEquals("Invalid band", ChannelHelper.bandToString(-235342));
+        }
     }
 
     /**