Skip to content

Commit 894c511

Browse files
committed
Prepare rewrite-java-17 for java-based tests
1 parent 206fbfb commit 894c511

File tree

5 files changed

+64
-126
lines changed

5 files changed

+64
-126
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
root = true
2+
3+
[*.java]
4+
indent_size = 4
5+
ij_continuation_indent_size = 2
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
package org.openrewrite.java.cleanup;
2+
3+
import org.junit.jupiter.api.Test;
4+
import org.junit.jupiter.api.extension.ExtendWith;
5+
import org.openrewrite.java.JavaParserResolver;
6+
import org.openrewrite.test.RecipeSpec;
7+
import org.openrewrite.test.RewriteTest;
8+
9+
import static org.openrewrite.java.Assertions.java;
10+
11+
@ExtendWith(JavaParserResolver.class)
12+
class UseDiamondOperatorWithVarTest implements RewriteTest {
13+
@Override
14+
public void defaults(RecipeSpec spec) {
15+
spec.recipe(new UseDiamondOperator());
16+
}
17+
18+
@SuppressWarnings("Convert2Diamond")
19+
@Test
20+
void doNotConvertVar() {
21+
rewriteRun(
22+
java(
23+
"""
24+
import java.util.*;
25+
class Test {
26+
void test() {
27+
var ls1 = new ArrayList<String>();
28+
List<String> ls2 = new ArrayList<String>();
29+
}
30+
}
31+
""",
32+
"""
33+
import java.util.*;
34+
class Test {
35+
void test() {
36+
var ls1 = new ArrayList<String>();
37+
List<String> ls2 = new ArrayList<>();
38+
}
39+
}
40+
"""
41+
)
42+
);
43+
}
44+
}

rewrite-java-17/src/test/java/org/openrewrite/java/isolated/Java17TypeSignatureBuilderTest.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,25 +39,25 @@
3939
@Disabled("Test disabled until we can solve how to load the tests in a classloader that allows access to internal types.")
4040
public class Java17TypeSignatureBuilderTest implements JavaTypeSignatureBuilderTest {
4141
private static final String goat = StringUtils.readFully(
42-
Java17TypeSignatureBuilderTest.class.getResourceAsStream("/JavaTypeGoat.java"));
42+
Java17TypeSignatureBuilderTest.class.getResourceAsStream("/JavaTypeGoat.java"));
4343

4444
private static final JCTree.JCCompilationUnit cu = ReloadableJava17Parser.builder()
45-
.logCompilationWarningsAndErrors(true)
46-
.build()
47-
.parseInputsToCompilerAst(
48-
singletonList(new Parser.Input(Paths.get("JavaTypeGoat.java"), () -> new ByteArrayInputStream(goat.getBytes(StandardCharsets.UTF_8)))),
49-
new InMemoryExecutionContext(Throwable::printStackTrace))
50-
.entrySet()
51-
.iterator()
52-
.next()
53-
.getValue();
45+
.logCompilationWarningsAndErrors(true)
46+
.build()
47+
.parseInputsToCompilerAst(
48+
singletonList(new Parser.Input(Paths.get("JavaTypeGoat.java"), () -> new ByteArrayInputStream(goat.getBytes(StandardCharsets.UTF_8)))),
49+
new InMemoryExecutionContext(Throwable::printStackTrace))
50+
.entrySet()
51+
.iterator()
52+
.next()
53+
.getValue();
5454

5555
@Override
5656
public String fieldSignature(String field) {
5757
return new TreeScanner<String, Integer>() {
5858
@Override
5959
public String visitVariable(VariableTree node, Integer integer) {
60-
if(node.getName().toString().equals(field)) {
60+
if (node.getName().toString().equals(field)) {
6161
return signatureBuilder().variableSignature(((JCTree.JCVariableDecl) node).sym);
6262
}
6363
//noinspection ConstantConditions
@@ -78,7 +78,7 @@ public String methodSignature(String methodName) {
7878
@Override
7979
public String visitMethod(MethodTree node, Integer p) {
8080
JCTree.JCMethodDecl method = (JCTree.JCMethodDecl) node;
81-
if(method.getName().toString().equals(methodName)) {
81+
if (method.getName().toString().equals(methodName)) {
8282
return signatureBuilder().methodSignature(method.type, method.sym);
8383
}
8484
//noinspection ConstantConditions
@@ -99,7 +99,7 @@ public String constructorSignature() {
9999
@Override
100100
public String visitMethod(MethodTree node, Integer p) {
101101
JCTree.JCMethodDecl method = (JCTree.JCMethodDecl) node;
102-
if(method.name.toString().equals("<init>")) {
102+
if (method.name.toString().equals("<init>")) {
103103
return signatureBuilder().methodSignature(method.type, method.sym);
104104
}
105105
//noinspection ConstantConditions
@@ -120,7 +120,7 @@ public Type firstMethodParameter(String methodName) {
120120
@Override
121121
public Type visitMethod(MethodTree node, Integer p) {
122122
JCTree.JCMethodDecl method = (JCTree.JCMethodDecl) node;
123-
if(method.getName().toString().equals(methodName)) {
123+
if (method.getName().toString().equals(methodName)) {
124124
List<JCTree.JCVariableDecl> params = method.getParameters();
125125
return params.iterator().next().type;
126126
}
@@ -142,7 +142,7 @@ public Object innerClassSignature(String innerClassSimpleName) {
142142
@Override
143143
public Type visitClass(ClassTree node, Integer integer) {
144144
JCTree.JCClassDecl clazz = (JCTree.JCClassDecl) node;
145-
if(innerClassSimpleName.equals(clazz.getSimpleName().toString())) {
145+
if (innerClassSimpleName.equals(clazz.getSimpleName().toString())) {
146146
return clazz.type;
147147
}
148148
return super.visitClass(node, integer);

rewrite-java-17/src/test/kotlin/org/openrewrite/java/EnvironmentTest.kt

Lines changed: 0 additions & 54 deletions
This file was deleted.

rewrite-java-17/src/test/kotlin/org/openrewrite/java/cleanup/UseDiamondOperatorWithVarTest.kt

Lines changed: 0 additions & 57 deletions
This file was deleted.

0 commit comments

Comments
 (0)