fix test errors for JDK9

3 files changed, 49 insertions, 16 deletions

diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/AbstractTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/AbstractTest.java
index e68a239ab..911211b3c 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/AbstractTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/AbstractTest.java
@@ -36,4 +36,12 @@ public abstract class AbstractTest {
     protected static String adaptPath(String path) {
         return adaptPath(new File(path)).getPath();
     }
+
+    protected boolean isJava9() {
+        return System.getProperty("java.version").startsWith("9.");
+    }
+
+    protected boolean isJava8() {
+        return System.getProperty("java.version").startsWith("1.8.");
+    }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclarationTest.java
index a8d74abc0..4c8f69a6d 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclarationTest.java
@@ -20,6 +20,7 @@ import com.github.javaparser.ast.AccessSpecifier;
 import com.github.javaparser.resolution.declarations.*;
 import com.github.javaparser.resolution.types.ResolvedReferenceType;
 import com.github.javaparser.resolution.types.ResolvedTypeVariable;
+import com.github.javaparser.symbolsolver.AbstractTest;
 import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
 import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl;
 import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
@@ -34,7 +35,7 @@ import java.util.stream.Collectors;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-public class ReflectionClassDeclarationTest {
+public class ReflectionClassDeclarationTest extends AbstractTest {
     
     private TypeSolver typeResolver = new ReflectionTypeSolver(false);
 
@@ -172,15 +173,26 @@ public class ReflectionClassDeclarationTest {
                 .filter(m -> m.accessSpecifier() != AccessSpecifier.PRIVATE && m.accessSpecifier() != AccessSpecifier.DEFAULT)
                 .sorted((a, b) -> a.getName().compareTo(b.getName()))
                 .collect(Collectors.toList());
-        assertEquals(67, methods.size());
+        if (isJava9()) {
+            assertEquals(69, methods.size());
+        } else {
+            assertEquals(67, methods.size());
+        }
         assertEquals("charAt", methods.get(0).getName());
         assertEquals(false, methods.get(0).isAbstract());
         assertEquals(1, methods.get(0).getNumberOfParams());
         assertEquals("int", methods.get(0).getParam(0).getType().describe());
-        assertEquals("concat", methods.get(6).getName());
-        assertEquals(false, methods.get(6).isAbstract());
-        assertEquals(1, methods.get(6).getNumberOfParams());
-        assertEquals("java.lang.String", methods.get(6).getParam(0).getType().describe());
+        if (isJava9()) {
+            assertEquals("compareTo", methods.get(6).getName());
+            assertEquals(false, methods.get(6).isAbstract());
+            assertEquals(1, methods.get(6).getNumberOfParams());
+            assertEquals("java.lang.String", methods.get(6).getParam(0).getType().describe());
+        } else {
+            assertEquals("concat", methods.get(6).getName());
+            assertEquals(false, methods.get(6).isAbstract());
+            assertEquals(1, methods.get(6).getNumberOfParams());
+            assertEquals("java.lang.String", methods.get(6).getParam(0).getType().describe());
+        }
     }
 
     @Test
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclarationTest.java
index 9ace61dde..a52661078 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclarationTest.java
@@ -21,6 +21,7 @@ import com.github.javaparser.resolution.declarations.ResolvedMethodDeclaration;
 import com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclaration;
 import com.github.javaparser.resolution.types.ResolvedReferenceType;
 import com.github.javaparser.resolution.types.ResolvedTypeVariable;
+import com.github.javaparser.symbolsolver.AbstractTest;
 import com.github.javaparser.symbolsolver.model.resolution.TypeSolver;
 import com.github.javaparser.symbolsolver.model.typesystem.ReferenceTypeImpl;
 import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
@@ -35,7 +36,7 @@ import java.util.stream.Collectors;
 
 import static org.junit.Assert.assertEquals;
 
-public class ReflectionInterfaceDeclarationTest {
+public class ReflectionInterfaceDeclarationTest extends AbstractTest {
 
     @Test
     public void testGetDeclaredMethods() {
@@ -44,15 +45,27 @@ public class ReflectionInterfaceDeclarationTest {
         List<ResolvedMethodDeclaration> methods = list.getDeclaredMethods().stream()
                 .sorted((a, b) -> a.getName().compareTo(b.getName()))
                 .collect(Collectors.toList());
-        assertEquals(28, methods.size());
-        assertEquals("clear", methods.get(4).getName());
-        assertEquals(true, methods.get(4).isAbstract());
-        assertEquals(0, methods.get(4).getNumberOfParams());
-        assertEquals("contains", methods.get(5).getName());
-        assertEquals(true, methods.get(5).isAbstract());
-        assertEquals(1, methods.get(5).getNumberOfParams());
-        assertEquals(true, methods.get(5).getParam(0).getType().isReferenceType());
-        assertEquals(Object.class.getCanonicalName(), methods.get(5).getParam(0).getType().asReferenceType().getQualifiedName());
+        if (isJava9()) {
+            assertEquals(40, methods.size());
+            assertEquals("clear", methods.get(4).getName());
+            assertEquals(true, methods.get(4).isAbstract());
+            assertEquals(0, methods.get(4).getNumberOfParams());
+            assertEquals("contains", methods.get(5).getName());
+            assertEquals(true, methods.get(5).isAbstract());
+            assertEquals(1, methods.get(5).getNumberOfParams());
+            assertEquals(true, methods.get(5).getParam(0).getType().isReferenceType());
+            assertEquals(Object.class.getCanonicalName(), methods.get(5).getParam(0).getType().asReferenceType().getQualifiedName());
+        } else {
+            assertEquals(28, methods.size());
+            assertEquals("clear", methods.get(4).getName());
+            assertEquals(true, methods.get(4).isAbstract());
+            assertEquals(0, methods.get(4).getNumberOfParams());
+            assertEquals("contains", methods.get(5).getName());
+            assertEquals(true, methods.get(5).isAbstract());
+            assertEquals(1, methods.get(5).getNumberOfParams());
+            assertEquals(true, methods.get(5).getParam(0).getType().isReferenceType());
+            assertEquals(Object.class.getCanonicalName(), methods.get(5).getParam(0).getType().asReferenceType().getQualifiedName());
+        }
     }
 
     @Test