Put aside old JavaParser source code

289 files changed, 750 insertions, 755 deletions

diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/JavaParserAPIIntegrationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/JavaParserAPIIntegrationTest.java
index bbd76e05f..eb3072265 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/JavaParserAPIIntegrationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/JavaParserAPIIntegrationTest.java
@@ -32,11 +32,11 @@ public class JavaParserAPIIntegrationTest extends AbstractTest {
 
     @Before
     public void setup() {
-        File src = adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-core"));
+        File src = adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-core"));
         CombinedTypeSolver combinedTypeSolverNewCode = new CombinedTypeSolver();
         combinedTypeSolverNewCode.add(new ReflectionTypeSolver());
         combinedTypeSolverNewCode.add(new JavaParserTypeSolver(src));
-        combinedTypeSolverNewCode.add(new JavaParserTypeSolver(adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-generated-sources"))));
+        combinedTypeSolverNewCode.add(new JavaParserTypeSolver(adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources"))));
         typeSolver = combinedTypeSolverNewCode;
 
         TypeSolver ts = new ReflectionTypeSolver();
@@ -68,7 +68,7 @@ public class JavaParserAPIIntegrationTest extends AbstractTest {
 
     @Test
     public void classDeclarationResolve() throws IOException {
-        File f = adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/CompilationUnit.java"));
+        File f = adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/CompilationUnit.java"));
         CompilationUnit cu = parseWithSymbolResolution(f);
         ClassOrInterfaceDeclaration declaration = (ClassOrInterfaceDeclaration)cu.getType(0);
         declaration.resolve();
@@ -92,7 +92,7 @@ public class JavaParserAPIIntegrationTest extends AbstractTest {
 
     @Test
     public void constructorDeclarationResolve() throws IOException {
-        File f = adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/CompilationUnit.java"));
+        File f = adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/CompilationUnit.java"));
         CompilationUnit cu = parseWithSymbolResolution(f);
         ClassOrInterfaceDeclaration classOrInterfaceDeclaration = (ClassOrInterfaceDeclaration)cu.getType(0);
         ConstructorDeclaration constructorDeclaration = classOrInterfaceDeclaration.getDefaultConstructor().get();
@@ -100,7 +100,7 @@ public class JavaParserAPIIntegrationTest extends AbstractTest {
     }
     @Test
     public void enumDeclarationResolve() throws IOException {
-        File f = adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/AccessSpecifier.java"));
+        File f = adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/AccessSpecifier.java"));
         CompilationUnit cu = parseWithSymbolResolution(f);
         EnumDeclaration declaration = (EnumDeclaration) cu.getType(0);
         assertEquals("AccessSpecifier", declaration.getNameAsString());
@@ -109,7 +109,7 @@ public class JavaParserAPIIntegrationTest extends AbstractTest {
 
     @Test
     public void enumConstantDeclarationResolve() throws IOException {
-        File f = adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/AccessSpecifier.java"));
+        File f = adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/AccessSpecifier.java"));
         CompilationUnit cu = parseWithSymbolResolution(f);
         EnumDeclaration enumDeclaration = (EnumDeclaration) cu.getType(0);
         assertEquals("AccessSpecifier", enumDeclaration.getNameAsString());
@@ -120,7 +120,7 @@ public class JavaParserAPIIntegrationTest extends AbstractTest {
 
     @Test
     public void fieldDeclarationResolve() throws IOException {
-        File f = adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/CompilationUnit.java"));
+        File f = adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/CompilationUnit.java"));
         CompilationUnit cu = parseWithSymbolResolution(f);
         ClassOrInterfaceDeclaration classDeclaration = (ClassOrInterfaceDeclaration) cu.getType(0);
         assertEquals("CompilationUnit", classDeclaration.getNameAsString());
@@ -132,7 +132,7 @@ public class JavaParserAPIIntegrationTest extends AbstractTest {
 
     @Test
     public void methodDeclarationResolve() throws IOException {
-        File f = adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/CompilationUnit.java"));
+        File f = adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/CompilationUnit.java"));
         CompilationUnit cu = parseWithSymbolResolution(f);
         ClassOrInterfaceDeclaration classDeclaration = (ClassOrInterfaceDeclaration) cu.getType(0);
         assertEquals("CompilationUnit", classDeclaration.getNameAsString());
@@ -144,7 +144,7 @@ public class JavaParserAPIIntegrationTest extends AbstractTest {
 
     @Test
     public void parameterDeclarationResolve() throws IOException {
-        File f = adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/CompilationUnit.java"));
+        File f = adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/CompilationUnit.java"));
         ParserConfiguration parserConfiguration = new ParserConfiguration();
         parserConfiguration.setSymbolResolver(new JavaSymbolSolver(typeSolver));
         CompilationUnit cu = new JavaParser(parserConfiguration).parse(ParseStart.COMPILATION_UNIT, new StreamProvider(new FileInputStream(f))).getResult().get();
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/DifferentiateDotExpressionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/DifferentiateDotExpressionTest.java
index b0af2d901..da4b3cb29 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/DifferentiateDotExpressionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/DifferentiateDotExpressionTest.java
@@ -31,7 +31,7 @@ public class DifferentiateDotExpressionTest extends AbstractResolutionTest {
     }
 
     @Test
-    public void methodCallsFromFieldObjects() throws ParseException {
+    public void methodCallsFromFieldObjects() {
         ClassOrInterfaceDeclaration clazz = ((JavaParserClassDeclaration) typeSolver.solveType("FieldDotExpressions")).getWrappedNode();
         MethodDeclaration mainMethod = Navigator.demandMethod(clazz, "main");
         JavaParserFacade javaParserFacade = JavaParserFacade.get(typeSolver);
@@ -46,7 +46,7 @@ public class DifferentiateDotExpressionTest extends AbstractResolutionTest {
     }
 
     @Test
-    public void staticMethodCallsFromInnerClasses() throws ParseException {
+    public void staticMethodCallsFromInnerClasses() {
         ClassOrInterfaceDeclaration clazz = ((JavaParserClassDeclaration) typeSolver.solveType("InnerClassDotExpressions")).getWrappedNode();
         MethodDeclaration mainMethod = Navigator.demandMethod(clazz, "main");
         JavaParserFacade javaParserFacade = JavaParserFacade.get(typeSolver);
@@ -72,7 +72,7 @@ public class DifferentiateDotExpressionTest extends AbstractResolutionTest {
     }
 
     @Test
-    public void packageStaticMethodCalls() throws ParseException {
+    public void packageStaticMethodCalls() {
         ClassOrInterfaceDeclaration clazz = ((JavaParserClassDeclaration) typeSolver.solveType("PackageDotExpressions")).getWrappedNode();
         MethodDeclaration mainMethod = Navigator.demandMethod(clazz, "main");
         JavaParserFacade javaParserFacade = JavaParserFacade.get(typeSolver);
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclarationTest.java
index 7e26b9fef..0e70b1807 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclarationTest.java
@@ -58,18 +58,18 @@ public class JavaParserClassDeclarationTest extends AbstractTest {
 
     @Before
     public void setup() {
-        File src = adaptPath(new File("src/test/resources/javaparser_src/proper_source"));
+        File src = adaptPath(new File("src/test/test_sourcecode/javaparser_src/proper_source"));
         CombinedTypeSolver combinedTypeSolver = new CombinedTypeSolver();
         combinedTypeSolver.add(new ReflectionTypeSolver());
         combinedTypeSolver.add(new JavaParserTypeSolver(src));
-        combinedTypeSolver.add(new JavaParserTypeSolver(adaptPath(new File("src/test/resources/javaparser_src/generated"))));
+        combinedTypeSolver.add(new JavaParserTypeSolver(adaptPath(new File("src/test/test_sourcecode/javaparser_src/generated"))));
         typeSolver = combinedTypeSolver;
 
-        File srcNewCode = adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-core"));
+        File srcNewCode = adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-core"));
         CombinedTypeSolver combinedTypeSolverNewCode = new CombinedTypeSolver();
         combinedTypeSolverNewCode.add(new ReflectionTypeSolver());
         combinedTypeSolverNewCode.add(new JavaParserTypeSolver(srcNewCode));
-        combinedTypeSolverNewCode.add(new JavaParserTypeSolver(adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-generated-sources"))));
+        combinedTypeSolverNewCode.add(new JavaParserTypeSolver(adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources"))));
         typeSolverNewCode = combinedTypeSolverNewCode;
 
         TypeSolver ts = new ReflectionTypeSolver();
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclarationTest.java
index 5852814ee..c171f4b94 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclarationTest.java
@@ -34,11 +34,11 @@ public class JavaParserEnumDeclarationTest extends AbstractTest {
 
     @Before
     public void setup() {
-        File srcNewCode = adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-core"));
+        File srcNewCode = adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-core"));
         CombinedTypeSolver combinedTypeSolverNewCode = new CombinedTypeSolver();
         combinedTypeSolverNewCode.add(new ReflectionTypeSolver());
         combinedTypeSolverNewCode.add(new JavaParserTypeSolver(srcNewCode));
-        combinedTypeSolverNewCode.add(new JavaParserTypeSolver(adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-generated-sources"))));
+        combinedTypeSolverNewCode.add(new JavaParserTypeSolver(adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources"))));
         typeSolver = combinedTypeSolverNewCode;
     }
 
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclarationTest.java
index d31c1f8bf..cf5e5802b 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclarationTest.java
@@ -34,11 +34,11 @@ public class JavaParserInterfaceDeclarationTest extends AbstractTest {
 
     @Before
     public void setup() {
-        File srcNewCode = adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-core"));
+        File srcNewCode = adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-core"));
         CombinedTypeSolver combinedTypeSolverNewCode = new CombinedTypeSolver();
         combinedTypeSolverNewCode.add(new ReflectionTypeSolver());
         combinedTypeSolverNewCode.add(new JavaParserTypeSolver(srcNewCode));
-        combinedTypeSolverNewCode.add(new JavaParserTypeSolver(adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-generated-sources"))));
+        combinedTypeSolverNewCode.add(new JavaParserTypeSolver(adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources"))));
         typeSolver = combinedTypeSolverNewCode;
     }
 
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AbstractResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AbstractResolutionTest.java
index 2f4c9f541..ded9267d8 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AbstractResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AbstractResolutionTest.java
@@ -28,23 +28,19 @@ import java.io.InputStream;
  */
 public abstract class AbstractResolutionTest extends AbstractTest {
 
-    protected CompilationUnit parseSampleWithStandardExtension(String sampleName) throws ParseException {
+    protected CompilationUnit parseSampleWithStandardExtension(String sampleName) {
         return parseSample(sampleName, "java");
     }
 
-    protected CompilationUnit parseSample(String sampleName) throws ParseException {
+    protected CompilationUnit parseSample(String sampleName) {
         return parseSample(sampleName, "java.txt");
     }
 
-    private CompilationUnit parseSample(String sampleName, String extension) throws ParseException {
+    private CompilationUnit parseSample(String sampleName, String extension) {
         InputStream is = this.getClass().getClassLoader().getResourceAsStream(sampleName + "." + extension);
         if (is == null) {
             throw new RuntimeException("Unable to find sample " + sampleName);
         }
-        CompilationUnit cu = JavaParser.parse(is);
-        if (cu == null) {
-            throw new IllegalStateException();
-        }
-        return cu;
+        return JavaParser.parse(is);
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseJavaParserTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseJavaParserTest.java
index e90f5c8d0..7b9f61b29 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseJavaParserTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseJavaParserTest.java
@@ -38,13 +38,13 @@ import static org.junit.Assert.assertTrue;
 @Category(SlowTest.class)
 public class AnalyseJavaParserTest extends AbstractTest {
 
-    private static final File src = adaptPath(new File("src/test/resources/javaparser_src/proper_source"));
+    private static final File src = adaptPath(new File("src/test/test_sourcecode/javaparser_src/proper_source"));
 
     private SourceFileInfoExtractor getSourceFileInfoExtractor() {
         CombinedTypeSolver combinedTypeSolver = new CombinedTypeSolver();
         combinedTypeSolver.add(new ReflectionTypeSolver());
         combinedTypeSolver.add(new JavaParserTypeSolver(src));
-        combinedTypeSolver.add(new JavaParserTypeSolver(adaptPath(new File("src/test/resources/javaparser_src/generated"))));
+        combinedTypeSolver.add(new JavaParserTypeSolver(adaptPath(new File("src/test/test_sourcecode/javaparser_src/generated"))));
         SourceFileInfoExtractor sourceFileInfoExtractor = new SourceFileInfoExtractor();
         sourceFileInfoExtractor.setTypeSolver(combinedTypeSolver);
         sourceFileInfoExtractor.setPrintFileName(false);
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseNewJavaParserHelpersTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseNewJavaParserHelpersTest.java
index 7ba9c00d5..254609e0c 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseNewJavaParserHelpersTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseNewJavaParserHelpersTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertEquals;
  */
 public class AnalyseNewJavaParserHelpersTest extends AbstractResolutionTest {
 
-    private static final File src = adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-core"));
+    private static final File src = adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-core"));
 
     private static TypeSolver TYPESOLVER = typeSolver();
 
@@ -48,14 +48,13 @@ public class AnalyseNewJavaParserHelpersTest extends AbstractResolutionTest {
         CombinedTypeSolver combinedTypeSolver = new CombinedTypeSolver();
         combinedTypeSolver.add(new ReflectionTypeSolver());
         combinedTypeSolver.add(new JavaParserTypeSolver(src));
-        combinedTypeSolver.add(new JavaParserTypeSolver(adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-generated-sources"))));
+        combinedTypeSolver.add(new JavaParserTypeSolver(adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources"))));
         return combinedTypeSolver;
     }
 
-    private CompilationUnit parse(String fileName) throws IOException, ParseException {
+    private CompilationUnit parse(String fileName) throws IOException {
         File sourceFile = new File(src.getAbsolutePath() + "/" + fileName + ".java");
-        CompilationUnit cu = JavaParser.parse(sourceFile);
-        return cu;
+        return JavaParser.parse(sourceFile);
     }
 
 //    @Test
@@ -81,9 +80,9 @@ public class AnalyseNewJavaParserHelpersTest extends AbstractResolutionTest {
 //    }
 
     @Test
-    public void nodesTypeIsCorrect() throws IOException, ParseException {
+    public void nodesTypeIsCorrect() throws IOException {
         CompilationUnit cu = parse("com/github/javaparser/utils/PositionUtils");
-        NameExpr nodes = Navigator.findAllNodesOfGivenClass(cu, NameExpr.class).stream().filter(it -> it.getName() != null && it.getName().getId().equals("nodes")).findFirst().get();
+        NameExpr nodes = cu.findAll(NameExpr.class).stream().filter(it -> it.getName() != null && it.getName().getId().equals("nodes")).findFirst().get();
         ResolvedType type = JavaParserFacade.get(TYPESOLVER).solve(nodes).getCorrespondingDeclaration().getType();
         assertEquals("java.util.List<T>", type.describe());
         assertEquals(1, type.asReferenceType().typeParametersValues().size());
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseNewJavaParserTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseNewJavaParserTest.java
index c4561da87..53c0e040e 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseNewJavaParserTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseNewJavaParserTest.java
@@ -40,13 +40,13 @@ import static org.junit.Assert.assertTrue;
 @Category(SlowTest.class)
 public class AnalyseNewJavaParserTest extends AbstractResolutionTest {
 
-    private static final File src = adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-core"));
+    private static final File src = adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-core"));
 
     private static SourceFileInfoExtractor getSourceFileInfoExtractor() {
         CombinedTypeSolver combinedTypeSolver = new CombinedTypeSolver();
         combinedTypeSolver.add(new ReflectionTypeSolver());
         combinedTypeSolver.add(new JavaParserTypeSolver(src));
-        combinedTypeSolver.add(new JavaParserTypeSolver(adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-generated-sources"))));
+        combinedTypeSolver.add(new JavaParserTypeSolver(adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources"))));
         SourceFileInfoExtractor sourceFileInfoExtractor = new SourceFileInfoExtractor();
         sourceFileInfoExtractor.setTypeSolver(combinedTypeSolver);
         sourceFileInfoExtractor.setPrintFileName(false);
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionLogicTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionLogicTest.java
index 8f38529f3..b53607dbd 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionLogicTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionLogicTest.java
@@ -38,11 +38,11 @@ public class MethodsResolutionLogicTest extends AbstractResolutionTest {
 
     @Before
     public void setup() {
-        File srcNewCode = adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-core"));
+        File srcNewCode = adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-core"));
         CombinedTypeSolver combinedTypeSolverNewCode = new CombinedTypeSolver();
         combinedTypeSolverNewCode.add(new ReflectionTypeSolver());
         combinedTypeSolverNewCode.add(new JavaParserTypeSolver(srcNewCode));
-        combinedTypeSolverNewCode.add(new JavaParserTypeSolver(adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-generated-sources"))));
+        combinedTypeSolverNewCode.add(new JavaParserTypeSolver(adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources"))));
         typeSolver = combinedTypeSolverNewCode;
     }
 
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SymbolSolverTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SymbolSolverTest.java
index 8607987f0..eafe60122 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SymbolSolverTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SymbolSolverTest.java
@@ -49,11 +49,11 @@ public class SymbolSolverTest extends AbstractTest {
     @Before
     public void setup() {
 
-        File srcNewCode = adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-core"));
+        File srcNewCode = adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-core"));
         CombinedTypeSolver combinedTypeSolverNewCode = new CombinedTypeSolver();
         combinedTypeSolverNewCode.add(new ReflectionTypeSolver());
         combinedTypeSolverNewCode.add(new JavaParserTypeSolver(srcNewCode));
-        combinedTypeSolverNewCode.add(new JavaParserTypeSolver(adaptPath(new File("src/test/resources/javaparser_new_src/javaparser-generated-sources"))));
+        combinedTypeSolverNewCode.add(new JavaParserTypeSolver(adaptPath(new File("src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources"))));
         typeSolverNewCode = combinedTypeSolverNewCode;
 
         symbolSolver = new SymbolSolver(typeSolverNewCode);
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/CommentsInserter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/CommentsInserter.java
index eee450d20..eee450d20 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/CommentsInserter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/CommentsInserter.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/JavaParser.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/JavaParser.java
index 7fdc77f21..7fdc77f21 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/JavaParser.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/JavaParser.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/PackageLocalClasses.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/PackageLocalClasses.java
index 90a33f5ba..90a33f5ba 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/PackageLocalClasses.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/PackageLocalClasses.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ParseProblemException.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ParseProblemException.java
index f6a029886..f6a029886 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ParseProblemException.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ParseProblemException.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ParseResult.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ParseResult.java
index 88e400525..88e400525 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ParseResult.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ParseResult.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ParseStart.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ParseStart.java
index f94a66282..f94a66282 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ParseStart.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ParseStart.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ParserConfiguration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ParserConfiguration.java
index 0b165b6e2..0b165b6e2 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ParserConfiguration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ParserConfiguration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/Position.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/Position.java
index 312824445..312824445 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/Position.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/Position.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/Problem.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/Problem.java
index 7e45cc987..7e45cc987 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/Problem.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/Problem.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/Providers.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/Providers.java
index b5e731c09..b5e731c09 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/Providers.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/Providers.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/Range.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/Range.java
index 68e364aed..68e364aed 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/Range.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/Range.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/AccessSpecifier.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/AccessSpecifier.java
index f23f8631d..f23f8631d 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/AccessSpecifier.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/AccessSpecifier.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ArrayBracketPair.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ArrayBracketPair.java
index cca0b8761..cca0b8761 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ArrayBracketPair.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ArrayBracketPair.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ArrayCreationLevel.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ArrayCreationLevel.java
index 2edc68c2a..2edc68c2a 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ArrayCreationLevel.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ArrayCreationLevel.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/CompilationUnit.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/CompilationUnit.java
index 2f30777de..2f30777de 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/CompilationUnit.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/CompilationUnit.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Example.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Example.java
index 70cf2cd91..70cf2cd91 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Example.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Example.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ImportDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ImportDeclaration.java
index 863c8d364..863c8d364 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ImportDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ImportDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Modifier.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Modifier.java
index 14ecfe820..3f5a50b45 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Modifier.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Modifier.java
@@ -1,46 +1,46 @@
-package com.github.javaparser.ast;

-

-import java.util.EnumSet;

-

-public enum Modifier {

-	PUBLIC("public"),

-    PROTECTED("protected"),

-	PRIVATE("private"),

-    ABSTRACT("abstract"),

-	STATIC("static"),

-	FINAL("final"),

-    TRANSIENT("transient"), 

-    VOLATILE("volatile"),

-	SYNCHRONIZED("synchronized"),

-	NATIVE("native"),

-	STRICTFP("strictfp");

-

-    String lib;

-

-    private Modifier(String lib) {

-        this.lib = lib;

-    }

-

-    /**

-     * @return the lib

-     */

-    public String getLib() {

-        return lib;

-    }

-

-    public EnumSet<Modifier> toEnumSet() {

-        return EnumSet.of(this);

-    }

-

-    public static AccessSpecifier getAccessSpecifier(EnumSet<Modifier> modifiers) {

-        if (modifiers.contains(Modifier.PUBLIC)) {

-            return AccessSpecifier.PUBLIC;

-        } else if (modifiers.contains(Modifier.PROTECTED)) {

-            return AccessSpecifier.PROTECTED;

-        } else if (modifiers.contains(Modifier.PRIVATE)) {

-            return AccessSpecifier.PRIVATE;

-        } else {

-            return AccessSpecifier.DEFAULT;

-        }

-    }

-}

+package com.github.javaparser.ast;
+
+import java.util.EnumSet;
+
+public enum Modifier {
+	PUBLIC("public"),
+    PROTECTED("protected"),
+	PRIVATE("private"),
+    ABSTRACT("abstract"),
+	STATIC("static"),
+	FINAL("final"),
+    TRANSIENT("transient"), 
+    VOLATILE("volatile"),
+	SYNCHRONIZED("synchronized"),
+	NATIVE("native"),
+	STRICTFP("strictfp");
+
+    String lib;
+
+    private Modifier(String lib) {
+        this.lib = lib;
+    }
+
+    /**
+     * @return the lib
+     */
+    public String getLib() {
+        return lib;
+    }
+
+    public EnumSet<Modifier> toEnumSet() {
+        return EnumSet.of(this);
+    }
+
+    public static AccessSpecifier getAccessSpecifier(EnumSet<Modifier> modifiers) {
+        if (modifiers.contains(Modifier.PUBLIC)) {
+            return AccessSpecifier.PUBLIC;
+        } else if (modifiers.contains(Modifier.PROTECTED)) {
+            return AccessSpecifier.PROTECTED;
+        } else if (modifiers.contains(Modifier.PRIVATE)) {
+            return AccessSpecifier.PRIVATE;
+        } else {
+            return AccessSpecifier.DEFAULT;
+        }
+    }
+}
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Node.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Node.java
index f2bae43b1..f2bae43b1 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Node.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Node.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/PackageDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/PackageDeclaration.java
index 4252ad4e9..4252ad4e9 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/PackageDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/PackageDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/UserDataKey.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/UserDataKey.java
index 4d7caa2e2..4d7caa2e2 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/UserDataKey.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/UserDataKey.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/AnnotationDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/AnnotationDeclaration.java
index 74d84e822..74d84e822 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/AnnotationDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/AnnotationDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
index 66b9dc3a3..66b9dc3a3 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/BodyDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/BodyDeclaration.java
index 9055d96a5..9055d96a5 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/BodyDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/BodyDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java
index 4120d4a71..4120d4a71 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/ConstructorDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/ConstructorDeclaration.java
index 4a9cd2a2a..4a9cd2a2a 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/ConstructorDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/ConstructorDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EmptyMemberDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EmptyMemberDeclaration.java
index 102eb7aa4..102eb7aa4 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EmptyMemberDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EmptyMemberDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EmptyTypeDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EmptyTypeDeclaration.java
index 3a774de99..3a774de99 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EmptyTypeDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EmptyTypeDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EnumConstantDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EnumConstantDeclaration.java
index 646f6c287..646f6c287 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EnumConstantDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EnumConstantDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EnumDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EnumDeclaration.java
index 0ad3089b6..0ad3089b6 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EnumDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EnumDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/FieldDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/FieldDeclaration.java
index aa04a5230..aa04a5230 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/FieldDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/FieldDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/InitializerDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/InitializerDeclaration.java
index adb893f03..adb893f03 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/InitializerDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/InitializerDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/MethodDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/MethodDeclaration.java
index a89103a3b..a89103a3b 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/MethodDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/MethodDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/Parameter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/Parameter.java
index d66b39a00..d66b39a00 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/Parameter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/Parameter.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/TypeDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/TypeDeclaration.java
index 829d37c26..829d37c26 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/TypeDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/TypeDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/VariableDeclarator.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/VariableDeclarator.java
index ff78d6e68..ff78d6e68 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/VariableDeclarator.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/VariableDeclarator.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/VariableDeclaratorId.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/VariableDeclaratorId.java
index b6dccc2aa..b6dccc2aa 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/VariableDeclaratorId.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/VariableDeclaratorId.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/BlockComment.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/BlockComment.java
index 77157d595..77157d595 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/BlockComment.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/BlockComment.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/Comment.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/Comment.java
index 9da994ec4..9da994ec4 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/Comment.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/Comment.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/CommentsCollection.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/CommentsCollection.java
index d02c7a5f0..d02c7a5f0 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/CommentsCollection.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/CommentsCollection.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/JavadocComment.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/JavadocComment.java
index 18b77af28..18b77af28 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/JavadocComment.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/JavadocComment.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/LineComment.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/LineComment.java
index 56b8054d3..56b8054d3 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/LineComment.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/LineComment.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/AnnotationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/AnnotationExpr.java
index a1cad1cdb..a1cad1cdb 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/AnnotationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/AnnotationExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayAccessExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayAccessExpr.java
index b461ea87b..b461ea87b 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayAccessExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayAccessExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayCreationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayCreationExpr.java
index 79d55a56c..79d55a56c 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayCreationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayCreationExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayInitializerExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
index 67c10739b..67c10739b 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/AssignExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/AssignExpr.java
index cf16c6fff..cf16c6fff 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/AssignExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/AssignExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/BinaryExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/BinaryExpr.java
index 83675c8c4..83675c8c4 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/BinaryExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/BinaryExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/BooleanLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
index a42c8c722..a42c8c722 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/CastExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/CastExpr.java
index d2a54bc08..d2a54bc08 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/CastExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/CastExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/CharLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/CharLiteralExpr.java
index e799e887c..e799e887c 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/CharLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/CharLiteralExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ClassExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ClassExpr.java
index a6dc9058d..a6dc9058d 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ClassExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ClassExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ConditionalExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ConditionalExpr.java
index 4dd4c4b0f..4dd4c4b0f 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ConditionalExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ConditionalExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/DoubleLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
index b78923851..b78923851 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/EnclosedExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/EnclosedExpr.java
index a7c40febc..a7c40febc 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/EnclosedExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/EnclosedExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/Expression.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/Expression.java
index f9745646f..f9745646f 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/Expression.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/Expression.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/FieldAccessExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/FieldAccessExpr.java
index 0a4badf5c..0a4badf5c 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/FieldAccessExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/FieldAccessExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/InstanceOfExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/InstanceOfExpr.java
index ffc248ce6..ffc248ce6 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/InstanceOfExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/InstanceOfExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/IntegerLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
index 91f5dec77..91f5dec77 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java
index 2665aafe3..2665aafe3 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LambdaExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LambdaExpr.java
index 4db1b0dfb..4db1b0dfb 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LambdaExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LambdaExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LiteralExpr.java
index 9cafefdc4..9cafefdc4 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LiteralExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LongLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LongLiteralExpr.java
index 0e2e8f299..0e2e8f299 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LongLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LongLiteralExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java
index d46145a4a..d46145a4a 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java
index 1a117ff97..1a117ff97 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MemberValuePair.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MemberValuePair.java
index f87af5dbb..f87af5dbb 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MemberValuePair.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MemberValuePair.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MethodCallExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MethodCallExpr.java
index 98a246455..98a246455 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MethodCallExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MethodCallExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MethodReferenceExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MethodReferenceExpr.java
index d048ca16a..d048ca16a 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MethodReferenceExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MethodReferenceExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NameExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NameExpr.java
index 331fa2af3..331fa2af3 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NameExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NameExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NormalAnnotationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
index 502b11dbd..502b11dbd 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NullLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NullLiteralExpr.java
index cb0a92b83..cb0a92b83 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NullLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NullLiteralExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ObjectCreationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ObjectCreationExpr.java
index 4d06ff8db..4d06ff8db 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ObjectCreationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ObjectCreationExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/QualifiedNameExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/QualifiedNameExpr.java
index dd906310d..dd906310d 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/QualifiedNameExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/QualifiedNameExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
index bd6692c83..bd6692c83 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/StringLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/StringLiteralExpr.java
index f66a594da..f66a594da 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/StringLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/StringLiteralExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/SuperExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/SuperExpr.java
index 3f5e1866c..3f5e1866c 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/SuperExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/SuperExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ThisExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ThisExpr.java
index 117fed53d..117fed53d 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ThisExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ThisExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/TypeExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/TypeExpr.java
index 28b14e19f..28b14e19f 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/TypeExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/TypeExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/UnaryExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/UnaryExpr.java
index eef9101ee..eef9101ee 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/UnaryExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/UnaryExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/VariableDeclarationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
index 5bb0f6299..5bb0f6299 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java
index 71ff7179b..71ff7179b 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithBlockStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithBlockStmt.java
index 611744736..381318b66 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithBlockStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithBlockStmt.java
@@ -1,18 +1,18 @@
-package com.github.javaparser.ast.nodeTypes;

-

-import com.github.javaparser.ast.Node;

-import com.github.javaparser.ast.stmt.BlockStmt;

-

-public interface NodeWithBlockStmt<T> {

-    BlockStmt getBody();

-

-    T setBody(BlockStmt block);

-

-    default BlockStmt createBody() {

-        BlockStmt block = new BlockStmt();

-        setBody(block);

-        block.setParentNode((Node) this);

-

-        return block;

-    }

-}

+package com.github.javaparser.ast.nodeTypes;
+
+import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.stmt.BlockStmt;
+
+public interface NodeWithBlockStmt<T> {
+    BlockStmt getBody();
+
+    T setBody(BlockStmt block);
+
+    default BlockStmt createBody() {
+        BlockStmt block = new BlockStmt();
+        setBody(block);
+        block.setParentNode((Node) this);
+
+        return block;
+    }
+}
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithBody.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithBody.java
index c30bfda3b..2adfe8664 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithBody.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithBody.java
@@ -1,18 +1,18 @@
-package com.github.javaparser.ast.nodeTypes;

-

-import com.github.javaparser.ast.Node;

-import com.github.javaparser.ast.stmt.BlockStmt;

-import com.github.javaparser.ast.stmt.Statement;

-

-public interface NodeWithBody<T> {

-    public Statement getBody();

-

-    public T setBody(final Statement body);

-

-    public default BlockStmt createBlockStatementAsBody() {

-        BlockStmt b = new BlockStmt();

-        b.setParentNode((Node) this);

-        setBody(b);

-        return b;

-    }

-}

+package com.github.javaparser.ast.nodeTypes;
+
+import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.stmt.BlockStmt;
+import com.github.javaparser.ast.stmt.Statement;
+
+public interface NodeWithBody<T> {
+    public Statement getBody();
+
+    public T setBody(final Statement body);
+
+    public default BlockStmt createBlockStatementAsBody() {
+        BlockStmt b = new BlockStmt();
+        b.setParentNode((Node) this);
+        setBody(b);
+        return b;
+    }
+}
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java
index 875d28de0..875d28de0 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithElementType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithElementType.java
index 21a41bad8..21a41bad8 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithElementType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithElementType.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithExtends.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithExtends.java
index 3e83f9b5b..083fc01b1 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithExtends.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithExtends.java
@@ -1,37 +1,37 @@
-package com.github.javaparser.ast.nodeTypes;

-

-import java.util.List;

-

-import com.github.javaparser.ast.Node;

-import com.github.javaparser.ast.type.ClassOrInterfaceType;

-

-public interface NodeWithExtends<T> {

-    public List<ClassOrInterfaceType> getExtends();

-

-    public T setExtends(final List<ClassOrInterfaceType> extendsList);

-

-    /**

-     * Add an extends to this and automatically add the import

-     * 

-     * @param clazz the class to extand from

-     * @return this

-     */

-    public default T addExtends(Class<?> clazz) {

-        ((Node) this).tryAddImportToParentCompilationUnit(clazz);

-        return addExtends(clazz.getSimpleName());

-    }

-

-    /**

-     * Add an extends to this

-     * 

-     * @param name the name of the type to extends from

-     * @return this

-     */

-    @SuppressWarnings("unchecked")

-    public default T addExtends(String name) {

-        ClassOrInterfaceType classOrInterfaceType = new ClassOrInterfaceType(name);

-        getExtends().add(classOrInterfaceType);

-        classOrInterfaceType.setParentNode((Node) this);

-        return (T) this;

-    }

-}

+package com.github.javaparser.ast.nodeTypes;
+
+import java.util.List;
+
+import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.type.ClassOrInterfaceType;
+
+public interface NodeWithExtends<T> {
+    public List<ClassOrInterfaceType> getExtends();
+
+    public T setExtends(final List<ClassOrInterfaceType> extendsList);
+
+    /**
+     * Add an extends to this and automatically add the import
+     * 
+     * @param clazz the class to extand from
+     * @return this
+     */
+    public default T addExtends(Class<?> clazz) {
+        ((Node) this).tryAddImportToParentCompilationUnit(clazz);
+        return addExtends(clazz.getSimpleName());
+    }
+
+    /**
+     * Add an extends to this
+     * 
+     * @param name the name of the type to extends from
+     * @return this
+     */
+    @SuppressWarnings("unchecked")
+    public default T addExtends(String name) {
+        ClassOrInterfaceType classOrInterfaceType = new ClassOrInterfaceType(name);
+        getExtends().add(classOrInterfaceType);
+        classOrInterfaceType.setParentNode((Node) this);
+        return (T) this;
+    }
+}
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithImplements.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithImplements.java
index adb6df2ba..3f5192587 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithImplements.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithImplements.java
@@ -1,37 +1,37 @@
-package com.github.javaparser.ast.nodeTypes;

-

-import java.util.List;

-

-import com.github.javaparser.ast.Node;

-import com.github.javaparser.ast.type.ClassOrInterfaceType;

-

-public interface NodeWithImplements<T> {

-    public List<ClassOrInterfaceType> getImplements();

-

-    public T setImplements(List<ClassOrInterfaceType> implementsList);

-

-    /**

-     * Add an implements to this

-     * 

-     * @param name the name of the type to extends from

-     * @return this

-     */

-    @SuppressWarnings("unchecked")

-    public default T addImplements(String name) {

-        ClassOrInterfaceType classOrInterfaceType = new ClassOrInterfaceType(name);

-        getImplements().add(classOrInterfaceType);

-        classOrInterfaceType.setParentNode((Node) this);

-        return (T) this;

-    }

-

-    /**

-     * Add an implements to this and automatically add the import

-     * 

-     * @param clazz the type to implements from

-     * @return this

-     */

-    public default T addImplements(Class<?> clazz) {

-        ((Node) this).tryAddImportToParentCompilationUnit(clazz);

-        return addImplements(clazz.getSimpleName());

-    }

-}

+package com.github.javaparser.ast.nodeTypes;
+
+import java.util.List;
+
+import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.type.ClassOrInterfaceType;
+
+public interface NodeWithImplements<T> {
+    public List<ClassOrInterfaceType> getImplements();
+
+    public T setImplements(List<ClassOrInterfaceType> implementsList);
+
+    /**
+     * Add an implements to this
+     * 
+     * @param name the name of the type to extends from
+     * @return this
+     */
+    @SuppressWarnings("unchecked")
+    public default T addImplements(String name) {
+        ClassOrInterfaceType classOrInterfaceType = new ClassOrInterfaceType(name);
+        getImplements().add(classOrInterfaceType);
+        classOrInterfaceType.setParentNode((Node) this);
+        return (T) this;
+    }
+
+    /**
+     * Add an implements to this and automatically add the import
+     * 
+     * @param clazz the type to implements from
+     * @return this
+     */
+    public default T addImplements(Class<?> clazz) {
+        ((Node) this).tryAddImportToParentCompilationUnit(clazz);
+        return addImplements(clazz.getSimpleName());
+    }
+}
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithJavaDoc.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithJavaDoc.java
index b00cffa5d..b00cffa5d 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithJavaDoc.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithJavaDoc.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java
index a14b3ddc8..827e5edee 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java
@@ -1,284 +1,284 @@
-package com.github.javaparser.ast.nodeTypes;

-

-import static com.github.javaparser.ast.type.VoidType.VOID_TYPE;

-import static java.util.Collections.unmodifiableList;

-import static java.util.stream.Collectors.toCollection;

-import static java.util.stream.Collectors.toList;

-import static java.util.stream.Collectors.toSet;

-

-import java.util.Arrays;

-import java.util.EnumSet;

-import java.util.List;

-import java.util.stream.Stream;

-

-import com.github.javaparser.ast.Modifier;

-import com.github.javaparser.ast.Node;

-import com.github.javaparser.ast.body.BodyDeclaration;

-import com.github.javaparser.ast.body.ConstructorDeclaration;

-import com.github.javaparser.ast.body.FieldDeclaration;

-import com.github.javaparser.ast.body.InitializerDeclaration;

-import com.github.javaparser.ast.body.MethodDeclaration;

-import com.github.javaparser.ast.body.TypeDeclaration;

-import com.github.javaparser.ast.body.VariableDeclarator;

-import com.github.javaparser.ast.body.VariableDeclaratorId;

-import com.github.javaparser.ast.stmt.BlockStmt;

-import com.github.javaparser.ast.type.ClassOrInterfaceType;

-import com.github.javaparser.ast.type.Type;

-

-/**

- * A node having members.

- *

- * The main reason for this interface is to permit users to manipulate homogeneously all nodes with a getMembers

- * method.

- *

- */

-public interface NodeWithMembers<T> {

-    List<BodyDeclaration<?>> getMembers();

-

-    T setMembers(List<BodyDeclaration<?>> members);

-

-    /**

-     * Add a field to this and automatically add the import of the type if needed

-     *

-     * @param typeClass the type of the field

-     * @param name the name of the field

-     * @param modifiers the modifiers like {@link Modifier#PUBLIC}

-     * @return the {@link FieldDeclaration} created

-     */

-    default FieldDeclaration addField(Class<?> typeClass, String name, Modifier... modifiers) {

-        ((Node) this).tryAddImportToParentCompilationUnit(typeClass);

-        return addField(typeClass.getSimpleName(), name, modifiers);

-    }

-

-    /**

-     * Add a field to this

-     *

-     * @param type the type of the field

-     * @param name the name of the field

-     * @param modifiers the modifiers like {@link Modifier#PUBLIC}

-     * @return the {@link FieldDeclaration} created

-     */

-    default FieldDeclaration addField(String type, String name, Modifier... modifiers) {

-        return addField(new ClassOrInterfaceType(type), name, modifiers);

-    }

-

-    /**

-     * Add a field to this

-     *

-     * @param type the type of the field

-     * @param name the name of the field

-     * @param modifiers the modifiers like {@link Modifier#PUBLIC}

-     * @return the {@link FieldDeclaration} created

-     */

-    default FieldDeclaration addField(Type<?> type, String name, Modifier... modifiers) {

-        FieldDeclaration fieldDeclaration = new FieldDeclaration();

-        fieldDeclaration.setParentNode((Node) this);

-        VariableDeclarator variable = new VariableDeclarator(new VariableDeclaratorId(name));

-        fieldDeclaration.getVariables().add(variable);

-        variable.setParentNode(fieldDeclaration);

-        fieldDeclaration.setModifiers(Arrays.stream(modifiers)

-                .collect(toCollection(() -> EnumSet.noneOf(Modifier.class))));

-        variable.setType(type);

-        getMembers().add(fieldDeclaration);

-        return fieldDeclaration;

-    }

-

-    /**

-     * Add a private field to this

-     *

-     * @param typeClass the type of the field

-     * @param name the name of the field

-     * @return the {@link FieldDeclaration} created

-     */

-    default FieldDeclaration addPrivateField(Class<?> typeClass, String name) {

-        return addField(typeClass, name, Modifier.PRIVATE);

-    }

-

-    /**

-     * Add a private field to this and automatically add the import of the type if

-     * needed

-     *

-     * @param type the type of the field

-     * @param name the name of the field

-     * @return the {@link FieldDeclaration} created

-     */

-    default FieldDeclaration addPrivateField(String type, String name) {

-        return addField(type, name, Modifier.PRIVATE);

-    }

-

-    /**

-     * Add a public field to this

-     * 

-     * @param typeClass the type of the field

-     * @param name the name of the field

-     * @return the {@link FieldDeclaration} created

-     */

-    default FieldDeclaration addPublicField(Class<?> typeClass, String name) {

-        return addField(typeClass, name, Modifier.PUBLIC);

-    }

-

-    /**

-     * Add a public field to this and automatically add the import of the type if

-     * needed

-     *

-     * @param type the type of the field

-     * @param name the name of the field

-     * @return the {@link FieldDeclaration} created

-     */

-    default FieldDeclaration addPublicField(String type, String name) {

-        return addField(type, name, Modifier.PUBLIC);

-    }

-

-    /**

-     * Add a protected field to this

-     *

-     * @param typeClass the type of the field

-     * @param name the name of the field

-     * @return the {@link FieldDeclaration} created

-     */

-    default FieldDeclaration addProtectedField(Class<?> typeClass, String name) {

-        return addField(typeClass, name, Modifier.PROTECTED);

-    }

-

-    /**

-     * Add a protected field to this and automatically add the import of the type

-     * if needed

-     *

-     * @param type the type of the field

-     * @param name the name of the field

-     * @return the {@link FieldDeclaration} created

-     */

-    default FieldDeclaration addProtectedField(String type, String name) {

-        return addField(type, name, Modifier.PROTECTED);

-    }

-

-    /**

-     * Adds a methods with void return by default to this

-     *

-     * @param methodName the method name

-     * @param modifiers the modifiers like {@link Modifier#PUBLIC}

-     * @return the {@link MethodDeclaration} created

-     */

-    default MethodDeclaration addMethod(String methodName, Modifier... modifiers) {

-        MethodDeclaration methodDeclaration = new MethodDeclaration();

-        methodDeclaration.setName(methodName);

-        methodDeclaration.setType(VOID_TYPE);

-        methodDeclaration.setModifiers(Arrays.stream(modifiers)

-                .collect(toCollection(() -> EnumSet.noneOf(Modifier.class))));

-        getMembers().add(methodDeclaration);

-        methodDeclaration.setParentNode((Node) this);

-        return methodDeclaration;

-    }

-

-    /**

-     * Adds a constructor to this

-     * 

-     * @param modifiers the modifiers like {@link Modifier#PUBLIC}

-     * @return the {@link MethodDeclaration} created

-     */

-    default ConstructorDeclaration addCtor(Modifier... modifiers) {

-        ConstructorDeclaration constructorDeclaration = new ConstructorDeclaration();

-        constructorDeclaration.setModifiers(Arrays.stream(modifiers)

-                .collect(toCollection(() -> EnumSet.noneOf(Modifier.class))));

-        constructorDeclaration.setName(((TypeDeclaration<?>) this).getName());

-        getMembers().add(constructorDeclaration);

-        constructorDeclaration.setParentNode((Node) this);

-        return constructorDeclaration;

-    }

-

-    default BlockStmt addInitializer() {

-        BlockStmt block = new BlockStmt();

-        InitializerDeclaration initializerDeclaration = new InitializerDeclaration(false, block);

-        getMembers().add(initializerDeclaration);

-        initializerDeclaration.setParentNode((Node) this);

-        return block;

-    }

-

-    default BlockStmt addStaticInitializer() {

-        BlockStmt block = new BlockStmt();

-        InitializerDeclaration initializerDeclaration = new InitializerDeclaration(true, block);

-        getMembers().add(initializerDeclaration);

-        initializerDeclaration.setParentNode((Node) this);

-        return block;

-    }

-

-    /**

-     * Try to find a {@link MethodDeclaration} by its name

-     *

-     * @param name the name of the method

-     * @return the methods found (multiple in case of polymorphism)

-     */

-    default List<MethodDeclaration> getMethodsByName(String name) {

-        return getMembers().stream()

-                .filter(m -> m instanceof MethodDeclaration && ((MethodDeclaration) m).getName().equals(name))

-                .map(m -> (MethodDeclaration) m).collect(toList());

-    }

-

-    /**

-     * Find all methods in the members of this node.

-     *

-     * @return the methods found. This list is immutable.

-     */

-    default List<MethodDeclaration> getMethods() {

-        return unmodifiableList(getMembers().stream()

-                .filter(m -> m instanceof MethodDeclaration)

-                .map(m -> (MethodDeclaration) m)

-                .collect(toList()));

-    }

-

-    /**

-     * Try to find a {@link MethodDeclaration} by its parameters types

-     *

-     * @param paramTypes the types of parameters like "Map&lt;Integer,String&gt;","int" to match<br>

-     *            void foo(Map&lt;Integer,String&gt; myMap,int number)

-     * @return the methods found (multiple in case of polymorphism)

-     */

-    default List<MethodDeclaration> getMethodsByParameterTypes(String... paramTypes) {

-        return getMembers().stream()

-                .filter(m -> m instanceof MethodDeclaration

-                        && ((MethodDeclaration) m).getParameters().stream().map(p -> p.getType().toString())

-                                .collect(toSet()).equals(Stream.of(paramTypes).collect(toSet())))

-                .map(m -> (MethodDeclaration) m).collect(toList());

-    }

-

-    /**

-     * Try to find a {@link MethodDeclaration} by its parameters types

-     *

-     * @param paramTypes the types of parameters like "Map&lt;Integer,String&gt;","int" to match<br>

-     *            void foo(Map&lt;Integer,String&gt; myMap,int number)

-     * @return the methods found (multiple in case of polymorphism)

-     */

-    default List<MethodDeclaration> getMethodsByParameterTypes(Class<?>... paramTypes) {

-        return getMembers().stream()

-                .filter(m -> m instanceof MethodDeclaration

-                        && ((MethodDeclaration) m).getParameters().stream().map(p -> p.getType().toString())

-                                .collect(toSet())

-                                .equals(Stream.of(paramTypes).map(Class::getSimpleName).collect(toSet())))

-                .map(m -> (MethodDeclaration) m).collect(toList());

-    }

-

-    /**

-     * Try to find a {@link FieldDeclaration} by its name

-     *

-     * @param name the name of the field

-     * @return null if not found, the FieldDeclaration otherwise

-     */

-    default FieldDeclaration getFieldByName(String name) {

-        return (FieldDeclaration) getMembers().stream()

-                .filter(m -> m instanceof FieldDeclaration && ((FieldDeclaration) m).getVariables().stream()

-                        .anyMatch(var -> var.getId().getName().equals(name)))

-                .findFirst().orElse(null);

-    }

-

-    /**

-	 * Find all fields in the members of this node.

-     *

-	 * @return the fields found. This list is immutable.

-     */

-    default List<FieldDeclaration> getFields() {

-        return unmodifiableList(getMembers().stream()

-                .filter(m -> m instanceof FieldDeclaration )

-                .map(m -> (FieldDeclaration) m)

-                .collect(toList()));

-    }

-}

+package com.github.javaparser.ast.nodeTypes;
+
+import static com.github.javaparser.ast.type.VoidType.VOID_TYPE;
+import static java.util.Collections.unmodifiableList;
+import static java.util.stream.Collectors.toCollection;
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toSet;
+
+import java.util.Arrays;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.stream.Stream;
+
+import com.github.javaparser.ast.Modifier;
+import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.body.BodyDeclaration;
+import com.github.javaparser.ast.body.ConstructorDeclaration;
+import com.github.javaparser.ast.body.FieldDeclaration;
+import com.github.javaparser.ast.body.InitializerDeclaration;
+import com.github.javaparser.ast.body.MethodDeclaration;
+import com.github.javaparser.ast.body.TypeDeclaration;
+import com.github.javaparser.ast.body.VariableDeclarator;
+import com.github.javaparser.ast.body.VariableDeclaratorId;
+import com.github.javaparser.ast.stmt.BlockStmt;
+import com.github.javaparser.ast.type.ClassOrInterfaceType;
+import com.github.javaparser.ast.type.Type;
+
+/**
+ * A node having members.
+ *
+ * The main reason for this interface is to permit users to manipulate homogeneously all nodes with a getMembers
+ * method.
+ *
+ */
+public interface NodeWithMembers<T> {
+    List<BodyDeclaration<?>> getMembers();
+
+    T setMembers(List<BodyDeclaration<?>> members);
+
+    /**
+     * Add a field to this and automatically add the import of the type if needed
+     *
+     * @param typeClass the type of the field
+     * @param name the name of the field
+     * @param modifiers the modifiers like {@link Modifier#PUBLIC}
+     * @return the {@link FieldDeclaration} created
+     */
+    default FieldDeclaration addField(Class<?> typeClass, String name, Modifier... modifiers) {
+        ((Node) this).tryAddImportToParentCompilationUnit(typeClass);
+        return addField(typeClass.getSimpleName(), name, modifiers);
+    }
+
+    /**
+     * Add a field to this
+     *
+     * @param type the type of the field
+     * @param name the name of the field
+     * @param modifiers the modifiers like {@link Modifier#PUBLIC}
+     * @return the {@link FieldDeclaration} created
+     */
+    default FieldDeclaration addField(String type, String name, Modifier... modifiers) {
+        return addField(new ClassOrInterfaceType(type), name, modifiers);
+    }
+
+    /**
+     * Add a field to this
+     *
+     * @param type the type of the field
+     * @param name the name of the field
+     * @param modifiers the modifiers like {@link Modifier#PUBLIC}
+     * @return the {@link FieldDeclaration} created
+     */
+    default FieldDeclaration addField(Type<?> type, String name, Modifier... modifiers) {
+        FieldDeclaration fieldDeclaration = new FieldDeclaration();
+        fieldDeclaration.setParentNode((Node) this);
+        VariableDeclarator variable = new VariableDeclarator(new VariableDeclaratorId(name));
+        fieldDeclaration.getVariables().add(variable);
+        variable.setParentNode(fieldDeclaration);
+        fieldDeclaration.setModifiers(Arrays.stream(modifiers)
+                .collect(toCollection(() -> EnumSet.noneOf(Modifier.class))));
+        variable.setType(type);
+        getMembers().add(fieldDeclaration);
+        return fieldDeclaration;
+    }
+
+    /**
+     * Add a private field to this
+     *
+     * @param typeClass the type of the field
+     * @param name the name of the field
+     * @return the {@link FieldDeclaration} created
+     */
+    default FieldDeclaration addPrivateField(Class<?> typeClass, String name) {
+        return addField(typeClass, name, Modifier.PRIVATE);
+    }
+
+    /**
+     * Add a private field to this and automatically add the import of the type if
+     * needed
+     *
+     * @param type the type of the field
+     * @param name the name of the field
+     * @return the {@link FieldDeclaration} created
+     */
+    default FieldDeclaration addPrivateField(String type, String name) {
+        return addField(type, name, Modifier.PRIVATE);
+    }
+
+    /**
+     * Add a public field to this
+     * 
+     * @param typeClass the type of the field
+     * @param name the name of the field
+     * @return the {@link FieldDeclaration} created
+     */
+    default FieldDeclaration addPublicField(Class<?> typeClass, String name) {
+        return addField(typeClass, name, Modifier.PUBLIC);
+    }
+
+    /**
+     * Add a public field to this and automatically add the import of the type if
+     * needed
+     *
+     * @param type the type of the field
+     * @param name the name of the field
+     * @return the {@link FieldDeclaration} created
+     */
+    default FieldDeclaration addPublicField(String type, String name) {
+        return addField(type, name, Modifier.PUBLIC);
+    }
+
+    /**
+     * Add a protected field to this
+     *
+     * @param typeClass the type of the field
+     * @param name the name of the field
+     * @return the {@link FieldDeclaration} created
+     */
+    default FieldDeclaration addProtectedField(Class<?> typeClass, String name) {
+        return addField(typeClass, name, Modifier.PROTECTED);
+    }
+
+    /**
+     * Add a protected field to this and automatically add the import of the type
+     * if needed
+     *
+     * @param type the type of the field
+     * @param name the name of the field
+     * @return the {@link FieldDeclaration} created
+     */
+    default FieldDeclaration addProtectedField(String type, String name) {
+        return addField(type, name, Modifier.PROTECTED);
+    }
+
+    /**
+     * Adds a methods with void return by default to this
+     *
+     * @param methodName the method name
+     * @param modifiers the modifiers like {@link Modifier#PUBLIC}
+     * @return the {@link MethodDeclaration} created
+     */
+    default MethodDeclaration addMethod(String methodName, Modifier... modifiers) {
+        MethodDeclaration methodDeclaration = new MethodDeclaration();
+        methodDeclaration.setName(methodName);
+        methodDeclaration.setType(VOID_TYPE);
+        methodDeclaration.setModifiers(Arrays.stream(modifiers)
+                .collect(toCollection(() -> EnumSet.noneOf(Modifier.class))));
+        getMembers().add(methodDeclaration);
+        methodDeclaration.setParentNode((Node) this);
+        return methodDeclaration;
+    }
+
+    /**
+     * Adds a constructor to this
+     * 
+     * @param modifiers the modifiers like {@link Modifier#PUBLIC}
+     * @return the {@link MethodDeclaration} created
+     */
+    default ConstructorDeclaration addCtor(Modifier... modifiers) {
+        ConstructorDeclaration constructorDeclaration = new ConstructorDeclaration();
+        constructorDeclaration.setModifiers(Arrays.stream(modifiers)
+                .collect(toCollection(() -> EnumSet.noneOf(Modifier.class))));
+        constructorDeclaration.setName(((TypeDeclaration<?>) this).getName());
+        getMembers().add(constructorDeclaration);
+        constructorDeclaration.setParentNode((Node) this);
+        return constructorDeclaration;
+    }
+
+    default BlockStmt addInitializer() {
+        BlockStmt block = new BlockStmt();
+        InitializerDeclaration initializerDeclaration = new InitializerDeclaration(false, block);
+        getMembers().add(initializerDeclaration);
+        initializerDeclaration.setParentNode((Node) this);
+        return block;
+    }
+
+    default BlockStmt addStaticInitializer() {
+        BlockStmt block = new BlockStmt();
+        InitializerDeclaration initializerDeclaration = new InitializerDeclaration(true, block);
+        getMembers().add(initializerDeclaration);
+        initializerDeclaration.setParentNode((Node) this);
+        return block;
+    }
+
+    /**
+     * Try to find a {@link MethodDeclaration} by its name
+     *
+     * @param name the name of the method
+     * @return the methods found (multiple in case of polymorphism)
+     */
+    default List<MethodDeclaration> getMethodsByName(String name) {
+        return getMembers().stream()
+                .filter(m -> m instanceof MethodDeclaration && ((MethodDeclaration) m).getName().equals(name))
+                .map(m -> (MethodDeclaration) m).collect(toList());
+    }
+
+    /**
+     * Find all methods in the members of this node.
+     *
+     * @return the methods found. This list is immutable.
+     */
+    default List<MethodDeclaration> getMethods() {
+        return unmodifiableList(getMembers().stream()
+                .filter(m -> m instanceof MethodDeclaration)
+                .map(m -> (MethodDeclaration) m)
+                .collect(toList()));
+    }
+
+    /**
+     * Try to find a {@link MethodDeclaration} by its parameters types
+     *
+     * @param paramTypes the types of parameters like "Map&lt;Integer,String&gt;","int" to match<br>
+     *            void foo(Map&lt;Integer,String&gt; myMap,int number)
+     * @return the methods found (multiple in case of polymorphism)
+     */
+    default List<MethodDeclaration> getMethodsByParameterTypes(String... paramTypes) {
+        return getMembers().stream()
+                .filter(m -> m instanceof MethodDeclaration
+                        && ((MethodDeclaration) m).getParameters().stream().map(p -> p.getType().toString())
+                                .collect(toSet()).equals(Stream.of(paramTypes).collect(toSet())))
+                .map(m -> (MethodDeclaration) m).collect(toList());
+    }
+
+    /**
+     * Try to find a {@link MethodDeclaration} by its parameters types
+     *
+     * @param paramTypes the types of parameters like "Map&lt;Integer,String&gt;","int" to match<br>
+     *            void foo(Map&lt;Integer,String&gt; myMap,int number)
+     * @return the methods found (multiple in case of polymorphism)
+     */
+    default List<MethodDeclaration> getMethodsByParameterTypes(Class<?>... paramTypes) {
+        return getMembers().stream()
+                .filter(m -> m instanceof MethodDeclaration
+                        && ((MethodDeclaration) m).getParameters().stream().map(p -> p.getType().toString())
+                                .collect(toSet())
+                                .equals(Stream.of(paramTypes).map(Class::getSimpleName).collect(toSet())))
+                .map(m -> (MethodDeclaration) m).collect(toList());
+    }
+
+    /**
+     * Try to find a {@link FieldDeclaration} by its name
+     *
+     * @param name the name of the field
+     * @return null if not found, the FieldDeclaration otherwise
+     */
+    default FieldDeclaration getFieldByName(String name) {
+        return (FieldDeclaration) getMembers().stream()
+                .filter(m -> m instanceof FieldDeclaration && ((FieldDeclaration) m).getVariables().stream()
+                        .anyMatch(var -> var.getId().getName().equals(name)))
+                .findFirst().orElse(null);
+    }
+
+    /**
+	 * Find all fields in the members of this node.
+     *
+	 * @return the fields found. This list is immutable.
+     */
+    default List<FieldDeclaration> getFields() {
+        return unmodifiableList(getMembers().stream()
+                .filter(m -> m instanceof FieldDeclaration )
+                .map(m -> (FieldDeclaration) m)
+                .collect(toList()));
+    }
+}
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java
index 6a1959ecf..6a1959ecf 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithName.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithName.java
index edcff5cff..edcff5cff 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithName.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithName.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java
index d22ab3c83..fb8697f3c 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java
@@ -1,100 +1,100 @@
-package com.github.javaparser.ast.nodeTypes;

-

-import java.util.List;

-

-import com.github.javaparser.ast.Node;

-import com.github.javaparser.ast.body.Parameter;

-import com.github.javaparser.ast.body.VariableDeclaratorId;

-import com.github.javaparser.ast.type.ClassOrInterfaceType;

-import com.github.javaparser.ast.type.Type;

-

-public interface NodeWithParameters<T> {

-    List<Parameter> getParameters();

-

-    T setParameters(List<Parameter> parameters);

-

-    default T addParameter(Type type, String name) {

-        return addParameter(new Parameter(type, new VariableDeclaratorId(name)));

-    }

-

-    default T addParameter(Class<?> paramClass, String name) {

-        ((Node) this).tryAddImportToParentCompilationUnit(paramClass);

-        return addParameter(new ClassOrInterfaceType(paramClass.getSimpleName()), name);

-    }

-

-    /**

-     * Remember to import the class in the compilation unit yourself

-     * 

-     * @param className the name of the class, ex : org.test.Foo or Foo if you added manually the import

-     * @param name the name of the parameter

-     */

-    default T addParameter(String className, String name) {

-        return addParameter(new ClassOrInterfaceType(className), name);

-    }

-

-    @SuppressWarnings("unchecked")

-    default T addParameter(Parameter parameter) {

-        getParameters().add(parameter);

-        parameter.setParentNode((Node) this);

-        return (T) this;

-    }

-

-    default Parameter addAndGetParameter(Type type, String name) {

-        return addAndGetParameter(new Parameter(type, new VariableDeclaratorId(name)));

-    }

-

-    default Parameter addAndGetParameter(Class<?> paramClass, String name) {

-        ((Node) this).tryAddImportToParentCompilationUnit(paramClass);

-        return addAndGetParameter(new ClassOrInterfaceType(paramClass.getSimpleName()), name);

-    }

-

-    /**

-     * Remember to import the class in the compilation unit yourself

-     * 

-     * @param className the name of the class, ex : org.test.Foo or Foo if you added manually the import

-     * @param name the name of the parameter

-     * @return the {@link Parameter} created

-     */

-    default Parameter addAndGetParameter(String className, String name) {

-        return addAndGetParameter(new ClassOrInterfaceType(className), name);

-    }

-

-    default Parameter addAndGetParameter(Parameter parameter) {

-        getParameters().add(parameter);

-        parameter.setParentNode((Node) this);

-        return parameter;

-    }

-

-    /**

-     * Try to find a {@link Parameter} by its name

-     * 

-     * @param name the name of the param

-     * @return null if not found, the param found otherwise

-     */

-    default Parameter getParamByName(String name) {

-        return getParameters().stream()

-                .filter(p -> p.getName().equals(name)).findFirst().orElse(null);

-    }

-

-    /**

-     * Try to find a {@link Parameter} by its type

-     * 

-     * @param type the type of the param

-     * @return null if not found, the param found otherwise

-     */

-    default Parameter getParamByType(String type) {

-        return getParameters().stream()

-                .filter(p -> p.getType().toString().equals(type)).findFirst().orElse(null);

-    }

-

-    /**

-     * Try to find a {@link Parameter} by its type

-     * 

-     * @param type the type of the param <b>take care about generics, it wont work</b>

-     * @return null if not found, the param found otherwise

-     */

-    default Parameter getParamByType(Class<?> type) {

-        return getParameters().stream()

-                .filter(p -> p.getType().toString().equals(type.getSimpleName())).findFirst().orElse(null);

-    }

-}

+package com.github.javaparser.ast.nodeTypes;
+
+import java.util.List;
+
+import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.body.Parameter;
+import com.github.javaparser.ast.body.VariableDeclaratorId;
+import com.github.javaparser.ast.type.ClassOrInterfaceType;
+import com.github.javaparser.ast.type.Type;
+
+public interface NodeWithParameters<T> {
+    List<Parameter> getParameters();
+
+    T setParameters(List<Parameter> parameters);
+
+    default T addParameter(Type type, String name) {
+        return addParameter(new Parameter(type, new VariableDeclaratorId(name)));
+    }
+
+    default T addParameter(Class<?> paramClass, String name) {
+        ((Node) this).tryAddImportToParentCompilationUnit(paramClass);
+        return addParameter(new ClassOrInterfaceType(paramClass.getSimpleName()), name);
+    }
+
+    /**
+     * Remember to import the class in the compilation unit yourself
+     * 
+     * @param className the name of the class, ex : org.test.Foo or Foo if you added manually the import
+     * @param name the name of the parameter
+     */
+    default T addParameter(String className, String name) {
+        return addParameter(new ClassOrInterfaceType(className), name);
+    }
+
+    @SuppressWarnings("unchecked")
+    default T addParameter(Parameter parameter) {
+        getParameters().add(parameter);
+        parameter.setParentNode((Node) this);
+        return (T) this;
+    }
+
+    default Parameter addAndGetParameter(Type type, String name) {
+        return addAndGetParameter(new Parameter(type, new VariableDeclaratorId(name)));
+    }
+
+    default Parameter addAndGetParameter(Class<?> paramClass, String name) {
+        ((Node) this).tryAddImportToParentCompilationUnit(paramClass);
+        return addAndGetParameter(new ClassOrInterfaceType(paramClass.getSimpleName()), name);
+    }
+
+    /**
+     * Remember to import the class in the compilation unit yourself
+     * 
+     * @param className the name of the class, ex : org.test.Foo or Foo if you added manually the import
+     * @param name the name of the parameter
+     * @return the {@link Parameter} created
+     */
+    default Parameter addAndGetParameter(String className, String name) {
+        return addAndGetParameter(new ClassOrInterfaceType(className), name);
+    }
+
+    default Parameter addAndGetParameter(Parameter parameter) {
+        getParameters().add(parameter);
+        parameter.setParentNode((Node) this);
+        return parameter;
+    }
+
+    /**
+     * Try to find a {@link Parameter} by its name
+     * 
+     * @param name the name of the param
+     * @return null if not found, the param found otherwise
+     */
+    default Parameter getParamByName(String name) {
+        return getParameters().stream()
+                .filter(p -> p.getName().equals(name)).findFirst().orElse(null);
+    }
+
+    /**
+     * Try to find a {@link Parameter} by its type
+     * 
+     * @param type the type of the param
+     * @return null if not found, the param found otherwise
+     */
+    default Parameter getParamByType(String type) {
+        return getParameters().stream()
+                .filter(p -> p.getType().toString().equals(type)).findFirst().orElse(null);
+    }
+
+    /**
+     * Try to find a {@link Parameter} by its type
+     * 
+     * @param type the type of the param <b>take care about generics, it wont work</b>
+     * @return null if not found, the param found otherwise
+     */
+    default Parameter getParamByType(Class<?> type) {
+        return getParameters().stream()
+                .filter(p -> p.getType().toString().equals(type.getSimpleName())).findFirst().orElse(null);
+    }
+}
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithStatements.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithStatements.java
index dfd065449..b6c895efb 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithStatements.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithStatements.java
@@ -1,46 +1,46 @@
-package com.github.javaparser.ast.nodeTypes;

-

-import java.util.List;

-

-import com.github.javaparser.ast.Node;

-import com.github.javaparser.ast.expr.Expression;

-import com.github.javaparser.ast.expr.NameExpr;

-import com.github.javaparser.ast.stmt.ExpressionStmt;

-import com.github.javaparser.ast.stmt.Statement;

-

-public interface NodeWithStatements<T> {

-    public List<Statement> getStmts();

-

-    public T setStmts(final List<Statement> stmts);

-

-    @SuppressWarnings("unchecked")

-    public default T addStatement(Statement statement) {

-        getStmts().add(statement);

-        statement.setParentNode((Node) this);

-        return (T) this;

-    }

-

-    @SuppressWarnings("unchecked")

-    public default T addStatement(int index, final Statement statement) {

-        getStmts().add(index, statement);

-        statement.setParentNode((Node) this);

-        return (T) this;

-    }

-

-    public default T addStatement(Expression expr) {

-        ExpressionStmt statement = new ExpressionStmt(expr);

-        expr.setParentNode(statement);

-        return addStatement(statement);

-    }

-

-    public default T addStatement(String statement) {

-        return addStatement(new NameExpr(statement));

-    }

-

-    public default T addStatement(int index, final Expression expr) {

-        Statement stmt = new ExpressionStmt(expr);

-        expr.setParentNode(stmt);

-        return addStatement(index, stmt);

-    }

-

-}

+package com.github.javaparser.ast.nodeTypes;
+
+import java.util.List;
+
+import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.expr.Expression;
+import com.github.javaparser.ast.expr.NameExpr;
+import com.github.javaparser.ast.stmt.ExpressionStmt;
+import com.github.javaparser.ast.stmt.Statement;
+
+public interface NodeWithStatements<T> {
+    public List<Statement> getStmts();
+
+    public T setStmts(final List<Statement> stmts);
+
+    @SuppressWarnings("unchecked")
+    public default T addStatement(Statement statement) {
+        getStmts().add(statement);
+        statement.setParentNode((Node) this);
+        return (T) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    public default T addStatement(int index, final Statement statement) {
+        getStmts().add(index, statement);
+        statement.setParentNode((Node) this);
+        return (T) this;
+    }
+
+    public default T addStatement(Expression expr) {
+        ExpressionStmt statement = new ExpressionStmt(expr);
+        expr.setParentNode(statement);
+        return addStatement(statement);
+    }
+
+    public default T addStatement(String statement) {
+        return addStatement(new NameExpr(statement));
+    }
+
+    public default T addStatement(int index, final Expression expr) {
+        Statement stmt = new ExpressionStmt(expr);
+        expr.setParentNode(stmt);
+        return addStatement(index, stmt);
+    }
+
+}
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithThrowable.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithThrowable.java
index 3b39b3066..beee9e727 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithThrowable.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithThrowable.java
@@ -1,57 +1,57 @@
-package com.github.javaparser.ast.nodeTypes;

-

-import java.util.List;

-

-import com.github.javaparser.ast.Node;

-import com.github.javaparser.ast.type.ClassOrInterfaceType;

-import com.github.javaparser.ast.type.ReferenceType;

-

-public interface NodeWithThrowable<T> {

-    T setThrows(List<ReferenceType> throws_);

-

-    List<ReferenceType> getThrows();

-

-    /**

-     * Adds this type to the throws clause

-     * 

-     * @param throwType the exception type

-     * @return this

-     */

-    @SuppressWarnings("unchecked")

-    default T addThrows(ReferenceType throwType) {

-        getThrows().add(throwType);

-        throwType.setParentNode((Node) this);

-        return (T) this;

-    }

-

-    /**

-     * Adds this class to the throws clause

-     * 

-     * @param clazz the exception class

-     * @return this

-     */

-    default T addThrows(Class<? extends Throwable> clazz) {

-        ((Node) this).tryAddImportToParentCompilationUnit(clazz);

-        return addThrows(new ClassOrInterfaceType(clazz.getSimpleName()));

-    }

-

-    /**

-     * Check whether this elements throws this exception class

-     * 

-     * @param clazz the class of the exception

-     * @return true if found in throws clause, false if not

-     */

-    public default boolean isThrows(Class<? extends Throwable> clazz) {

-        return isThrows(clazz.getSimpleName());

-    }

-

-    /**

-     * Check whether this elements throws this exception class

-     * 

-     * @param throwableName the class of the exception

-     * @return true if found in throws clause, false if not

-     */

-    public default boolean isThrows(String throwableName) {

-        return getThrows().stream().anyMatch(t -> t.toString().equals(throwableName));

-    }

-}

+package com.github.javaparser.ast.nodeTypes;
+
+import java.util.List;
+
+import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.type.ClassOrInterfaceType;
+import com.github.javaparser.ast.type.ReferenceType;
+
+public interface NodeWithThrowable<T> {
+    T setThrows(List<ReferenceType> throws_);
+
+    List<ReferenceType> getThrows();
+
+    /**
+     * Adds this type to the throws clause
+     * 
+     * @param throwType the exception type
+     * @return this
+     */
+    @SuppressWarnings("unchecked")
+    default T addThrows(ReferenceType throwType) {
+        getThrows().add(throwType);
+        throwType.setParentNode((Node) this);
+        return (T) this;
+    }
+
+    /**
+     * Adds this class to the throws clause
+     * 
+     * @param clazz the exception class
+     * @return this
+     */
+    default T addThrows(Class<? extends Throwable> clazz) {
+        ((Node) this).tryAddImportToParentCompilationUnit(clazz);
+        return addThrows(new ClassOrInterfaceType(clazz.getSimpleName()));
+    }
+
+    /**
+     * Check whether this elements throws this exception class
+     * 
+     * @param clazz the class of the exception
+     * @return true if found in throws clause, false if not
+     */
+    public default boolean isThrows(Class<? extends Throwable> clazz) {
+        return isThrows(clazz.getSimpleName());
+    }
+
+    /**
+     * Check whether this elements throws this exception class
+     * 
+     * @param throwableName the class of the exception
+     * @return true if found in throws clause, false if not
+     */
+    public default boolean isThrows(String throwableName) {
+        return getThrows().stream().anyMatch(t -> t.toString().equals(throwableName));
+    }
+}
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithType.java
index e32dbd925..fc183b20b 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithType.java
@@ -1,69 +1,69 @@
-/*

- * Copyright (C) 2007-2010 Júlio Vilmar Gesser.

- * Copyright (C) 2011, 2013-2015 The JavaParser Team.

- *

- * This file is part of JavaParser.

- *

- * JavaParser can be used either under the terms of

- * a) the GNU Lesser General Public License as published by

- *     the Free Software Foundation, either version 3 of the License, or

- *     (at your option) any later version.

- * b) the terms of the Apache License

- *

- * You should have received a copy of both licenses in LICENCE.LGPL and

- * LICENCE.APACHE. Please refer to those files for details.

- *

- * JavaParser is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License for more details.

- */

-

-package com.github.javaparser.ast.nodeTypes;

-

-import com.github.javaparser.ast.CompilationUnit;

-import com.github.javaparser.ast.Node;

-import com.github.javaparser.ast.type.ClassOrInterfaceType;

-import com.github.javaparser.ast.type.Type;

-

-/**

- * A node having a type.

- *

- * The main reason for this interface is to permit users to manipulate homogeneously all nodes with getType/setType

- * methods

- *

- * @since 2.3.1

- */

-public interface NodeWithType<T> {

-    /**

-     * Gets the type

-     * 

-     * @return the type

-     */

-    Type<?> getType();

-

-    /**

-     * Sets the type

-     * 

-     * @param type the type

-     * @return this

-     */

-    T setType(Type<?> type);

-

-    /**

-     * Sets this type to this class and try to import it to the {@link CompilationUnit} if needed

-     * 

-     * @param typeClass the type

-     * @return this

-     */

-    default T setType(Class<?> typeClass) {

-        ((Node) this).tryAddImportToParentCompilationUnit(typeClass);

-        return setType(new ClassOrInterfaceType(typeClass.getSimpleName()));

-    }

-

-    default T setType(final String type) {

-        ClassOrInterfaceType classOrInterfaceType = new ClassOrInterfaceType(type);

-        return setType(classOrInterfaceType);

-    }

-

-}

+/*
+ * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
+ * Copyright (C) 2011, 2013-2015 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+
+package com.github.javaparser.ast.nodeTypes;
+
+import com.github.javaparser.ast.CompilationUnit;
+import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.type.ClassOrInterfaceType;
+import com.github.javaparser.ast.type.Type;
+
+/**
+ * A node having a type.
+ *
+ * The main reason for this interface is to permit users to manipulate homogeneously all nodes with getType/setType
+ * methods
+ *
+ * @since 2.3.1
+ */
+public interface NodeWithType<T> {
+    /**
+     * Gets the type
+     * 
+     * @return the type
+     */
+    Type<?> getType();
+
+    /**
+     * Sets the type
+     * 
+     * @param type the type
+     * @return this
+     */
+    T setType(Type<?> type);
+
+    /**
+     * Sets this type to this class and try to import it to the {@link CompilationUnit} if needed
+     * 
+     * @param typeClass the type
+     * @return this
+     */
+    default T setType(Class<?> typeClass) {
+        ((Node) this).tryAddImportToParentCompilationUnit(typeClass);
+        return setType(new ClassOrInterfaceType(typeClass.getSimpleName()));
+    }
+
+    default T setType(final String type) {
+        ClassOrInterfaceType classOrInterfaceType = new ClassOrInterfaceType(type);
+        return setType(classOrInterfaceType);
+    }
+
+}
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithTypeArguments.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithTypeArguments.java
index 3ce27971e..3ce27971e 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithTypeArguments.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithTypeArguments.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithVariables.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithVariables.java
index 2c6702ac4..2c6702ac4 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithVariables.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithVariables.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/AssertStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/AssertStmt.java
index 85a34a847..85a34a847 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/AssertStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/AssertStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/BlockStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/BlockStmt.java
index 31cbfa391..31cbfa391 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/BlockStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/BlockStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/BreakStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/BreakStmt.java
index 04c39fb9f..04c39fb9f 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/BreakStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/BreakStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/CatchClause.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/CatchClause.java
index a1f300544..a1f300544 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/CatchClause.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/CatchClause.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ContinueStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ContinueStmt.java
index 4ba7faa7b..4ba7faa7b 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ContinueStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ContinueStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/DoStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/DoStmt.java
index 8f293ecab..8f293ecab 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/DoStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/DoStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/EmptyStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/EmptyStmt.java
index 00709806d..00709806d 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/EmptyStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/EmptyStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java
index e29205b84..e29205b84 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ExpressionStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ExpressionStmt.java
index 72d8a2e94..72d8a2e94 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ExpressionStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ExpressionStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ForStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ForStmt.java
index 52baddb7b..52baddb7b 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ForStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ForStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ForeachStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ForeachStmt.java
index 3a94572b0..3a94572b0 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ForeachStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ForeachStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/IfStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/IfStmt.java
index ace3ec8a5..ace3ec8a5 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/IfStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/IfStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/LabeledStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/LabeledStmt.java
index ded1ad8d8..ded1ad8d8 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/LabeledStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/LabeledStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ReturnStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ReturnStmt.java
index 6ce31d0bf..6ce31d0bf 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ReturnStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ReturnStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/Statement.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/Statement.java
index eacfcc416..eacfcc416 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/Statement.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/Statement.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SwitchEntryStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
index e17e20e94..e17e20e94 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SwitchStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SwitchStmt.java
index c909394b2..c909394b2 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SwitchStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SwitchStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SynchronizedStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SynchronizedStmt.java
index 1a9d2db5d..1a9d2db5d 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SynchronizedStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SynchronizedStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ThrowStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ThrowStmt.java
index 180fdd04c..180fdd04c 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ThrowStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ThrowStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/TryStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/TryStmt.java
index 4688454b4..4688454b4 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/TryStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/TryStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java
index a9f83bf78..a9f83bf78 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/WhileStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/WhileStmt.java
index b843494a4..b843494a4 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/WhileStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/WhileStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ArrayType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ArrayType.java
index babf2a5d7..babf2a5d7 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ArrayType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ArrayType.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ClassOrInterfaceType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ClassOrInterfaceType.java
index ac308940d..ac308940d 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ClassOrInterfaceType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ClassOrInterfaceType.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/IntersectionType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/IntersectionType.java
index 029d46537..029d46537 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/IntersectionType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/IntersectionType.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/PrimitiveType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/PrimitiveType.java
index 29299a425..29299a425 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/PrimitiveType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/PrimitiveType.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ReferenceType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ReferenceType.java
index 1a4666b4f..1a4666b4f 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ReferenceType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ReferenceType.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/Type.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/Type.java
index 6c043557a..6c043557a 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/Type.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/Type.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/TypeParameter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/TypeParameter.java
index bfec9c936..bfec9c936 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/TypeParameter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/TypeParameter.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/UnionType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/UnionType.java
index 74894af0f..74894af0f 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/UnionType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/UnionType.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/UnknownType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/UnknownType.java
index b76c5962c..b76c5962c 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/UnknownType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/UnknownType.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/VoidType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/VoidType.java
index d5f7273cb..d5f7273cb 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/VoidType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/VoidType.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/WildcardType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/WildcardType.java
index d1e49bc0b..d1e49bc0b 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/WildcardType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/WildcardType.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/CloneVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/CloneVisitor.java
index 33ca0e02a..33ca0e02a 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/CloneVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/CloneVisitor.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/DumpVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/DumpVisitor.java
index 569f39516..569f39516 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/DumpVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/DumpVisitor.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/EqualsVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/EqualsVisitor.java
index e10184ce9..e10184ce9 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/EqualsVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/EqualsVisitor.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/GenericVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/GenericVisitor.java
index 9f4e9bc7f..9f4e9bc7f 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/GenericVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/GenericVisitor.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java
index af01fdffb..af01fdffb 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java
index 78b0e2931..78b0e2931 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/TreeVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/TreeVisitor.java
index c1b7eaee6..c1b7eaee6 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/TreeVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/TreeVisitor.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/VoidVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/VoidVisitor.java
index ec1d0f6a6..ec1d0f6a6 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/VoidVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/VoidVisitor.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java
index cab3ef496..cab3ef496 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/utils/ClassUtils.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/ClassUtils.java
index 476986812..476986812 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/utils/ClassUtils.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/ClassUtils.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/utils/Pair.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/Pair.java
index 40ce85d83..40ce85d83 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/utils/Pair.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/Pair.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/utils/PositionUtils.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/PositionUtils.java
index e1ecf190e..e1ecf190e 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/utils/PositionUtils.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/PositionUtils.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/utils/Utils.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/Utils.java
index b9320852d..b9320852d 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/utils/Utils.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/Utils.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParser.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParser.java
index 020f1f81d..020f1f81d 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParser.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParser.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParserConstants.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParserConstants.java
index b256848a9..b256848a9 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParserConstants.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParserConstants.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParserTokenManager.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParserTokenManager.java
index fe6c0c668..fe6c0c668 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParserTokenManager.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParserTokenManager.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/JavaCharStream.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/JavaCharStream.java
index da924dbe0..da924dbe0 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/JavaCharStream.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/JavaCharStream.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ParseException.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ParseException.java
index 32283676c..32283676c 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ParseException.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ParseException.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/Provider.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/Provider.java
index bfd9da886..bfd9da886 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/Provider.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/Provider.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/StreamProvider.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/StreamProvider.java
index 2c30e1610..2c30e1610 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/StreamProvider.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/StreamProvider.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/StringProvider.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/StringProvider.java
index 83c3504c9..83c3504c9 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/StringProvider.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/StringProvider.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/Token.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/Token.java
index 2731d0427..2731d0427 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/Token.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/Token.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/TokenMgrError.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/TokenMgrError.java
index 09197e805..09197e805 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/TokenMgrError.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/TokenMgrError.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/TokenMgrException.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/TokenMgrException.java
index d290424fb..d290424fb 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/TokenMgrException.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/TokenMgrException.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/generated/com/github/javaparser/ASTParser.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ASTParser.java
index 5b9c5f84a..5b9c5f84a 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/generated/com/github/javaparser/ASTParser.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ASTParser.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/generated/com/github/javaparser/ASTParserConstants.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ASTParserConstants.java
index 3692dfc71..3692dfc71 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/generated/com/github/javaparser/ASTParserConstants.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ASTParserConstants.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/generated/com/github/javaparser/ASTParserTokenManager.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ASTParserTokenManager.java
index 8c157641c..8c157641c 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/generated/com/github/javaparser/ASTParserTokenManager.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ASTParserTokenManager.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/generated/com/github/javaparser/JavaCharStream.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/JavaCharStream.java
index 62a6544b3..62a6544b3 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/generated/com/github/javaparser/JavaCharStream.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/JavaCharStream.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/generated/com/github/javaparser/ParseException.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ParseException.java
index 31d07cd51..31d07cd51 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/generated/com/github/javaparser/ParseException.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ParseException.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/generated/com/github/javaparser/Token.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/Token.java
index 8aa85f4dd..8aa85f4dd 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/generated/com/github/javaparser/Token.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/Token.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/generated/com/github/javaparser/TokenMgrError.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/TokenMgrError.java
index 09197e805..09197e805 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/generated/com/github/javaparser/TokenMgrError.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/TokenMgrError.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ASTHelper.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ASTHelper.java
index 7e706cd64..7e706cd64 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ASTHelper.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ASTHelper.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/JavaParser.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/JavaParser.java
index f3129838f..f3129838f 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/JavaParser.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/JavaParser.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/Position.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/Position.java
index 522411c27..522411c27 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/Position.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/Position.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/PositionUtils.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/PositionUtils.java
index 41df81710..41df81710 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/PositionUtils.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/PositionUtils.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/SourcesHelper.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/SourcesHelper.java
index 87f83f0da..87f83f0da 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/SourcesHelper.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/SourcesHelper.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/AccessSpecifier.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/AccessSpecifier.java
index 5eafdac64..5eafdac64 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/AccessSpecifier.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/AccessSpecifier.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/CompilationUnit.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/CompilationUnit.java
index f3db30274..f3db30274 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/CompilationUnit.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/CompilationUnit.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/DocumentableNode.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/DocumentableNode.java
index 0038831b8..0038831b8 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/DocumentableNode.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/DocumentableNode.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/ImportDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/ImportDeclaration.java
index da249e20b..da249e20b 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/ImportDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/ImportDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/NamedNode.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/NamedNode.java
index 7885d71d2..7885d71d2 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/NamedNode.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/NamedNode.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/Node.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/Node.java
index f5f9cb238..f5f9cb238 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/Node.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/Node.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/PackageDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/PackageDeclaration.java
index d0aaf5b1e..d0aaf5b1e 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/PackageDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/PackageDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/TreeVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/TreeVisitor.java
index f3b2672d0..f3b2672d0 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/TreeVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/TreeVisitor.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/TypeParameter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/TypeParameter.java
index c43d3793d..c43d3793d 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/TypeParameter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/TypeParameter.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotableNode.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotableNode.java
index 47c8c4fe8..47c8c4fe8 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotableNode.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotableNode.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotationDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotationDeclaration.java
index 51f25617a..51f25617a 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotationDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotationDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
index a81e6cc71..a81e6cc71 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/BaseParameter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/BaseParameter.java
index e14deb177..e14deb177 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/BaseParameter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/BaseParameter.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/BodyDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/BodyDeclaration.java
index bbf138b77..bbf138b77 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/BodyDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/BodyDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java
index e098f6edb..e098f6edb 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/ConstructorDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/ConstructorDeclaration.java
index 892810c59..892810c59 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/ConstructorDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/ConstructorDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/EmptyMemberDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EmptyMemberDeclaration.java
index 1c19d097f..1c19d097f 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/EmptyMemberDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EmptyMemberDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/EmptyTypeDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EmptyTypeDeclaration.java
index 59e868600..59e868600 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/EmptyTypeDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EmptyTypeDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/EnumConstantDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EnumConstantDeclaration.java
index d7c425cda..d7c425cda 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/EnumConstantDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EnumConstantDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/EnumDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EnumDeclaration.java
index 34b8ee4e5..34b8ee4e5 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/EnumDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EnumDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/FieldDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/FieldDeclaration.java
index 2f48ed8f5..2f48ed8f5 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/FieldDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/FieldDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/InitializerDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/InitializerDeclaration.java
index ea1df9a98..ea1df9a98 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/InitializerDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/InitializerDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/MethodDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/MethodDeclaration.java
index 7f9ca0b7d..7f9ca0b7d 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/MethodDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/MethodDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/ModifierSet.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/ModifierSet.java
index 6981ced30..6981ced30 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/ModifierSet.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/ModifierSet.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/MultiTypeParameter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/MultiTypeParameter.java
index 6dad24c71..6dad24c71 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/MultiTypeParameter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/MultiTypeParameter.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/Parameter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/Parameter.java
index 6113d702a..6113d702a 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/Parameter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/Parameter.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/TypeDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/TypeDeclaration.java
index bd7c09327..bd7c09327 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/TypeDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/TypeDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/VariableDeclarator.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/VariableDeclarator.java
index 50097b863..50097b863 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/VariableDeclarator.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/VariableDeclarator.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/VariableDeclaratorId.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/VariableDeclaratorId.java
index c56bd8e7f..c56bd8e7f 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/VariableDeclaratorId.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/VariableDeclaratorId.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/WithDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/WithDeclaration.java
index 8f1725ce6..8f1725ce6 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/WithDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/WithDeclaration.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/comments/BlockComment.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/BlockComment.java
index 299493b87..299493b87 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/comments/BlockComment.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/BlockComment.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/comments/Comment.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/Comment.java
index 135972b92..135972b92 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/comments/Comment.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/Comment.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/comments/CommentsCollection.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/CommentsCollection.java
index ac94c61d5..ac94c61d5 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/comments/CommentsCollection.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/CommentsCollection.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/comments/CommentsParser.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/CommentsParser.java
index 3d3a59d45..3d3a59d45 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/comments/CommentsParser.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/CommentsParser.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/comments/JavadocComment.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/JavadocComment.java
index a070321ff..a070321ff 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/comments/JavadocComment.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/JavadocComment.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/comments/LineComment.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/LineComment.java
index b3df1df0e..b3df1df0e 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/comments/LineComment.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/LineComment.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/AnnotationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/AnnotationExpr.java
index 8c65e926f..8c65e926f 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/AnnotationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/AnnotationExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayAccessExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayAccessExpr.java
index 7026d15eb..7026d15eb 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayAccessExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayAccessExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayCreationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayCreationExpr.java
index 1ca425b51..1ca425b51 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayCreationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayCreationExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayInitializerExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
index f7fa424cf..f7fa424cf 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/AssignExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/AssignExpr.java
index b3d508fe9..b3d508fe9 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/AssignExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/AssignExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/BinaryExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/BinaryExpr.java
index 4ace4bec4..4ace4bec4 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/BinaryExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/BinaryExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/BooleanLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
index e92244a62..e92244a62 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/CastExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/CastExpr.java
index 843386968..843386968 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/CastExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/CastExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/CharLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/CharLiteralExpr.java
index 061805d47..061805d47 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/CharLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/CharLiteralExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/ClassExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ClassExpr.java
index bd33c6730..bd33c6730 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/ClassExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ClassExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/ConditionalExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ConditionalExpr.java
index 31db61cca..31db61cca 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/ConditionalExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ConditionalExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/DoubleLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
index ce6962d7b..ce6962d7b 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/EnclosedExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/EnclosedExpr.java
index 72f9de2a1..72f9de2a1 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/EnclosedExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/EnclosedExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/Expression.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/Expression.java
index 8b36d6b1d..8b36d6b1d 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/Expression.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/Expression.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/FieldAccessExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/FieldAccessExpr.java
index b57bf7fe0..b57bf7fe0 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/FieldAccessExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/FieldAccessExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/InstanceOfExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/InstanceOfExpr.java
index 9a9786512..9a9786512 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/InstanceOfExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/InstanceOfExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/IntegerLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
index b326c5770..b326c5770 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java
index 238b56431..238b56431 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/LambdaExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LambdaExpr.java
index 4e4e93444..4e4e93444 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/LambdaExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LambdaExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/LiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LiteralExpr.java
index 7827f7866..7827f7866 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/LiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LiteralExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/LongLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LongLiteralExpr.java
index 15ea255ba..15ea255ba 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/LongLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LongLiteralExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java
index f351f7a59..f351f7a59 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java
index c1a354530..c1a354530 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/MemberValuePair.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MemberValuePair.java
index e0fa80c66..e0fa80c66 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/MemberValuePair.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MemberValuePair.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/MethodCallExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MethodCallExpr.java
index 9d5d10f06..9d5d10f06 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/MethodCallExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MethodCallExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/MethodReferenceExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MethodReferenceExpr.java
index 918ad3f2a..918ad3f2a 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/MethodReferenceExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MethodReferenceExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/NameExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/NameExpr.java
index 5cdbbbb6c..5cdbbbb6c 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/NameExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/NameExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/NormalAnnotationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
index 2b2adfd72..2b2adfd72 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/NullLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/NullLiteralExpr.java
index c7bc177d5..c7bc177d5 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/NullLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/NullLiteralExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/ObjectCreationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ObjectCreationExpr.java
index 228dabc2c..228dabc2c 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/ObjectCreationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ObjectCreationExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/QualifiedNameExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/QualifiedNameExpr.java
index 00a65aa7f..00a65aa7f 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/QualifiedNameExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/QualifiedNameExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
index bd8adb116..bd8adb116 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/StringLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/StringLiteralExpr.java
index 6876fa23e..6876fa23e 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/StringLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/StringLiteralExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/SuperExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/SuperExpr.java
index 791d28bc9..791d28bc9 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/SuperExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/SuperExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/ThisExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ThisExpr.java
index c269376c9..c269376c9 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/ThisExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ThisExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/TypeExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/TypeExpr.java
index 636d2c4a0..636d2c4a0 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/TypeExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/TypeExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/UnaryExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/UnaryExpr.java
index 19d936018..19d936018 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/UnaryExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/UnaryExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/VariableDeclarationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
index 2dcaa2299..2dcaa2299 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/internal/Utils.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/internal/Utils.java
index 0bb7abbba..0bb7abbba 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/internal/Utils.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/internal/Utils.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/AssertStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/AssertStmt.java
index 60f61bca5..60f61bca5 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/AssertStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/AssertStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/BlockStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/BlockStmt.java
index d8b16738e..d8b16738e 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/BlockStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/BlockStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/BreakStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/BreakStmt.java
index 1a80f3e67..1a80f3e67 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/BreakStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/BreakStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/CatchClause.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/CatchClause.java
index 3f43e7977..3f43e7977 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/CatchClause.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/CatchClause.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ContinueStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ContinueStmt.java
index 81760d0a0..81760d0a0 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ContinueStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ContinueStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/DoStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/DoStmt.java
index 0a6a77040..0a6a77040 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/DoStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/DoStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/EmptyStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/EmptyStmt.java
index fb16c4d98..fb16c4d98 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/EmptyStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/EmptyStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java
index d0a9efe8c..d0a9efe8c 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ExpressionStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ExpressionStmt.java
index 3c441e2a3..3c441e2a3 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ExpressionStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ExpressionStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ForStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ForStmt.java
index 8e349bf2c..8e349bf2c 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ForStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ForStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ForeachStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ForeachStmt.java
index 245622fc5..245622fc5 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ForeachStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ForeachStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/IfStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/IfStmt.java
index ccddd903e..ccddd903e 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/IfStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/IfStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/LabeledStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/LabeledStmt.java
index 85d8e7b99..85d8e7b99 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/LabeledStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/LabeledStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ReturnStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ReturnStmt.java
index 3ac6fa65e..3ac6fa65e 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ReturnStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ReturnStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/Statement.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/Statement.java
index 30c462d05..30c462d05 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/Statement.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/Statement.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SwitchEntryStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
index 8f5a85ad5..8f5a85ad5 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SwitchStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SwitchStmt.java
index 49fe903da..49fe903da 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SwitchStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SwitchStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SynchronizedStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SynchronizedStmt.java
index e91fc0b19..e91fc0b19 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SynchronizedStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SynchronizedStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ThrowStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ThrowStmt.java
index 48283b16d..48283b16d 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ThrowStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ThrowStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/TryStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/TryStmt.java
index 44009c4c9..44009c4c9 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/TryStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/TryStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java
index 79b507a1f..79b507a1f 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/WhileStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/WhileStmt.java
index 51b2a1a23..51b2a1a23 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/WhileStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/WhileStmt.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/type/ClassOrInterfaceType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/ClassOrInterfaceType.java
index a7efbf4e3..a7efbf4e3 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/type/ClassOrInterfaceType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/ClassOrInterfaceType.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/type/PrimitiveType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/PrimitiveType.java
index 561a89657..561a89657 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/type/PrimitiveType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/PrimitiveType.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/type/ReferenceType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/ReferenceType.java
index 608848fc0..608848fc0 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/type/ReferenceType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/ReferenceType.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/type/Type.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/Type.java
index 22c91240f..22c91240f 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/type/Type.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/Type.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/type/UnknownType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/UnknownType.java
index af6d4d979..af6d4d979 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/type/UnknownType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/UnknownType.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/type/VoidType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/VoidType.java
index 5dacbe1e7..5dacbe1e7 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/type/VoidType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/VoidType.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/type/WildcardType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/WildcardType.java
index 8016ed70e..8016ed70e 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/type/WildcardType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/WildcardType.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/CloneVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/CloneVisitor.java
index 3d8d299aa..3d8d299aa 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/CloneVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/CloneVisitor.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/DumpVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/DumpVisitor.java
index 8b04afe0a..8b04afe0a 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/DumpVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/DumpVisitor.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/EqualsVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/EqualsVisitor.java
index 8f4a786c0..8f4a786c0 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/EqualsVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/EqualsVisitor.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/GenericVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/GenericVisitor.java
index 58fbf6db9..58fbf6db9 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/GenericVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/GenericVisitor.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java
index eac9cab40..eac9cab40 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java
index 3d23cea5a..3d23cea5a 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/VoidVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/VoidVisitor.java
index b85bd55a7..b85bd55a7 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/VoidVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/VoidVisitor.java
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java
index ddad12fb7..ddad12fb7 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java