Skip to content

Commit 5a66684

Browse files
Use type tables for tests (#856)
* Fix failing `RemovalsServletJakarta10Test` tests Now using type tables. * Remove `logCompilationWarningsAndErrors()` call * Fix another failing test * Move test classpath jars to type table
1 parent 1111d4a commit 5a66684

20 files changed

+20
-5
lines changed

build.gradle.kts

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,23 @@ recipeDependencies {
1515
parserClasspath("javax.annotation:javax.annotation-api:1.3.2")
1616
parserClasspath("com.google.guava:guava:33.5.0-jre")
1717
parserClasspath("com.google.errorprone:error_prone_core:2.+")
18+
19+
testParserClasspath("com.sun.faces:jsf-api:2.1.29-11")
20+
testParserClasspath("jakarta.el:jakarta.el-api:4.0.0")
21+
testParserClasspath("jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1")
22+
testParserClasspath("jakarta.faces:jakarta.faces-api:3.0.0")
23+
testParserClasspath("jakarta.faces:jakarta.faces-api:4.0.0-M6")
24+
testParserClasspath("jakarta.faces:jakarta.faces-api:4.0.1")
25+
testParserClasspath("jakarta.servlet:jakarta.servlet-api:4.0.2")
26+
testParserClasspath("jakarta.servlet:jakarta.servlet-api:5.0.0")
27+
testParserClasspath("jakarta.ws.rs:jakarta.ws.rs-api:3.1.0")
28+
testParserClasspath("jakarta.xml.soap:jakarta.xml.soap-api:2.0.1")
29+
testParserClasspath("javax.enterprise:cdi-api:2.0.SP1")
30+
testParserClasspath("javax.servlet:javax.servlet-api:4.0.1")
31+
testParserClasspath("org.apache.ws.security:wss4j:1.6.19")
32+
testParserClasspath("org.apache.wss4j:wss4j-ws-security-common:2.0.0")
33+
testParserClasspath("org.glassfish:jakarta.faces:2.3.19")
34+
testParserClasspath("org.glassfish:jakarta.faces:3.0.3")
1835
}
1936

2037
val rewriteVersion = rewriteRecipe.rewriteVersion.get()
@@ -76,7 +93,6 @@ dependencies {
7693
testRuntimeOnly("com.google.code.findbugs:jsr305:3.0.2")
7794
testRuntimeOnly("javax.mail:mail:1.4.7")
7895
testRuntimeOnly("javax.mail:javax.mail-api:1.6.2")
79-
testRuntimeOnly("javax.servlet:javax.servlet-api:4.0.1")
8096
testRuntimeOnly("javax.ws.rs:javax.ws.rs-api:2.1.1")
8197
testRuntimeOnly(gradleApi())
8298
}

src/test/java/org/openrewrite/java/migrate/jakarta/JavaxServletToJakartaServletTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package org.openrewrite.java.migrate.jakarta;
1717

1818
import org.junit.jupiter.api.Test;
19+
import org.openrewrite.InMemoryExecutionContext;
1920
import org.openrewrite.java.JavaParser;
2021
import org.openrewrite.test.RecipeSpec;
2122
import org.openrewrite.test.RewriteTest;
@@ -28,7 +29,7 @@ class JavaxServletToJakartaServletTest implements RewriteTest {
2829
@Override
2930
public void defaults(RecipeSpec spec) {
3031
spec.parser(JavaParser.fromJavaVersion()
31-
.classpath("javax.servlet-api-4.0.1"))
32+
.classpathFromResources(new InMemoryExecutionContext(), "javax.servlet-api-4.0.1"))
3233
.recipeFromResource(
3334
"/META-INF/rewrite/jakarta-ee-9.yml",
3435
"org.openrewrite.java.migrate.jakarta.JavaxServletToJakartaServlet");

src/test/java/org/openrewrite/java/migrate/jakarta/RemovalsServletJakarta10Test.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ class RemovalsServletJakarta10Test implements RewriteTest {
2929
public void defaults(RecipeSpec spec) {
3030
spec.parser(JavaParser.fromJavaVersion()
3131
.classpathFromResources(new InMemoryExecutionContext(),
32-
"javax.servlet-api-4.0.0",
33-
"jakarta.servlet-api-5.0.0",
34-
"jakarta.servlet-api-6.0.0"))
32+
"jakarta.servlet-api-5.0"))
3533
.recipeFromResource("/META-INF/rewrite/jakarta-ee-10.yml", "org.openrewrite.java.migrate.jakarta.RemovalsServletJakarta10");
3634
}
3735

631 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)