Remove swathes of assume()s on the current runtime version.

EP is targetting 17, so these are all trivially true for all builds. Except one, which was trivially false, so I removed the test. PiperOrigin-RevId: 697616719
google · Nov 18, 2024 · fc5aade · fc5aade
1 parent b222ea8
commit fc5aade
Show file tree

Hide file tree

Showing 33 changed files with 0 additions and 227 deletions.
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,8 +16,6 @@
 
 package com.google.errorprone.bugpatterns;
 
-import static com.google.common.truth.TruthJUnit.assume;
-
 import com.google.errorprone.CompilationTestHelper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -51,7 +49,6 @@ String formatMe(String formatString, Object... args) {
 
   @Test
   public void formatted() {
-    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,7 +16,6 @@
 
 package com.google.errorprone.bugpatterns;
 
-import static com.google.common.truth.TruthJUnit.assume;
 import static com.google.errorprone.BugCheckerRefactoringTestHelper.TestMode.TEXT_MATCH;
 
 import com.google.errorprone.BugCheckerRefactoringTestHelper;
@@ -418,7 +417,6 @@ interface Test {
   // TODO(b/168625474): 'sealed' doesn't have a TokenKind
   @Test
   public void sealedInterface() {
-    assume().that(Runtime.version().feature()).isAtLeast(15);
     refactoringHelper
         .addInputLines(
             "Test.java",
@@ -623,7 +621,6 @@ void m() {
 
   @Test
   public void recordAnnotation() {
-    assume().that(Runtime.version().feature()).isAtLeast(16);
     refactoringHelper
         .addInputLines(
             "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,8 +16,6 @@
 
 package com.google.errorprone.bugpatterns;
 
-import static com.google.common.truth.TruthJUnit.assume;
-
 import com.google.errorprone.CompilationTestHelper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -63,8 +61,6 @@ public void method() {
 
   @Test
   public void positiveCase_record() {
-    assume().that(Runtime.version().feature()).isAtLeast(16);
-
     compilationHelper
         .addSourceLines(
             "Test.java",

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,8 +16,6 @@
 
 package com.google.errorprone.bugpatterns;
 
-import static com.google.common.truth.TruthJUnit.assume;
-
 import com.google.errorprone.CompilationTestHelper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -545,7 +543,6 @@ class Inner {}
 
   @Test
   public void nestedInLocal_static() {
-    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,8 +16,6 @@
 
 package com.google.errorprone.bugpatterns;
 
-import static com.google.common.truth.TruthJUnit.assume;
-
 import com.google.errorprone.BugCheckerRefactoringTestHelper;
 import com.google.errorprone.BugCheckerRefactoringTestHelper.FixChoosers;
 import com.google.errorprone.CompilationTestHelper;
@@ -588,7 +586,6 @@ void f() throws Exception {
 
   @Test
   public void withVar() {
-    assume().that(Runtime.version().feature()).isAtLeast(15);
     refactoringTest()
         .addInputLines(
             "in/Test.java",

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/DefaultLocaleTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/DefaultLocaleTest.java
@@ -17,7 +17,6 @@
 package com.google.errorprone.bugpatterns;
 
 import static com.google.common.base.Predicates.containsPattern;
-import static com.google.common.truth.TruthJUnit.assume;
 import static com.google.errorprone.bugpatterns.DefaultLocale.onlyContainsSpecifiersInAllowList;
 import static java.util.function.Predicate.not;
 import static org.junit.Assert.assertFalse;
@@ -143,7 +142,6 @@ public void formatMethods_negative() {
 
   @Test
   public void stringFormatted() {
-    assume().that(Runtime.version().feature()).isAtLeast(15);
     compilationHelper
         .addSourceLines(
             "Test.java",
@@ -233,7 +231,6 @@ void f(DateTimeFormatterBuilder dtfb) throws Exception {
 
   @Test
   public void factoryMethodsJdk12plus() {
-    assume().that(Runtime.version().feature()).isAtLeast(12);
     compilationHelper
         .addSourceLines(
             "Test.java",
@@ -311,7 +308,6 @@ public void resourceBundle() {
 
   @Test
   public void resourceBundleJdk9plus() {
-    assume().that(Runtime.version().feature()).isAtLeast(9);
     compilationHelper
         .addSourceLines(
             "Test.java",

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/FallThroughTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/FallThroughTest.java
@@ -16,8 +16,6 @@
 
 package com.google.errorprone.bugpatterns;
 
-import static com.google.common.truth.TruthJUnit.assume;
-
 import com.google.errorprone.CompilationTestHelper;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -340,7 +338,6 @@ void f(char c, boolean b) {
 
   @Test
   public void arrowSwitch() {
-    assume().that(Runtime.version().feature()).isAtLeast(14);
     testHelper
         .addSourceLines(
             "Test.java",
@@ -366,7 +363,6 @@ void m(Case c) {
   @Ignore("https://github.com/google/error-prone/issues/2638")
   @Test
   public void i2118() {
-    assume().that(Runtime.version().feature()).isAtLeast(14);
     testHelper
         .addSourceLines(
             "Test.java",

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/FieldCanBeStaticTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/FieldCanBeStaticTest.java
@@ -16,8 +16,6 @@
 
 package com.google.errorprone.bugpatterns;
 
-import static com.google.common.truth.TruthJUnit.assume;
-
 import com.google.errorprone.BugCheckerRefactoringTestHelper;
 import com.google.errorprone.CompilationTestHelper;
 import org.junit.Test;
@@ -351,7 +349,6 @@ class L {
 
   @Test
   public void inner_static() {
-    assume().that(Runtime.version().feature()).isAtLeast(16);
     compilationHelper
         .addSourceLines(
             "Test.java",
@@ -394,7 +391,6 @@ class L {
 
   @Test
   public void record() {
-    assume().that(Runtime.version().feature()).isAtLeast(16);
     compilationHelper
         .addSourceLines(
             "ExampleClass.java",

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/MethodCanBeStaticTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/MethodCanBeStaticTest.java
@@ -16,8 +16,6 @@
 
 package com.google.errorprone.bugpatterns;
 
-import static com.google.common.truth.TruthJUnit.assume;
-
 import com.google.common.collect.ImmutableList;
 import com.google.errorprone.BugCheckerRefactoringTestHelper;
 import com.google.errorprone.CompilationTestHelper;
@@ -422,7 +420,6 @@ private int incr(int x) {
 
   @Test
   public void innerClass_static() {
-    assume().that(Runtime.version().feature()).isAtLeast(16);
     testHelper
         .addSourceLines(
             "Test.java",
@@ -491,7 +488,6 @@ private void foo() {}
 
   @Test
   public void positiveLocal() {
-    assume().that(Runtime.version().feature()).isAtLeast(16);
     testHelper
         .addSourceLines(
             "Test.java",

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/MisformattedTestDataTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/MisformattedTestDataTest.java
@@ -16,7 +16,6 @@
 
 package com.google.errorprone.bugpatterns;
 
-import static com.google.common.truth.TruthJUnit.assume;
 import static com.google.errorprone.BugCheckerRefactoringTestHelper.TestMode.TEXT_MATCH;
 
 import com.google.errorprone.BugCheckerRefactoringTestHelper;
@@ -34,8 +33,6 @@ public final class MisformattedTestDataTest {
 
   @Test
   public void alreadyFormatted_noFinding() {
-    assume().that(Runtime.version().feature()).isAtLeast(14);
-
     compilationHelper
         .addSourceLines(
             "Test.java",
@@ -63,8 +60,6 @@ void method() {
 
   @Test
   public void onlyDiffersByFinalNewline_noFinding() {
-    assume().that(Runtime.version().feature()).isAtLeast(14);
-
     compilationHelper
         .addSourceLines(
             "Test.java",
@@ -91,8 +86,6 @@ void method() {
 
   @Test
   public void misformatted_suggestsFix() {
-    assume().that(Runtime.version().feature()).isAtLeast(14);
-
     refactoringHelper
         .addInputLines(
             "Test.java",
@@ -141,8 +134,6 @@ void method() {
 
   @Test
   public void onlyDiffersByIndentation_notReindented() {
-    assume().that(Runtime.version().feature()).isAtLeast(14);
-
     refactoringHelper
         .addInputLines(
             "Test.java",
@@ -171,8 +162,6 @@ void method() {
 
   @Test
   public void escapesSpecialCharacters() {
-    assume().that(Runtime.version().feature()).isAtLeast(14);
-
     refactoringHelper
         .addInputLines(
             "Test.java",

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/MisleadingEscapedSpaceTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/MisleadingEscapedSpaceTest.java
@@ -16,8 +16,6 @@
 
 package com.google.errorprone.bugpatterns;
 
-import static com.google.common.truth.TruthJUnit.assume;
-
 import com.google.errorprone.CompilationTestHelper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -30,8 +28,6 @@ public final class MisleadingEscapedSpaceTest {
 
   @Test
   public void misleadingEscape() {
-    assume().that(Runtime.version().feature()).isAtLeast(14);
-
     testHelper
         .addSourceLines(
             "Test.class",
@@ -46,8 +42,6 @@ class Test {
 
   @Test
   public void literalBackslashS() {
-    assume().that(Runtime.version().feature()).isAtLeast(14);
-
     testHelper
         .addSourceLines(
             "Test.class",
@@ -61,8 +55,6 @@ class Test {
 
   @Test
   public void asSingleCharacter_misleading() {
-    assume().that(Runtime.version().feature()).isAtLeast(14);
-
     testHelper
         .addSourceLines(
             "Test.class",
@@ -77,8 +69,6 @@ class Test {
 
   @Test
   public void withinTextBlock_notAtEndOfLine_misleading() {
-    assume().that(Runtime.version().feature()).isAtLeast(14);
-
     testHelper
         .addSourceLines(
             "Test.class",
@@ -100,8 +90,6 @@ class Test {
 
   @Test
   public void atEndOfLine_notMisleading() {
-    assume().that(Runtime.version().feature()).isAtLeast(14);
-
     testHelper
         .addSourceLines(
             "Test.class",
@@ -118,8 +106,6 @@ class Test {
 
   @Test
   public void multipleAtEndOfLine_notMisleading() {
-    assume().that(Runtime.version().feature()).isAtLeast(14);
-
     testHelper
         .addSourceLines(
             "Test.class",
@@ -135,8 +121,6 @@ class Test {
 
   @Test
   public void withinCommentInBrokenUpString_noFinding() {
-    assume().that(Runtime.version().feature()).isAtLeast(14);
-
     testHelper
         .addSourceLines(
             "Test.class",
@@ -150,8 +134,6 @@ class Test {
 
   @Test
   public void atEndOfString_noFinding() {
-    assume().that(Runtime.version().feature()).isAtLeast(14);
-
     testHelper
         .addSourceLines(
             "Test.class",
@@ -168,8 +150,6 @@ class Test {
 
   @Test
   public void escapedSpaceAtEndOfString() {
-    assume().that(Runtime.version().feature()).isAtLeast(14);
-
     testHelper
         .addSourceLines(
             "Test.class",

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/MissingDefaultTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/MissingDefaultTest.java
@@ -257,7 +257,6 @@ boolean f(int i) {
 
   @Test
   public void arrowSwitch() {
-    assume().that(Runtime.version().feature()).isAtLeast(14);
     compilationHelper
         .addSourceLines(
             "Test.java",
@@ -277,7 +276,6 @@ void m(int i) {
 
   @Test
   public void arrowSwitchNegative() {
-    assume().that(Runtime.version().feature()).isAtLeast(14);
     compilationHelper
         .addSourceLines(
             "Test.java",
@@ -297,7 +295,6 @@ void m(int i) {
 
   @Test
   public void arrowComment() {
-    assume().that(Runtime.version().feature()).isAtLeast(14);
     compilationHelper
         .addSourceLines(
             "Test.java",

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/MissingOverrideTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/MissingOverrideTest.java
@@ -16,8 +16,6 @@
 
 package com.google.errorprone.bugpatterns;
 
-import static com.google.common.truth.TruthJUnit.assume;
-
 import com.google.common.collect.ImmutableList;
 import com.google.errorprone.CompilationTestHelper;
 import org.junit.Test;
@@ -195,8 +193,6 @@ public interface Test extends Super {
 
   @Test
   public void explicitRecordAccessor() {
-    assume().that(Runtime.version().feature()).isAtLeast(16);
-
     compilationHelper
         .addSourceLines(
             "Baz.java",
@@ -219,8 +215,6 @@ public int y() {
 
   @Test
   public void explicitRecordAccessor_doesNotFlagConstructors() {
-    assume().that(Runtime.version().feature()).isAtLeast(16);
-
     compilationHelper
         .addSourceLines(
             "Test.java",