Merge remote-tracking branch 'jp/master' into issue_1359
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 bbd76e0..eb30722 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 @@
@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 @@
@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 @@
@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 @@
}
@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 @@
@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 @@
@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 @@
@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 @@
@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 b0af2d9..da4b3cb 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 @@
}
@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 @@
}
@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 @@
}
@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 7e26b9f..0e70b18 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 @@
@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 5852814..c171f4b 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 @@
@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 d31c1f8..cf5e580 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 @@
@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 2f4c9f5..ded9267 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 @@
*/
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 e90f5c8..7b9f61b 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 @@
@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 7ba9c00..254609e 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 @@
*/
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 @@
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 @@
// }
@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 c4561da..53c0e04 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 @@
@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 8f38529..b53607d 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 @@
@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 8607987..eafe601 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 @@
@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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/CommentsInserter.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/JavaParser.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/PackageLocalClasses.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ParseProblemException.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ParseResult.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ParseStart.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ParserConfiguration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/Position.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/Problem.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/Providers.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/Range.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/AccessSpecifier.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ArrayBracketPair.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ArrayCreationLevel.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/CompilationUnit.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Example.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ImportDeclaration.java
rename to 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
similarity index 99%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Modifier.java
rename to javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Modifier.java
index 14ecfe8..3f5a50b 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Node.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/PackageDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/UserDataKey.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/AnnotationDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/BodyDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/ConstructorDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EmptyMemberDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EmptyTypeDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EnumConstantDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EnumDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/FieldDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/InitializerDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/MethodDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/Parameter.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/TypeDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/VariableDeclarator.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/VariableDeclaratorId.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/BlockComment.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/Comment.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/CommentsCollection.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/JavadocComment.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/LineComment.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/AnnotationExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayAccessExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayCreationExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/AssignExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/BinaryExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/CastExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/CharLiteralExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ClassExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ConditionalExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/EnclosedExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/Expression.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/FieldAccessExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/InstanceOfExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LambdaExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LiteralExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LongLiteralExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MemberValuePair.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MethodCallExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MethodReferenceExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NameExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NullLiteralExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ObjectCreationExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/QualifiedNameExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/StringLiteralExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/SuperExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ThisExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/TypeExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/UnaryExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java
rename to 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
similarity index 99%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithBlockStmt.java
rename to javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithBlockStmt.java
index 6117447..381318b 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
similarity index 99%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithBody.java
rename to javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithBody.java
index c30bfda..2adfe86 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithElementType.java
rename to 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
similarity index 99%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithExtends.java
rename to javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithExtends.java
index 3e83f9b..083fc01 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
similarity index 99%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithImplements.java
rename to javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithImplements.java
index adb6df2..3f51925 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithJavaDoc.java
rename to 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
similarity index 99%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java
rename to javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java
index a14b3dd..827e5ed 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<Integer,String>","int" to match<br>
- * void foo(Map<Integer,String> 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<Integer,String>","int" to match<br>
- * void foo(Map<Integer,String> 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<Integer,String>","int" to match<br>
+ * void foo(Map<Integer,String> 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<Integer,String>","int" to match<br>
+ * void foo(Map<Integer,String> 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithName.java
rename to 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
similarity index 99%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java
rename to javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java
index d22ab3c..fb8697f 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
similarity index 99%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithStatements.java
rename to javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithStatements.java
index dfd0654..b6c895e 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
similarity index 99%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithThrowable.java
rename to javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithThrowable.java
index 3b39b30..beee9e7 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
similarity index 99%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithType.java
rename to javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithType.java
index e32dbd9..fc183b2 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithTypeArguments.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithVariables.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/AssertStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/BlockStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/BreakStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/CatchClause.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ContinueStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/DoStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/EmptyStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ExpressionStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ForStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ForeachStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/IfStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/LabeledStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ReturnStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/Statement.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SwitchStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SynchronizedStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ThrowStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/TryStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/WhileStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ArrayType.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ClassOrInterfaceType.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/IntersectionType.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/PrimitiveType.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ReferenceType.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/Type.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/TypeParameter.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/UnionType.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/UnknownType.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/VoidType.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/WildcardType.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/CloneVisitor.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/DumpVisitor.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/EqualsVisitor.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/GenericVisitor.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/TreeVisitor.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/VoidVisitor.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/utils/ClassUtils.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/utils/Pair.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/utils/PositionUtils.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-core/com/github/javaparser/utils/Utils.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParser.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParserConstants.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParserTokenManager.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/JavaCharStream.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ParseException.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/Provider.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/StreamProvider.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/StringProvider.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/Token.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/TokenMgrError.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/TokenMgrException.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/generated/com/github/javaparser/ASTParser.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/generated/com/github/javaparser/ASTParserConstants.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/generated/com/github/javaparser/ASTParserTokenManager.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/generated/com/github/javaparser/JavaCharStream.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/generated/com/github/javaparser/ParseException.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/generated/com/github/javaparser/Token.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/generated/com/github/javaparser/TokenMgrError.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ASTHelper.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/JavaParser.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/Position.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/PositionUtils.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/SourcesHelper.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/AccessSpecifier.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/CompilationUnit.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/DocumentableNode.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/ImportDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/NamedNode.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/Node.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/PackageDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/TreeVisitor.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/TypeParameter.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotableNode.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotationDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/BaseParameter.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/BodyDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/ConstructorDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/EmptyMemberDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/EmptyTypeDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/EnumConstantDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/EnumDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/FieldDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/InitializerDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/MethodDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/ModifierSet.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/MultiTypeParameter.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/Parameter.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/TypeDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/VariableDeclarator.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/VariableDeclaratorId.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/body/WithDeclaration.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/comments/BlockComment.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/comments/Comment.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/comments/CommentsCollection.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/comments/CommentsParser.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/comments/JavadocComment.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/comments/LineComment.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/AnnotationExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayAccessExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayCreationExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/AssignExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/BinaryExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/CastExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/CharLiteralExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/ClassExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/ConditionalExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/EnclosedExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/Expression.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/FieldAccessExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/InstanceOfExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/LambdaExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/LiteralExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/LongLiteralExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/MemberValuePair.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/MethodCallExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/MethodReferenceExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/NameExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/NullLiteralExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/ObjectCreationExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/QualifiedNameExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/StringLiteralExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/SuperExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/ThisExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/TypeExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/UnaryExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/internal/Utils.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/AssertStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/BlockStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/BreakStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/CatchClause.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ContinueStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/DoStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/EmptyStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ExpressionStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ForStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ForeachStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/IfStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/LabeledStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ReturnStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/Statement.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SwitchStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SynchronizedStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ThrowStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/TryStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/stmt/WhileStmt.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/type/ClassOrInterfaceType.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/type/PrimitiveType.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/type/ReferenceType.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/type/Type.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/type/UnknownType.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/type/VoidType.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/type/WildcardType.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/CloneVisitor.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/DumpVisitor.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/EqualsVisitor.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/GenericVisitor.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/VoidVisitor.java
rename to 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
similarity index 100%
rename from javaparser-symbol-solver-testing/src/test/resources/javaparser_src/proper_source/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java
rename to javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/printer/ConcreteSyntaxModelAcceptanceTest.java b/javaparser-testing/src/test/java/com/github/javaparser/printer/ConcreteSyntaxModelAcceptanceTest.java
index 9f27bb4..af47a9d 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/printer/ConcreteSyntaxModelAcceptanceTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/printer/ConcreteSyntaxModelAcceptanceTest.java
@@ -24,14 +24,17 @@
import com.github.javaparser.JavaParser;
import com.github.javaparser.ast.CompilationUnit;
import com.github.javaparser.ast.Node;
+import com.github.javaparser.utils.CodeGenerationUtils;
import com.github.javaparser.utils.TestUtils;
import org.junit.Test;
import java.io.IOException;
+import java.nio.file.Path;
import static org.junit.Assert.assertEquals;
public class ConcreteSyntaxModelAcceptanceTest {
+ private final Path rootDir = CodeGenerationUtils.mavenModuleRoot(ConcreteSyntaxModelAcceptanceTest.class).resolve("src/test/test_sourcecode");
private String prettyPrint(Node node) {
return ConcreteSyntaxModel.genericPrettyPrint(node);
@@ -43,13 +46,13 @@
@Test
public void printingExamplePrettyPrintVisitor() throws IOException {
- CompilationUnit cu = JavaParser.parseResource("com/github/javaparser/printer/PrettyPrintVisitor_saved.java");
+ CompilationUnit cu = JavaParser.parse(rootDir.resolve("com/github/javaparser/printer/PrettyPrintVisitor.java"));
assertEquals(prettyPrintedExpectation("PrettyPrintVisitor"), prettyPrint(cu));
}
@Test
public void printingExampleJavaConcepts() throws IOException {
- CompilationUnit cu = JavaParser.parseResource("com/github/javaparser/printer/JavaConcepts_saved.java");
+ CompilationUnit cu = JavaParser.parse(rootDir.resolve("com/github/javaparser/printer/JavaConcepts.java"));
assertEquals(prettyPrintedExpectation("JavaConcepts"), prettyPrint(cu));
}
diff --git a/javaparser-testing/src/test/resources/com/github/javaparser/printer/JavaConcepts_saved.java b/javaparser-testing/src/test/test_sourcecode/com/github/javaparser/printer/JavaConcepts.java
similarity index 100%
rename from javaparser-testing/src/test/resources/com/github/javaparser/printer/JavaConcepts_saved.java
rename to javaparser-testing/src/test/test_sourcecode/com/github/javaparser/printer/JavaConcepts.java
diff --git a/javaparser-testing/src/test/resources/com/github/javaparser/printer/PrettyPrintVisitor_saved.java b/javaparser-testing/src/test/test_sourcecode/com/github/javaparser/printer/PrettyPrintVisitor.java
similarity index 100%
rename from javaparser-testing/src/test/resources/com/github/javaparser/printer/PrettyPrintVisitor_saved.java
rename to javaparser-testing/src/test/test_sourcecode/com/github/javaparser/printer/PrettyPrintVisitor.java
