Move test projects out of classpath

SonarSource · Dec 17, 2020 · 3ff229a · 3ff229a
1 parent a164f5f
commit 3ff229a
Show file tree

Hide file tree

Showing 23 changed files with 3 additions and 3 deletions.
diff --git a/src/test/java/org/sonarsource/scanner/maven/SonarQubeMojoTest.java b/src/test/java/org/sonarsource/scanner/maven/SonarQubeMojoTest.java
@@ -162,13 +162,13 @@ public void verbose() throws Exception {
 
   private File executeProject(String projectName, String... properties) throws Exception {
 
-    File baseDir = new File("src/test/resources/org/sonarsource/scanner/maven/SonarQubeMojoTest/" + projectName);
+    File baseDir = new File("src/test/projects/" + projectName).getAbsoluteFile();
     SonarQubeMojo mojo = getMojo(baseDir);
     mojo.getSession().getProjects().get(0).setExecutionRoot(true);
     mojo.getSession().setAllProjects(mojo.getSession().getProjects());
 
-    Result<? extends ProjectDependencyGraph> result = mojoRule.lookup( GraphBuilder.class ).build( mojo.getSession() );
-    mojo.getSession().setProjectDependencyGraph( result.get() ); // done by maven in a normal execution
+    Result<? extends ProjectDependencyGraph> result = mojoRule.lookup(GraphBuilder.class).build(mojo.getSession());
+    mojo.getSession().setProjectDependencyGraph(result.get()); // done by maven in a normal execution
 
     mojo.setLog(mockedLogger);
 

diff --git a/...-with-findbugs-build/findbugs-exclude.xml → ...-with-findbugs-build/findbugs-exclude.xml b/...-with-findbugs-build/findbugs-exclude.xml → ...-with-findbugs-build/findbugs-exclude.xml
diff --git a/...oTest/project-with-findbugs-build/pom.xml → ...jects/project-with-findbugs-build/pom.xml b/...oTest/project-with-findbugs-build/pom.xml → ...jects/project-with-findbugs-build/pom.xml
diff --git a/...gs-plugin-management/findbugs-exclude.xml → ...gs-plugin-management/findbugs-exclude.xml b/...gs-plugin-management/findbugs-exclude.xml → ...gs-plugin-management/findbugs-exclude.xml
diff --git a/...t-with-findbugs-plugin-management/pom.xml → ...t-with-findbugs-plugin-management/pom.xml b/...t-with-findbugs-plugin-management/pom.xml → ...t-with-findbugs-plugin-management/pom.xml
diff --git a/...h-findbugs-reporting/findbugs-exclude.xml → ...h-findbugs-reporting/findbugs-exclude.xml b/...h-findbugs-reporting/findbugs-exclude.xml → ...h-findbugs-reporting/findbugs-exclude.xml
diff --git a/...t/project-with-findbugs-reporting/pom.xml → ...s/project-with-findbugs-reporting/pom.xml b/...t/project-with-findbugs-reporting/pom.xml → ...s/project-with-findbugs-reporting/pom.xml
diff --git a/...ple-project-with-compiler-release/pom.xml → ...ple-project-with-compiler-release/pom.xml b/...ple-project-with-compiler-release/pom.xml → ...ple-project-with-compiler-release/pom.xml
diff --git a/...project-with-custom-surefire-path/pom.xml → ...project-with-custom-surefire-path/pom.xml b/...project-with-custom-surefire-path/pom.xml → ...project-with-custom-surefire-path/pom.xml
diff --git a/...efire-path/target/classes/placeholder.txt → ...efire-path/target/classes/placeholder.txt b/...efire-path/target/classes/placeholder.txt → ...efire-path/target/classes/placeholder.txt
diff --git a/...urefire-path/target/tests/placeholder.txt → ...urefire-path/target/tests/placeholder.txt b/...urefire-path/target/tests/placeholder.txt → ...urefire-path/target/tests/placeholder.txt
diff --git a/.../sample-project-with-java-version/pom.xml → .../sample-project-with-java-version/pom.xml b/.../sample-project-with-java-version/pom.xml → .../sample-project-with-java-version/pom.xml
diff --git a/...Test/sample-project-with-surefire/pom.xml → ...ects/sample-project-with-surefire/pom.xml b/...Test/sample-project-with-surefire/pom.xml → ...ects/sample-project-with-surefire/pom.xml
diff --git a/...h-surefire/target/classes/placeholder.txt → ...h-surefire/target/classes/placeholder.txt b/...h-surefire/target/classes/placeholder.txt → ...h-surefire/target/classes/placeholder.txt
diff --git a/...e/target/surefire-reports/placeholder.txt → ...e/target/surefire-reports/placeholder.txt b/...e/target/surefire-reports/placeholder.txt → ...e/target/surefire-reports/placeholder.txt
diff --git a/.../SonarQubeMojoTest/sample-project/pom.xml → src/test/projects/sample-project/pom.xml b/.../SonarQubeMojoTest/sample-project/pom.xml → src/test/projects/sample-project/pom.xml
diff --git a/...le-project/target/classes/placeholder.txt → ...le-project/target/classes/placeholder.txt b/...le-project/target/classes/placeholder.txt → ...le-project/target/classes/placeholder.txt
diff --git a/...arQubeMojoTest/sample-war-project/pom.xml → src/test/projects/sample-war-project/pom.xml b/...arQubeMojoTest/sample-war-project/pom.xml → src/test/projects/sample-war-project/pom.xml
diff --git a/...ample-war-project/src/main/java/Main.java → ...ample-war-project/src/main/java/Main.java b/...ample-war-project/src/main/java/Main.java → ...ample-war-project/src/main/java/Main.java
diff --git a/...le-war-project/src/main/webapp/index.html → ...le-war-project/src/main/webapp/index.html b/...le-war-project/src/main/webapp/index.html → ...le-war-project/src/main/webapp/index.html
diff --git a/...Test/war-project-override-web-dir/pom.xml → ...ects/war-project-override-web-dir/pom.xml b/...Test/war-project-override-web-dir/pom.xml → ...ects/war-project-override-web-dir/pom.xml
diff --git a/...-override-web-dir/src/main/java/Main.java → ...-override-web-dir/src/main/java/Main.java b/...-override-web-dir/src/main/java/Main.java → ...-override-web-dir/src/main/java/Main.java
diff --git a/...r-project-override-web-dir/web/index.html → ...r-project-override-web-dir/web/index.html b/...r-project-override-web-dir/web/index.html → ...r-project-override-web-dir/web/index.html