Skip to content

Commit fc5aade

Browse files
graememorganError Prone Team
graememorgan
authored and
Error Prone Team
committed
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
1 parent b222ea8 commit fc5aade

33 files changed

+0
-227
lines changed

‎core/src/test/java/com/google/errorprone/bugpatterns/AnnotateFormatMethodTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package com.google.errorprone.bugpatterns;
1818

19-
import static com.google.common.truth.TruthJUnit.assume;
20-
2119
import com.google.errorprone.CompilationTestHelper;
2220
import org.junit.Test;
2321
import org.junit.runner.RunWith;
@@ -51,7 +49,6 @@ String formatMe(String formatString, Object... args) {
5149

5250
@Test
5351
public void formatted() {
54-
assume().that(Runtime.version().feature()).isAtLeast(15);
5552
compilationHelper
5653
.addSourceLines(
5754
"AnnotateFormatMethodPositiveCases.java",

‎core/src/test/java/com/google/errorprone/bugpatterns/AnnotationPositionTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.google.errorprone.bugpatterns;
1818

19-
import static com.google.common.truth.TruthJUnit.assume;
2019
import static com.google.errorprone.BugCheckerRefactoringTestHelper.TestMode.TEXT_MATCH;
2120

2221
import com.google.errorprone.BugCheckerRefactoringTestHelper;
@@ -418,7 +417,6 @@ interface Test {
418417
// TODO(b/168625474): 'sealed' doesn't have a TokenKind
419418
@Test
420419
public void sealedInterface() {
421-
assume().that(Runtime.version().feature()).isAtLeast(15);
422420
refactoringHelper
423421
.addInputLines(
424422
"Test.java",
@@ -623,7 +621,6 @@ void m() {
623621

624622
@Test
625623
public void recordAnnotation() {
626-
assume().that(Runtime.version().feature()).isAtLeast(16);
627624
refactoringHelper
628625
.addInputLines(
629626
"Test.java",

‎core/src/test/java/com/google/errorprone/bugpatterns/CannotMockFinalClassTest.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package com.google.errorprone.bugpatterns;
1818

19-
import static com.google.common.truth.TruthJUnit.assume;
20-
2119
import com.google.errorprone.CompilationTestHelper;
2220
import org.junit.Test;
2321
import org.junit.runner.RunWith;
@@ -63,8 +61,6 @@ public void method() {
6361

6462
@Test
6563
public void positiveCase_record() {
66-
assume().that(Runtime.version().feature()).isAtLeast(16);
67-
6864
compilationHelper
6965
.addSourceLines(
7066
"Test.java",

‎core/src/test/java/com/google/errorprone/bugpatterns/ClassCanBeStaticTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package com.google.errorprone.bugpatterns;
1818

19-
import static com.google.common.truth.TruthJUnit.assume;
20-
2119
import com.google.errorprone.CompilationTestHelper;
2220
import org.junit.Test;
2321
import org.junit.runner.RunWith;
@@ -545,7 +543,6 @@ class Inner {}
545543

546544
@Test
547545
public void nestedInLocal_static() {
548-
assume().that(Runtime.version().feature()).isAtLeast(16);
549546
compilationHelper
550547
.addSourceLines(
551548
"A.java",

‎core/src/test/java/com/google/errorprone/bugpatterns/DefaultCharsetTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package com.google.errorprone.bugpatterns;
1818

19-
import static com.google.common.truth.TruthJUnit.assume;
20-
2119
import com.google.errorprone.BugCheckerRefactoringTestHelper;
2220
import com.google.errorprone.BugCheckerRefactoringTestHelper.FixChoosers;
2321
import com.google.errorprone.CompilationTestHelper;
@@ -588,7 +586,6 @@ void f() throws Exception {
588586

589587
@Test
590588
public void withVar() {
591-
assume().that(Runtime.version().feature()).isAtLeast(15);
592589
refactoringTest()
593590
.addInputLines(
594591
"in/Test.java",

‎core/src/test/java/com/google/errorprone/bugpatterns/DefaultLocaleTest.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package com.google.errorprone.bugpatterns;
1818

1919
import static com.google.common.base.Predicates.containsPattern;
20-
import static com.google.common.truth.TruthJUnit.assume;
2120
import static com.google.errorprone.bugpatterns.DefaultLocale.onlyContainsSpecifiersInAllowList;
2221
import static java.util.function.Predicate.not;
2322
import static org.junit.Assert.assertFalse;
@@ -143,7 +142,6 @@ public void formatMethods_negative() {
143142

144143
@Test
145144
public void stringFormatted() {
146-
assume().that(Runtime.version().feature()).isAtLeast(15);
147145
compilationHelper
148146
.addSourceLines(
149147
"Test.java",
@@ -233,7 +231,6 @@ void f(DateTimeFormatterBuilder dtfb) throws Exception {
233231

234232
@Test
235233
public void factoryMethodsJdk12plus() {
236-
assume().that(Runtime.version().feature()).isAtLeast(12);
237234
compilationHelper
238235
.addSourceLines(
239236
"Test.java",
@@ -311,7 +308,6 @@ public void resourceBundle() {
311308

312309
@Test
313310
public void resourceBundleJdk9plus() {
314-
assume().that(Runtime.version().feature()).isAtLeast(9);
315311
compilationHelper
316312
.addSourceLines(
317313
"Test.java",

‎core/src/test/java/com/google/errorprone/bugpatterns/FallThroughTest.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package com.google.errorprone.bugpatterns;
1818

19-
import static com.google.common.truth.TruthJUnit.assume;
20-
2119
import com.google.errorprone.CompilationTestHelper;
2220
import org.junit.Ignore;
2321
import org.junit.Test;
@@ -340,7 +338,6 @@ void f(char c, boolean b) {
340338

341339
@Test
342340
public void arrowSwitch() {
343-
assume().that(Runtime.version().feature()).isAtLeast(14);
344341
testHelper
345342
.addSourceLines(
346343
"Test.java",
@@ -366,7 +363,6 @@ void m(Case c) {
366363
@Ignore("https://github.com/google/error-prone/issues/2638")
367364
@Test
368365
public void i2118() {
369-
assume().that(Runtime.version().feature()).isAtLeast(14);
370366
testHelper
371367
.addSourceLines(
372368
"Test.java",

‎core/src/test/java/com/google/errorprone/bugpatterns/FieldCanBeStaticTest.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package com.google.errorprone.bugpatterns;
1818

19-
import static com.google.common.truth.TruthJUnit.assume;
20-
2119
import com.google.errorprone.BugCheckerRefactoringTestHelper;
2220
import com.google.errorprone.CompilationTestHelper;
2321
import org.junit.Test;
@@ -351,7 +349,6 @@ class L {
351349

352350
@Test
353351
public void inner_static() {
354-
assume().that(Runtime.version().feature()).isAtLeast(16);
355352
compilationHelper
356353
.addSourceLines(
357354
"Test.java",
@@ -394,7 +391,6 @@ class L {
394391

395392
@Test
396393
public void record() {
397-
assume().that(Runtime.version().feature()).isAtLeast(16);
398394
compilationHelper
399395
.addSourceLines(
400396
"ExampleClass.java",

‎core/src/test/java/com/google/errorprone/bugpatterns/MethodCanBeStaticTest.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package com.google.errorprone.bugpatterns;
1818

19-
import static com.google.common.truth.TruthJUnit.assume;
20-
2119
import com.google.common.collect.ImmutableList;
2220
import com.google.errorprone.BugCheckerRefactoringTestHelper;
2321
import com.google.errorprone.CompilationTestHelper;
@@ -422,7 +420,6 @@ private int incr(int x) {
422420

423421
@Test
424422
public void innerClass_static() {
425-
assume().that(Runtime.version().feature()).isAtLeast(16);
426423
testHelper
427424
.addSourceLines(
428425
"Test.java",
@@ -491,7 +488,6 @@ private void foo() {}
491488

492489
@Test
493490
public void positiveLocal() {
494-
assume().that(Runtime.version().feature()).isAtLeast(16);
495491
testHelper
496492
.addSourceLines(
497493
"Test.java",

‎core/src/test/java/com/google/errorprone/bugpatterns/MisformattedTestDataTest.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.google.errorprone.bugpatterns;
1818

19-
import static com.google.common.truth.TruthJUnit.assume;
2019
import static com.google.errorprone.BugCheckerRefactoringTestHelper.TestMode.TEXT_MATCH;
2120

2221
import com.google.errorprone.BugCheckerRefactoringTestHelper;
@@ -34,8 +33,6 @@ public final class MisformattedTestDataTest {
3433

3534
@Test
3635
public void alreadyFormatted_noFinding() {
37-
assume().that(Runtime.version().feature()).isAtLeast(14);
38-
3936
compilationHelper
4037
.addSourceLines(
4138
"Test.java",
@@ -63,8 +60,6 @@ void method() {
6360

6461
@Test
6562
public void onlyDiffersByFinalNewline_noFinding() {
66-
assume().that(Runtime.version().feature()).isAtLeast(14);
67-
6863
compilationHelper
6964
.addSourceLines(
7065
"Test.java",
@@ -91,8 +86,6 @@ void method() {
9186

9287
@Test
9388
public void misformatted_suggestsFix() {
94-
assume().that(Runtime.version().feature()).isAtLeast(14);
95-
9689
refactoringHelper
9790
.addInputLines(
9891
"Test.java",
@@ -141,8 +134,6 @@ void method() {
141134

142135
@Test
143136
public void onlyDiffersByIndentation_notReindented() {
144-
assume().that(Runtime.version().feature()).isAtLeast(14);
145-
146137
refactoringHelper
147138
.addInputLines(
148139
"Test.java",
@@ -171,8 +162,6 @@ void method() {
171162

172163
@Test
173164
public void escapesSpecialCharacters() {
174-
assume().that(Runtime.version().feature()).isAtLeast(14);
175-
176165
refactoringHelper
177166
.addInputLines(
178167
"Test.java",

0 commit comments

Comments
 (0)