google · copybara-service · Aug 13, 2024 · Aug 13, 2024
diff --git a/check_api/src/main/java/com/google/errorprone/util/ASTHelpers.java b/check_api/src/main/java/com/google/errorprone/util/ASTHelpers.java
@@ -2822,7 +2822,7 @@ public static boolean isRuleKind(CaseTree caseTree) {
     "unchecked", // reflection
   })
   public static Stream<? extends ExpressionTree> getCaseExpressions(CaseTree caseTree) {
-    if (!RuntimeVersion.isAtLeast12()) {
+    if (Runtime.version().feature() < 12) {
       // "default" case gives an empty stream
       return Stream.ofNullable(caseTree.getExpression());
     }

diff --git a/check_api/src/main/java/com/google/errorprone/util/ErrorProneScope.java b/check_api/src/main/java/com/google/errorprone/util/ErrorProneScope.java
@@ -61,7 +61,7 @@ public boolean anyMatch(Predicate<Symbol> predicate) {
   private static final Class<?> FILTER_CLASS = getFilterClass();
 
   private static @Nullable Class<?> getFilterClass() {
-    if (RuntimeVersion.isAtLeast17()) {
+    if (Runtime.version().feature() >= 17) {
       return null;
     }
     try {

diff --git a/check_api/src/main/java/com/google/errorprone/util/FindIdentifiers.java b/check_api/src/main/java/com/google/errorprone/util/FindIdentifiers.java
@@ -112,7 +112,7 @@ public static Symbol findIdent(String name, VisitorState state) {
   private static Symbol findIdent(
       String name, VisitorState state, KindSelector kind, Env<AttrContext> env)
       throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
-    if (RuntimeVersion.isAtLeast13()) {
+    if (Runtime.version().feature() >= 13) {
       Method method =
           Resolve.class.getDeclaredMethod(
               "findIdent", DiagnosticPosition.class, Env.class, Name.class, KindSelector.class);

diff --git a/check_api/src/main/java/com/google/errorprone/util/RuntimeVersion.java b/check_api/src/main/java/com/google/errorprone/util/RuntimeVersion.java
diff --git a/check_api/src/main/java/com/google/errorprone/util/SourceVersion.java b/check_api/src/main/java/com/google/errorprone/util/SourceVersion.java
@@ -19,11 +19,7 @@
 import com.sun.tools.javac.code.Source;
 import com.sun.tools.javac.util.Context;
 
-/**
- * JDK source version utilities.
- *
- * @see RuntimeVersion
- */
+/** JDK source version utilities. */
 public final class SourceVersion {
   /** Returns true if the compiler source version level supports switch expressions. */
   public static boolean supportsSwitchExpressions(Context context) {

diff --git a/check_api/src/test/java/com/google/errorprone/util/SourceVersionTest.java b/check_api/src/test/java/com/google/errorprone/util/SourceVersionTest.java
@@ -38,7 +38,7 @@ public void supportsSwitchExpressions_conditionallySupported() {
     Context context = contextWithSourceVersion("14");
 
     assertThat(SourceVersion.supportsSwitchExpressions(context))
-        .isEqualTo(RuntimeVersion.isAtLeast14());
+        .isEqualTo(Runtime.version().feature() >= 14);
   }
 
   @Test
@@ -52,7 +52,8 @@ public void supportsTextBlocks_notSupported() {
   public void supportsTextBlocks_conditionallySupported() {
     Context context = contextWithSourceVersion("15");
 
-    assertThat(SourceVersion.supportsTextBlocks(context)).isEqualTo(RuntimeVersion.isAtLeast15());
+    assertThat(SourceVersion.supportsTextBlocks(context))
+        .isEqualTo(Runtime.version().feature() >= 15);
   }
 
   private static Context contextWithSourceVersion(String versionString) {

diff --git a/core/src/main/java/com/google/errorprone/refaster/PlaceholderUnificationVisitor.java b/core/src/main/java/com/google/errorprone/refaster/PlaceholderUnificationVisitor.java
@@ -26,7 +26,6 @@
 import com.google.errorprone.refaster.PlaceholderUnificationVisitor.State;
 import com.google.errorprone.refaster.UPlaceholderExpression.PlaceholderParamIdent;
 import com.google.errorprone.util.ASTHelpers;
-import com.google.errorprone.util.RuntimeVersion;
 import com.sun.source.tree.ArrayAccessTree;
 import com.sun.source.tree.AssignmentTree;
 import com.sun.source.tree.BinaryTree;
@@ -668,12 +667,12 @@ public Choice<State<JCCase>> visitCase(CaseTree node, State<?> state) {
 
   private JCCase makeCase(CaseTree node, List<JCStatement> stmts) {
     try {
-      if (RuntimeVersion.isAtLeast12()) {
+      if (Runtime.version().feature() >= 12) {
         Enum<?> caseKind = (Enum) CaseTree.class.getMethod("getCaseKind").invoke(node);
         checkState(
             caseKind.name().contentEquals("STATEMENT"),
             "expression switches are not supported yet");
-        if (RuntimeVersion.isAtLeast21()) {
+        if (Runtime.version().feature() >= 21) {
           return (JCCase)
               TreeMaker.class
                   .getMethod(
@@ -702,7 +701,7 @@ private JCCase makeCase(CaseTree node, List<JCStatement> stmts) {
                 .invoke(
                     maker(),
                     caseKind,
-                    RuntimeVersion.isAtLeast17()
+                    Runtime.version().feature() >= 17
                         ? CaseTree.class.getMethod("getLabels").invoke(node)
                         : List.of((JCExpression) node.getExpression()),
                     stmts,

diff --git a/core/src/main/java/com/google/errorprone/refaster/UBreak.java b/core/src/main/java/com/google/errorprone/refaster/UBreak.java
@@ -16,7 +16,6 @@
 
 package com.google.errorprone.refaster;
 
-import com.google.errorprone.util.RuntimeVersion;
 import com.sun.source.tree.BreakTree;
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.TreeVisitor;
@@ -75,7 +74,7 @@ public JCBreak inline(Inliner inliner) {
 
   private static JCBreak makeBreak(Name label, Inliner inliner) {
     try {
-      if (RuntimeVersion.isAtLeast12()) {
+      if (Runtime.version().feature() >= 12) {
         return (JCBreak)
             TreeMaker.class
                 .getMethod("Break", JCExpression.class)

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/AnnotateFormatMethodTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/AnnotateFormatMethodTest.java
@@ -16,10 +16,9 @@
 
 package com.google.errorprone.bugpatterns;
 
-import static org.junit.Assume.assumeTrue;
+import static com.google.common.truth.TruthJUnit.assume;
 
 import com.google.errorprone.CompilationTestHelper;
-import com.google.errorprone.util.RuntimeVersion;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -50,7 +49,7 @@ public void positiveCase() {
 
   @Test
   public void formatted() {
-    assumeTrue(RuntimeVersion.isAtLeast15());
+    assume().that(Runtime.version().feature()).isAtLeast(15);
     compilationHelper
         .addSourceLines(
             "AnnotateFormatMethodPositiveCases.java",

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/AnnotationPositionTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/AnnotationPositionTest.java
@@ -16,12 +16,11 @@
 
 package com.google.errorprone.bugpatterns;
 
+import static com.google.common.truth.TruthJUnit.assume;
 import static com.google.errorprone.BugCheckerRefactoringTestHelper.TestMode.TEXT_MATCH;
-import static org.junit.Assume.assumeTrue;
 
 import com.google.errorprone.BugCheckerRefactoringTestHelper;
 import com.google.errorprone.CompilationTestHelper;
-import com.google.errorprone.util.RuntimeVersion;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -361,7 +360,7 @@ public void diagnostic() {
   // TODO(b/168625474): 'sealed' doesn't have a TokenKind
   @Test
   public void sealedInterface() {
-    assumeTrue(RuntimeVersion.isAtLeast15());
+    assume().that(Runtime.version().feature()).isAtLeast(15);
     refactoringHelper
         .addInputLines(
             "Test.java", //
@@ -375,7 +374,7 @@ public void sealedInterface() {
             "sealed @Deprecated interface Test {",
             "  final class A implements Test {}",
             "}")
-        .setArgs("--enable-preview", "--release", Integer.toString(RuntimeVersion.release()))
+        .setArgs("--enable-preview", "--release", Integer.toString(Runtime.version().feature()))
         .doTest(TEXT_MATCH);
   }
 
@@ -532,7 +531,7 @@ public void varKeyword() {
 
   @Test
   public void recordAnnotation() {
-    assumeTrue(RuntimeVersion.isAtLeast16());
+    assume().that(Runtime.version().feature()).isAtLeast(16);
     refactoringHelper
         .addInputLines(
             "Test.java",

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/ArrayFillIncompatibleTypeTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/ArrayFillIncompatibleTypeTest.java
@@ -16,10 +16,9 @@
 
 package com.google.errorprone.bugpatterns;
 
-import static org.junit.Assume.assumeFalse;
+import static com.google.common.truth.TruthJUnit.assume;
 
 import com.google.errorprone.CompilationTestHelper;
-import com.google.errorprone.util.RuntimeVersion;
 import java.util.Arrays;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,7 +32,9 @@ public class ArrayFillIncompatibleTypeTest {
 
   @Test
   public void primitiveBoxingIntoObject() {
-    assumeFalse(RuntimeVersion.isAtLeast12()); // https://bugs.openjdk.java.net/browse/JDK-8028563
+    assume()
+        .that(Runtime.version().feature())
+        .isLessThan(12); // https://bugs.openjdk.java.net/browse/JDK-8028563
     compilationHelper
         .addSourceLines(
             "Test.java",

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/CannotMockFinalClassTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/CannotMockFinalClassTest.java
@@ -16,10 +16,9 @@
 
 package com.google.errorprone.bugpatterns;
 
-import static org.junit.Assume.assumeTrue;
+import static com.google.common.truth.TruthJUnit.assume;
 
 import com.google.errorprone.CompilationTestHelper;
-import com.google.errorprone.util.RuntimeVersion;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -41,7 +40,7 @@ public void positiveCase() {
 
   @Test
   public void positiveCase_record() {
-    assumeTrue(RuntimeVersion.isAtLeast16());
+    assume().that(Runtime.version().feature()).isAtLeast(16);
 
     compilationHelper
         .addSourceLines(

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/ClassCanBeStaticTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/ClassCanBeStaticTest.java
@@ -16,10 +16,9 @@
 
 package com.google.errorprone.bugpatterns;
 
-import static org.junit.Assume.assumeTrue;
+import static com.google.common.truth.TruthJUnit.assume;
 
 import com.google.errorprone.CompilationTestHelper;
-import com.google.errorprone.util.RuntimeVersion;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -346,7 +345,7 @@ public void nestedInLocal() {
 
   @Test
   public void nestedInLocal_static() {
-    assumeTrue(RuntimeVersion.isAtLeast16());
+    assume().that(Runtime.version().feature()).isAtLeast(16);
     compilationHelper
         .addSourceLines(
             "A.java", //

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/DefaultCharsetTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/DefaultCharsetTest.java
@@ -16,12 +16,11 @@
 
 package com.google.errorprone.bugpatterns;
 
-import static org.junit.Assume.assumeTrue;
+import static com.google.common.truth.TruthJUnit.assume;
 
 import com.google.errorprone.BugCheckerRefactoringTestHelper;
 import com.google.errorprone.BugCheckerRefactoringTestHelper.FixChoosers;
 import com.google.errorprone.CompilationTestHelper;
-import com.google.errorprone.util.RuntimeVersion;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -505,7 +504,7 @@ public void scannerDefaultCharset() {
 
   @Test
   public void withVar() {
-    assumeTrue(RuntimeVersion.isAtLeast15());
+    assume().that(Runtime.version().feature()).isAtLeast(15);
     refactoringTest()
         .addInputLines(
             "in/Test.java",