diff --git a/javaparser-symbol-solver-testing/pom.xml b/javaparser-symbol-solver-testing/pom.xml
index 8b8e075f8d..40e83cf147 100644
--- a/javaparser-symbol-solver-testing/pom.xml
+++ b/javaparser-symbol-solver-testing/pom.xml
@@ -117,6 +117,10 @@
org.junit.jupiter
junit-jupiter-engine
+
+ org.junit.jupiter
+ junit-jupiter-params
+
com.github.javaparser
javaparser-symbol-solver-logic
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue235.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue235.java
index 63c713c609..e9eaee1e30 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue235.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue235.java
@@ -10,24 +10,16 @@
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.symbolsolver.resolution.AbstractResolutionTest;
import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
import java.util.Arrays;
import java.util.Collection;
-@RunWith(Parameterized.class)
-public class Issue235 extends AbstractResolutionTest{
- private final String method;
+class Issue235 extends AbstractResolutionTest{
- public Issue235(String method) {
- this.method = method;
- }
-
- @Parameterized.Parameters(name = "{0}")
- public static Collection data() throws Exception {
+ static Collection data() {
return Arrays.asList(
"new_Bar_Baz_direct",
"new_Bar_Baz",
@@ -36,15 +28,16 @@ public static Collection data() throws Exception {
);
}
- @Test
- public void issue235() {
+ @ParameterizedTest
+ @MethodSource("data")
+ void issue235(String method) {
CompilationUnit cu = parseSample("Issue235");
ClassOrInterfaceDeclaration cls = Navigator.demandClassOrInterface(cu, "Foo");
TypeSolver typeSolver = new ReflectionTypeSolver();
JavaParserFacade javaParserFacade = JavaParserFacade.get(typeSolver);
- MethodDeclaration m = Navigator.demandMethod(cls, this.method);
+ MethodDeclaration m = Navigator.demandMethod(cls, method);
ExpressionStmt stmt = (ExpressionStmt) m.getBody().get().getStatements().get(0);
ObjectCreationExpr expression = (ObjectCreationExpr) stmt.getExpression();
- Assert.assertNotNull(javaParserFacade.convertToUsage(expression.getType()));
+ Assertions.assertNotNull(javaParserFacade.convertToUsage(expression.getType()));
}
}
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/CombinedTypeSolverTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/CombinedTypeSolverTest.java
index 2772befd01..affa0d04e5 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/CombinedTypeSolverTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/CombinedTypeSolverTest.java
@@ -16,29 +16,24 @@
package com.github.javaparser.symbolsolver.resolution.typesolvers;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
import java.util.Arrays;
import java.util.List;
import java.util.function.Predicate;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
import com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclaration;
import com.github.javaparser.symbolsolver.model.resolution.SymbolReference;
import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver.ExceptionHandlers;
-@RunWith(Parameterized.class)
-public class CombinedTypeSolverTest {
+class CombinedTypeSolverTest {
- @Parameters
- public static List
+
+ org.junit.jupiter
+ junit-jupiter-params
+ 5.3.1
+ test
+
org.junit.vintage
junit-vintage-engine