WrongOneOf: don't assume the expression in a label is an identifier.

It's no longer required to be (!). PiperOrigin-RevId: 696457278
google · Nov 14, 2024 · 72cf2f1 · 72cf2f1
1 parent 2124ebf
commit 72cf2f1
Show file tree

Hide file tree

Showing 149 changed files with 814 additions and 409 deletions.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/WrongOneof.java b/core/src/main/java/com/google/errorprone/bugpatterns/WrongOneof.java
@@ -23,6 +23,7 @@
 import static com.google.errorprone.predicates.TypePredicates.isDescendantOf;
 import static com.google.errorprone.util.ASTHelpers.enumValues;
 import static com.google.errorprone.util.ASTHelpers.getReceiver;
+import static com.google.errorprone.util.ASTHelpers.getSymbol;
 import static com.google.errorprone.util.ASTHelpers.getType;
 import static com.google.errorprone.util.ASTHelpers.stripParentheses;
 import static com.google.errorprone.util.Reachability.canCompleteNormally;
@@ -38,7 +39,6 @@
 import com.google.errorprone.predicates.TypePredicate;
 import com.sun.source.tree.CaseTree;
 import com.sun.source.tree.ExpressionTree;
-import com.sun.source.tree.IdentifierTree;
 import com.sun.source.tree.MemberSelectTree;
 import com.sun.source.tree.MethodInvocationTree;
 import com.sun.source.tree.StatementTree;
@@ -97,8 +97,7 @@ private void processSwitch(
       if (caseTree.getExpression() == null) {
         break;
       }
-      allowableGetters.add(
-          getter(((IdentifierTree) caseTree.getExpression()).getName().toString()));
+      allowableGetters.add(getter(getSymbol(caseTree.getExpression()).getSimpleName().toString()));
 
       scanForInvalidGetters(getters, allowableGetters, caseTree, constantReceiver, state);
 

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/ArrayEqualsTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/ArrayEqualsTest.java
@@ -118,7 +118,8 @@ public void bothMethodCalls() {
                   System.out.println("arrays are not equal!");
                 }
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 
@@ -162,7 +163,8 @@ public void objectArray() {
                   System.out.println("arrays are not equal!");
                 }
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 
@@ -230,7 +232,8 @@ public void secondArray() {
                   System.out.println("Objects are not equal!");
                 }
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 
@@ -282,7 +285,8 @@ public void secondArray() {
                   System.out.println("arrays are not equal!");
                 }
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 }
diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/ArrayHashCodeTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/ArrayHashCodeTest.java
@@ -104,7 +104,8 @@ public void varargsHashCodeOnMoreThanOneArg() {
     // Arrays.deepHashCode(multidimensionalStringArray))
     hashCode = Objects.hashCode(obj1, obj2, multidimensionalStringArray);
   }
-}""")
+}\
+""")
         .doTest();
   }
 
@@ -147,7 +148,8 @@ public void varagsHashCodeOnObjectOrStringArray() {
                 hashCode = Objects.hashCode(objArray);
                 hashCode = Objects.hashCode((Object[]) stringArray);
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 
@@ -193,7 +195,8 @@ public void varagsHashCodeOnObjectOrStringArray() {
                 hashCode = Objects.hash(objArray);
                 hashCode = Objects.hash((Object[]) stringArray);
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 }
diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/ArrayToStringTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/ArrayToStringTest.java
@@ -102,7 +102,8 @@ public void arrayOfArrays() {
                 // BUG: Diagnostic contains: Arrays.deepToString(a)
                 System.out.println(a);
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 
@@ -129,7 +130,8 @@ public void objectEquals() {
                   System.out.println("string is not empty!");
                 }
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 
@@ -305,7 +307,8 @@ public void stringVariableAddsArrayAndAssigns() {
                 // BUG: Diagnostic contains: += Arrays.toString(a)
                 b += a;
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 
@@ -332,7 +335,8 @@ public void concatenateCompoundAssign_int() {
                 String b = " a string ";
                 b += a;
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 
@@ -362,7 +366,8 @@ public void stringLiteralRightOperandIsArray() {
                 // BUG: Diagnostic contains: + Arrays.toString(a)
                 String b = "a string" + a;
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 
@@ -388,7 +393,8 @@ public void notArray_refactored() {
                 String b = " a string";
                 String c = a + b;
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/AssertFalseTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/AssertFalseTest.java
@@ -50,7 +50,8 @@ public void assertTrue() {
               public void assertFalseFromCondition() {
                 assert 0 == 1;
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 
@@ -70,7 +71,8 @@ public void assertFalse() {
                 // BUG: Diagnostic contains: throw new AssertionError()
                 assert false;
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 }
diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/AsyncFunctionReturnsNullTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/AsyncFunctionReturnsNullTest.java
@@ -69,7 +69,8 @@ public ListenableFuture<String> apply(Object input) throws Exception {
                   return immediateFuture(input.toString());
                 }
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 
@@ -139,7 +140,8 @@ public ListenableFuture<Object> apply(String input) throws Exception {
               interface MyNonAsyncFunction<I, O> {
                 ListenableFuture<O> apply(@Nullable I input) throws Exception;
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 }
diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/BadComparableTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/BadComparableTest.java
@@ -85,7 +85,8 @@ public int compare(File lhs, File rhs) {
           return (int) (rhs.lastModified() - lhs.lastModified());
         }
       };
-}""")
+}\
+""")
         .doTest();
   }
 
@@ -231,7 +232,8 @@ public char compare(byte n1, byte n2) {
                       return (char) (n1 - n2);
                     }
                   };
-            }""")
+            }\
+            """)
         .doTest();
   }
 }
diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/BadImportTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/BadImportTest.java
@@ -243,7 +243,8 @@ Builder returnRaw() {
   void classLiteral() {
     System.out.println(Builder.class);
   }
-}""")
+}\
+""")
         .doTest();
   }
 
@@ -354,7 +355,8 @@ void useNestedBuilder() {
                   new Builder();
                 }
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 
@@ -438,7 +440,8 @@ Builder returnRaw() {
   void classLiteral() {
     System.out.println(Builder.class);
   }
-}""")
+}\
+""")
         .addOutputLines(
             "BadImportPositiveCases_expected.java",
             """
@@ -498,7 +501,8 @@ ImmutableList.Builder returnRaw() {
   void classLiteral() {
     System.out.println(ImmutableList.Builder.class);
   }
-}""")
+}\
+""")
         .doTest(TestMode.AST_MATCH);
   }
 

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/BadShiftAmountTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/BadShiftAmountTest.java
@@ -78,7 +78,8 @@ public void foo() {
                 // BUG: Diagnostic contains: (long) c >>> 32
                 result += c >>> 32;
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 
@@ -104,7 +105,8 @@ public void foo() {
                 result += x >>> 3;
                 result += (long) (x & 0xff) >> 40;
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 }
diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/BanClassLoaderTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/BanClassLoaderTest.java
@@ -83,7 +83,8 @@ public static final Class<?> methodHandlesDefineClass(byte[] bytes)
     // BUG: Diagnostic contains: BanClassLoader
     return MethodHandles.lookup().defineClass(bytes);
   }
-}""")
+}\
+""")
         .doTest();
   }
 
@@ -113,7 +114,8 @@ public final Class<?> overrideClassLoader() throws ClassNotFoundException {
   private class NotClassLoader {
     protected void loadClass() {}
   }
-}""")
+}\
+""")
         .doTest();
   }
 }
diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/BanJNDITest.java b/core/src/test/java/com/google/errorprone/bugpatterns/BanJNDITest.java
@@ -169,7 +169,8 @@ private Object subclassesJavaNamingcontext() throws NamingException {
     // BUG: Diagnostic contains: BanJNDI
     return c.lookup("hello");
   }
-}""")
+}\
+""")
         .doTest();
   }
 
@@ -197,7 +198,8 @@ class BanJNDIPositiveCases {
   private void callsList() throws NamingException {
     FakeDirContext.list(((Name) new Object()));
   }
-}""")
+}\
+""")
         .doTest();
   }
 
@@ -225,7 +227,8 @@ class BanJNDIPositiveCases {
   private void callsList() throws NamingException {
     FakeDirContext.list(((Name) new Object()));
   }
-}""")
+}\
+""")
         .expectUnchanged()
         .setArgs("-XepCompilingTestOnlyCode")
         .doTest();

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/ByteBufferBackingArrayTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/ByteBufferBackingArrayTest.java
@@ -104,7 +104,8 @@ void array_precededByNotAValidMethod_isFlagged() {
     // BUG: Diagnostic contains: ByteBuffer.array()
     buff.array();
   }
-}""")
+}\
+""")
         .doTest();
   }
 
@@ -248,7 +249,8 @@ void array_inLambdaExpression_precededByByteBufferAllocate_isNotFlagged() {
           return null;
         };
   }
-}""")
+}\
+""")
         .doTest();
   }
 

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/CannotMockFinalClassTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/CannotMockFinalClassTest.java
@@ -56,7 +56,8 @@ public void method() {
                 // BUG: Diagnostic contains: Mockito cannot mock
                 FinalClass local = Mockito.mock(FinalClass.class);
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 
@@ -105,7 +106,8 @@ static class NonFinalClass {}
               public void method() {
                 NonFinalClass local = Mockito.mock(NonFinalClass.class);
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 
@@ -127,7 +129,8 @@ static final class FinalClass {}
               public void method() {
                 FinalClass local = Mockito.mock(FinalClass.class);
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 }
diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/ChainedAssertionLosesContextTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/ChainedAssertionLosesContextTest.java
@@ -126,7 +126,8 @@ Foo otherFoo() {
       return this;
     }
   }
-}""")
+}\
+""")
         .doTest();
   }
 
@@ -190,7 +191,8 @@ Foo otherFoo() {
                   return this;
                 }
               }
-            }""")
+            }\
+            """)
         .doTest();
   }
 }