Skip to content

Update some tests for var position handling to pass on JDK 26 #5665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Mar 25, 2026
+34 −7
Merged

Update some tests for var position handling to pass on JDK 26 #5665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 31 additions & 5 deletions test_helpers/src/test/java/com/google/errorprone/BugCheckerRefactoringTestHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,18 +327,16 @@ public static class ReplaceVarTypes extends BugChecker implements VariableTreeMa
@Override
public Description matchVariable(VariableTree tree, VisitorState state) {
Tree type = tree.getType();
if (ASTHelpers.hasExplicitSource(type, state)) {
return Description.NO_MATCH;
}
return describeMatch(type, SuggestedFix.replace(type, "Object"));
}
}

@SuppressWarnings("MissingTestCall") // used in a method reference in assertThrows
@Test
public void replaceVarTypes() {
// after JDK-8358604, var types have source positions
assume().that(Runtime.version().feature()).isLessThan(27);
// after JDK-8358604 in JDK 27, var types have source positions
// after JDK-8359383 in JDK 26, var type start and end positions are the same
assume().that(Runtime.version().feature()).isLessThan(26);
BugCheckerRefactoringTestHelper helper =
BugCheckerRefactoringTestHelper.newInstance(ReplaceVarTypes.class, getClass())
.addInputLines(
Expand All @@ -362,4 +360,32 @@ public void foo() {
""");
assertThat(e).hasMessageThat().contains("BugPattern: ReplaceVarTypes");
}

@Test
public void varTypeSourcePositions() {
// after JDK-8358604 in JDK 27, var types have source positions
assume().that(Runtime.version().feature()).isAtLeast(27);
BugCheckerRefactoringTestHelper.newInstance(ReplaceVarTypes.class, getClass())
.addInputLines(
"Test.java",
"""
public class Test {
public void foo() {
var x = 1 + 2;
System.out.println(x);
}
}
""")
.addOutputLines(
"out/Test.java",
"""
public class Test {
public void foo() {
Object x = 1 + 2;
System.out.println(x);
}
}
""")
.doTest();
}
}
5 changes: 3 additions & 2 deletions test_helpers/src/test/java/com/google/errorprone/CompilationTestHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,8 +546,9 @@ public Description matchVariable(VariableTree tree, VisitorState state) {
@SuppressWarnings("MissingTestCall") // used in a method reference in assertThrows
@Test
public void replaceVarTypes() {
// after JDK-8358604, var types have source positions
assume().that(Runtime.version().feature()).isLessThan(27);
// after JDK-8358604 in JDK 27, var types have source positions
// after JDK-8359383 in JDK 26, var type start and end positions are the same
assume().that(Runtime.version().feature()).isLessThan(26);
var compilationTestHelper =
CompilationTestHelper.newInstance(ReplaceVarTypes.class, getClass())
.addSourceLines(
Expand Down
Loading