commit cc5f899167c54e803e9a80c3bf3929ab4ab892a9
author Julien Desprez <jdesprez@google.com> Fri Mar 10 09:31:06 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 10 09:31:07 2017 +0000
tree fa11dc81cb97b67bec976c8994044db9310e4e7a
parent 7d5fce04cec0a5316a582c8200d9d971b4b2861a
parent 7c4ea9c067133fe52f2bbcc1bc08012c9667fa4e

Merge "Fix some warnings due to javadoc or switch case"

src/com/android/tradefed/result/BugreportCollector.java

diff --git a/src/com/android/tradefed/result/BugreportCollector.java b/src/com/android/tradefed/result/BugreportCollector.java
index 16a0719..0407ede 100644
--- a/src/com/android/tradefed/result/BugreportCollector.java
+++ b/src/com/android/tradefed/result/BugreportCollector.java
@@ -354,8 +354,10 @@
                             applicableFreqs.add(Freq.FIRST);
                         }
                         break;
+                    default:
+                        break;
                 }
-                break;  // case AFTER
+                break; // case AFTER
 
             case AT_START_OF:
                 switch (noun) {
@@ -370,8 +372,10 @@
                             applicableFreqs.add(Freq.FIRST);
                         }
                         break;
+                    default:
+                        break;
                 }
-                break;  // case AT_START_OF
+                break; // case AT_START_OF
         }
 
         Predicate storedP = search(relation, applicableFreqs, noun);
@@ -395,6 +399,9 @@
                         // bug-FAILED-FooBarTest#testMethodName
                         desc = String.format("FAILED-%s", testName);
                         break;
+
+                    default:
+                        break;
                 }
             }
 

tests/src/com/android/tradefed/util/StringEscapeUtilsTest.java

diff --git a/tests/src/com/android/tradefed/util/StringEscapeUtilsTest.java b/tests/src/com/android/tradefed/util/StringEscapeUtilsTest.java
index 2001274..7a81c5e 100644
--- a/tests/src/com/android/tradefed/util/StringEscapeUtilsTest.java
+++ b/tests/src/com/android/tradefed/util/StringEscapeUtilsTest.java
@@ -40,8 +40,8 @@
     }
 
     /**
-     * Test {@link StringEscapeUtils#paramsToArgs(List) returns proper result with no quoting
-     * or spaces
+     * Test {@link StringEscapeUtils#paramsToArgs(List)} returns proper result with no quoting or
+     * spaces
      */
     @Test
     public void testParams_noQuotesNoSpaces() {
@@ -53,8 +53,8 @@
     }
 
     /**
-     * Test {@link StringEscapeUtils#paramsToArgs(List) returns proper result with no quoting
-     * but with spaces
+     * Test {@link StringEscapeUtils#paramsToArgs(List)} returns proper result with no quoting but
+     * with spaces
      */
     @Test
     public void testParams_noQuotesWithSpaces() {
@@ -66,7 +66,7 @@
     }
 
     /**
-     * Test {@link StringEscapeUtils#paramsToArgs(List) returns proper result with plain quoting
+     * Test {@link StringEscapeUtils#paramsToArgs(List)} returns proper result with plain quoting
      */
     @Test
     public void testParams_plainQuotes() {
@@ -78,7 +78,7 @@
     }
 
     /**
-     * Test {@link StringEscapeUtils#paramsToArgs(List) returns proper result with escaped quoting
+     * Test {@link StringEscapeUtils#paramsToArgs(List)} returns proper result with escaped quoting
      */
     @Test
     public void testParams_escapedQuotes() {