Disallow static import of BugCheckerRefasctoringTestHelper.TestMode…

… members (#862)
PicnicSupermarket · Oct 30, 2023 · 4ce9f92 · 4ce9f92
1 parent e8d1499
commit 4ce9f92
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/NonStaticImport.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/NonStaticImport.java
@@ -58,7 +58,11 @@ public final class NonStaticImport extends BugChecker implements CompilationUnit
    */
   @VisibleForTesting
   static final ImmutableSet<String> NON_STATIC_IMPORT_CANDIDATE_TYPES =
-      ImmutableSet.of("com.google.common.base.Strings", "java.time.Clock", "java.time.ZoneOffset");
+      ImmutableSet.of(
+          "com.google.common.base.Strings",
+          "com.google.errorprone.BugCheckerRefactoringTestHelper.TestMode",
+          "java.time.Clock",
+          "java.time.ZoneOffset");
 
   /**
    * Type members that should never be statically imported.

diff --git a/...st-support/src/main/java/tech/picnic/errorprone/refaster/test/RefasterRuleCollection.java b/...st-support/src/main/java/tech/picnic/errorprone/refaster/test/RefasterRuleCollection.java
@@ -4,7 +4,6 @@
 import static com.google.common.collect.ImmutableListMultimap.toImmutableListMultimap;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.collect.ImmutableSortedSet.toImmutableSortedSet;
-import static com.google.errorprone.BugCheckerRefactoringTestHelper.TestMode.TEXT_MATCH;
 import static com.google.errorprone.BugPattern.SeverityLevel.ERROR;
 import static java.util.Comparator.naturalOrder;
 import static tech.picnic.errorprone.refaster.runner.Refaster.INCLUDED_RULES_PATTERN_FLAG;
@@ -19,6 +18,7 @@
 import com.google.common.collect.Range;
 import com.google.common.collect.Sets;
 import com.google.errorprone.BugCheckerRefactoringTestHelper;
+import com.google.errorprone.BugCheckerRefactoringTestHelper.TestMode;
 import com.google.errorprone.BugPattern;
 import com.google.errorprone.ErrorProneFlags;
 import com.google.errorprone.SubContext;
@@ -126,7 +126,7 @@ public static void validate(Class<?> clazz) {
         .setArgs(ImmutableList.of("-XepOpt:" + RULE_COLLECTION_FLAG + '=' + className))
         .addInput(className + "TestInput.java")
         .addOutput(className + "TestOutput.java")
-        .doTest(TEXT_MATCH);
+        .doTest(TestMode.TEXT_MATCH);
   }
 
   @Override