diff options
author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2018-11-26 17:52:38 +0100 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2018-11-30 11:20:47 +0100 |
commit | 4faa730d018c2f9b6f690174516e875db5ce8308 (patch) | |
tree | fdabec6438ee2ed873ac8b80882b1372a7d89625 | |
parent | 417280ac3f309cc5ac019849a616c34ac042ccd4 (diff) | |
download | sonarqube-4faa730d018c2f9b6f690174516e875db5ce8308.tar.gz sonarqube-4faa730d018c2f9b6f690174516e875db5ce8308.zip |
Move scan test resources outside IDE classpath
That fixes the compatibility with Idea 2018.3
-rw-r--r-- | sonar-plugin-api/src/test/java/org/sonar/api/scan/filesystem/PathResolverTest.java | 4 | ||||
-rw-r--r-- | sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample-with-symlink/.gitignore (renamed from sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample-with-symlink/.gitignore) | 0 | ||||
-rw-r--r-- | sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample-with-symlink/sonar-project.properties (renamed from sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample-with-symlink/sonar-project.properties) | 0 | ||||
l--------- | sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample-with-symlink/testx (renamed from sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample-with-symlink/testx) | 0 | ||||
l--------- | sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample-with-symlink/xources (renamed from sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample-with-symlink/xources) | 0 | ||||
-rw-r--r-- | sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/sonar-project.properties (renamed from sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/sonar-project.properties) | 0 | ||||
-rw-r--r-- | sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/testx/ClassOneTest.xoo (renamed from sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/testx/ClassOneTest.xoo) | 0 | ||||
-rw-r--r-- | sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/testx/ClassOneTest.xoo.measures (renamed from sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/testx/ClassOneTest.xoo.measures) | 0 | ||||
-rw-r--r-- | sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/testx/ClassOneTest.xoo.scm (renamed from sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/testx/ClassOneTest.xoo.scm) | 0 | ||||
-rw-r--r-- | sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/xources/hello/HelloJava.xoo (renamed from sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/xources/hello/HelloJava.xoo) | 0 | ||||
-rw-r--r-- | sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/xources/hello/HelloJava.xoo.measures (renamed from sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/xources/hello/HelloJava.xoo.measures) | 0 | ||||
-rw-r--r-- | sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/xources/hello/HelloJava.xoo.scm (renamed from sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/xources/hello/HelloJava.xoo.scm) | 0 | ||||
-rw-r--r-- | sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/xources/hello/helloscala.xoo (renamed from sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/xources/hello/helloscala.xoo) | 0 | ||||
-rw-r--r-- | sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/xources/hello/helloscala.xoo.measures (renamed from sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/xources/hello/helloscala.xoo.measures) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/coverage/GenericCoverageMediumTest.java | 6 | ||||
-rw-r--r-- | sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java | 8 | ||||
-rw-r--r-- | sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/NoLanguagesPluginsMediumTest.java | 5 | ||||
-rw-r--r-- | sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/ExternalIssuesMediumTest.java | 6 | ||||
-rw-r--r-- | sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/IssuesMediumTest.java | 10 | ||||
-rw-r--r-- | sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/MultilineIssuesMediumTest.java | 2 | ||||
-rw-r--r-- | sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/EmptyFileTest.java | 4 | ||||
-rw-r--r-- | sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/IssueModeAndReportsMediumTest.java | 6 | ||||
-rw-r--r-- | sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/NoPreviousAnalysisTest.java | 4 | ||||
-rw-r--r-- | sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/ScanOnlyChangedTest.java | 12 | ||||
-rw-r--r-- | sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/scm/ScmMediumTest.java | 4 | ||||
-rw-r--r-- | sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/tests/GenericTestExecutionMediumTest.java | 4 | ||||
-rw-r--r-- | sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/CharsetValidationTest.java | 5 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/blameAuthor.txt (renamed from sonar-scanner-engine/src/test/resources/mediumtest/blameAuthor.txt) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/multi-modules-sample/sonar-project.properties (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/sonar-project.properties) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-coverage/coverage.xml (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-coverage/coverage.xml) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-coverage/coverage2.xml (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-coverage/coverage2.xml) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-coverage/sonar-project.properties (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-coverage/sonar-project.properties) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-coverage/xources/hello/NoConditions.xoo (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-coverage/xources/hello/NoConditions.xoo) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-coverage/xources/hello/WithConditions.xoo (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-coverage/xources/hello/WithConditions.xoo) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-test-exec/sonar-project.properties (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-test-exec/sonar-project.properties) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-test-exec/testx/ClassOneTest.xoo (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-test-exec/testx/ClassOneTest.xoo) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-test-exec/unittest.xml (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-test-exec/unittest.xml) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-test-exec/unittest2.xml (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-test-exec/unittest2.xml) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-test-exec/xources/hello/HelloJava.xoo (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-test-exec/xources/hello/HelloJava.xoo) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample-multiline/sonar-project.properties (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/sonar-project.properties) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample-multiline/xources/hello/Multiline.xoo (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/Multiline.xoo) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample-multiline/xources/hello/Multiple.xoo (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/Multiple.xoo) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample-multiline/xources/hello/Single.xoo (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/Single.xoo) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample-multiline/xources/hello/WithFlow.xoo (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/WithFlow.xoo) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample-with-empty-file/sonar-project.properties (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-empty-file/sonar-project.properties) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample-with-empty-file/xources/hello/Empty.xoo (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-empty-file/xources/hello/Empty.xoo) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample-with-empty-file/xources/hello/HelloJava.xoo (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-empty-file/xources/hello/HelloJava.xoo) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample-with-symlink/.gitignore (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-symlink/.gitignore) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample-with-symlink/sonar-project.properties (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-symlink/sonar-project.properties) | 0 | ||||
l--------- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample-with-symlink/testx (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-symlink/testx) | 0 | ||||
l--------- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample-with-symlink/xources (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-symlink/xources) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample/externalIssues.json (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/externalIssues.json) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample/sonar-project.properties (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/sonar-project.properties) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo.measures (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo.measures) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo.scm (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo.scm) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo.measures (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo.measures) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo.scm (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo.scm) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample/xources/hello/helloscala.xoo (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/helloscala.xoo) | 0 | ||||
-rw-r--r-- | sonar-scanner-engine/test-resources/mediumtest/xoo/sample/xources/hello/helloscala.xoo.measures (renamed from sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/helloscala.xoo.measures) | 0 |
65 files changed, 38 insertions, 42 deletions
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/scan/filesystem/PathResolverTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/scan/filesystem/PathResolverTest.java index fab947f9eb1..a71e788ecbc 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/scan/filesystem/PathResolverTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/scan/filesystem/PathResolverTest.java @@ -184,9 +184,9 @@ public class PathResolverTest { @Test public void supportSymlink() { PathResolver resolver = new PathResolver(); - File rootDir = new File("src/test/resources/org/sonar/api/scan/filesystem/sample-with-symlink"); + File rootDir = new File("test-resources/org/sonar/api/scan/filesystem/sample-with-symlink"); - assertThat(resolver.relativePath(rootDir, new File("src/test/resources/org/sonar/api/scan/filesystem/sample-with-symlink/testx/ClassOneTest.java"))).isEqualTo( + assertThat(resolver.relativePath(rootDir, new File("test-resources/org/sonar/api/scan/filesystem/sample-with-symlink/testx/ClassOneTest.java"))).isEqualTo( "testx/ClassOneTest.java"); } } diff --git a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample-with-symlink/.gitignore b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample-with-symlink/.gitignore index ecbefd4f19d..ecbefd4f19d 100644 --- a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample-with-symlink/.gitignore +++ b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample-with-symlink/.gitignore diff --git a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample-with-symlink/sonar-project.properties b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample-with-symlink/sonar-project.properties index 8810e376701..8810e376701 100644 --- a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample-with-symlink/sonar-project.properties +++ b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample-with-symlink/sonar-project.properties diff --git a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample-with-symlink/testx b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample-with-symlink/testx index 7385ebd51cf..7385ebd51cf 120000 --- a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample-with-symlink/testx +++ b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample-with-symlink/testx diff --git a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample-with-symlink/xources b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample-with-symlink/xources index 15dca9d90d2..15dca9d90d2 120000 --- a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample-with-symlink/xources +++ b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample-with-symlink/xources diff --git a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/sonar-project.properties b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/sonar-project.properties index 8810e376701..8810e376701 100644 --- a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/sonar-project.properties +++ b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/sonar-project.properties diff --git a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/testx/ClassOneTest.xoo b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/testx/ClassOneTest.xoo index 8c0967e496f..8c0967e496f 100644 --- a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/testx/ClassOneTest.xoo +++ b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/testx/ClassOneTest.xoo diff --git a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/testx/ClassOneTest.xoo.measures b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/testx/ClassOneTest.xoo.measures index 23b08dc0e0e..23b08dc0e0e 100644 --- a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/testx/ClassOneTest.xoo.measures +++ b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/testx/ClassOneTest.xoo.measures diff --git a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/testx/ClassOneTest.xoo.scm b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/testx/ClassOneTest.xoo.scm index 2cec35b8a72..2cec35b8a72 100644 --- a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/testx/ClassOneTest.xoo.scm +++ b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/testx/ClassOneTest.xoo.scm diff --git a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/xources/hello/HelloJava.xoo b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/xources/hello/HelloJava.xoo index 1d9c60d56b7..1d9c60d56b7 100644 --- a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/xources/hello/HelloJava.xoo +++ b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/xources/hello/HelloJava.xoo diff --git a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/xources/hello/HelloJava.xoo.measures b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/xources/hello/HelloJava.xoo.measures index 9eaf8ba2549..9eaf8ba2549 100644 --- a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/xources/hello/HelloJava.xoo.measures +++ b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/xources/hello/HelloJava.xoo.measures diff --git a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/xources/hello/HelloJava.xoo.scm b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/xources/hello/HelloJava.xoo.scm index 03a9de2f486..03a9de2f486 100644 --- a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/xources/hello/HelloJava.xoo.scm +++ b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/xources/hello/HelloJava.xoo.scm diff --git a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/xources/hello/helloscala.xoo b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/xources/hello/helloscala.xoo index 53cb085156c..53cb085156c 100644 --- a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/xources/hello/helloscala.xoo +++ b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/xources/hello/helloscala.xoo diff --git a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/xources/hello/helloscala.xoo.measures b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/xources/hello/helloscala.xoo.measures index d2c8386aed1..d2c8386aed1 100644 --- a/sonar-plugin-api/src/test/resources/org/sonar/api/scan/filesystem/sample/xources/hello/helloscala.xoo.measures +++ b/sonar-plugin-api/test-resources/org/sonar/api/filesystem/sample/xources/hello/helloscala.xoo.measures diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/coverage/GenericCoverageMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/coverage/GenericCoverageMediumTest.java index 2afc3545f3d..a55b3a42675 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/coverage/GenericCoverageMediumTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/coverage/GenericCoverageMediumTest.java @@ -45,7 +45,7 @@ public class GenericCoverageMediumTest { @Test public void singleReport() throws IOException { - File projectDir = new File("src/test/resources/mediumtest/xoo/sample-generic-coverage"); + File projectDir = new File("test-resources/mediumtest/xoo/sample-generic-coverage"); TaskResult result = tester .setLogOutput((msg, level) -> logs.add(msg)) @@ -87,7 +87,7 @@ public class GenericCoverageMediumTest { @Test public void warnAboutDeprecatedProperty() { - File projectDir = new File("src/test/resources/mediumtest/xoo/sample-generic-coverage"); + File projectDir = new File("test-resources/mediumtest/xoo/sample-generic-coverage"); tester .setLogOutput((msg, level) -> logs.add(msg)) @@ -102,7 +102,7 @@ public class GenericCoverageMediumTest { @Test public void twoReports() throws IOException { - File projectDir = new File("src/test/resources/mediumtest/xoo/sample-generic-coverage"); + File projectDir = new File("test-resources/mediumtest/xoo/sample-generic-coverage"); TaskResult result = tester .setLogOutput((msg, level) -> logs.add(msg)) diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java index d962a397aa8..3d7b7c8d9f1 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java @@ -617,7 +617,7 @@ public class FileSystemMediumTest { @Test public void scanProjectWithSourceSymlink() { assumeTrue(!System2.INSTANCE.isOsWindows()); - File projectDir = new File("src/test/resources/mediumtest/xoo/sample-with-symlink"); + File projectDir = new File("test-resources/mediumtest/xoo/sample-with-symlink"); TaskResult result = tester .newScanTask(new File(projectDir, "sonar-project.properties")) .execute(); @@ -632,7 +632,7 @@ public class FileSystemMediumTest { public void scanProjectWithWrongCase() { // To please the quality gate, don't use assumeTrue, or the test will be reported as skipped if (System2.INSTANCE.isOsWindows()) { - File projectDir = new File("src/test/resources/mediumtest/xoo/sample"); + File projectDir = new File("test-resources/mediumtest/xoo/sample"); TaskResult result = tester .newScanTask(new File(projectDir, "sonar-project.properties")) .property("sonar.sources", "XOURCES") @@ -672,7 +672,7 @@ public class FileSystemMediumTest { @Test public void scanMultiModuleProject() { - File projectDir = new File("src/test/resources/mediumtest/xoo/multi-modules-sample"); + File projectDir = new File("test-resources/mediumtest/xoo/multi-modules-sample"); TaskResult result = tester .newScanTask(new File(projectDir, "sonar-project.properties")) .execute(); @@ -683,7 +683,7 @@ public class FileSystemMediumTest { @Test public void global_sensor_should_see_project_relative_paths() { - File projectDir = new File("src/test/resources/mediumtest/xoo/multi-modules-sample"); + File projectDir = new File("test-resources/mediumtest/xoo/multi-modules-sample"); TaskResult result = tester .newScanTask(new File(projectDir, "sonar-project.properties")) .property(GlobalSensor.ENABLE_PROP, "true") diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/NoLanguagesPluginsMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/NoLanguagesPluginsMediumTest.java index a7aa74db52a..c15908b2a0b 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/NoLanguagesPluginsMediumTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/NoLanguagesPluginsMediumTest.java @@ -27,7 +27,6 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import org.sonar.scanner.mediumtest.ScannerMediumTester; -import org.sonar.scanner.mediumtest.issuesmode.IssueModeAndReportsMediumTest; public class NoLanguagesPluginsMediumTest { @Rule @@ -42,7 +41,7 @@ public class NoLanguagesPluginsMediumTest { @Test public void testNoLanguagePluginsInstalled() throws Exception { - File projectDir = copyProject("/mediumtest/xoo/sample"); + File projectDir = copyProject("test-resources/mediumtest/xoo/sample"); exception.expect(IllegalStateException.class); exception.expectMessage("No language plugins are installed"); @@ -54,7 +53,7 @@ public class NoLanguagesPluginsMediumTest { private File copyProject(String path) throws Exception { File projectDir = temp.newFolder(); - File originalProjectDir = new File(IssueModeAndReportsMediumTest.class.getResource(path).toURI()); + File originalProjectDir = new File(path); FileUtils.copyDirectory(originalProjectDir, projectDir, FileFilterUtils.notFileFilter(FileFilterUtils.nameFileFilter(".sonar"))); return projectDir; } diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/ExternalIssuesMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/ExternalIssuesMediumTest.java index fc3ce5b1798..19b87aa74df 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/ExternalIssuesMediumTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/ExternalIssuesMediumTest.java @@ -53,7 +53,7 @@ public class ExternalIssuesMediumTest { @Test public void testOneIssuePerLine() throws Exception { - File projectDir = new File(IssuesMediumTest.class.getResource("/mediumtest/xoo/sample").toURI()); + File projectDir = new File("test-resources/mediumtest/xoo/sample"); File tmpDir = temp.newFolder(); FileUtils.copyDirectory(projectDir, tmpDir); @@ -76,7 +76,7 @@ public class ExternalIssuesMediumTest { @Test public void testOneIssuePerLine_register_ad_hoc_rule() throws Exception { - File projectDir = new File(IssuesMediumTest.class.getResource("/mediumtest/xoo/sample").toURI()); + File projectDir = new File("test-resources/mediumtest/xoo/sample"); File tmpDir = temp.newFolder(); FileUtils.copyDirectory(projectDir, tmpDir); @@ -105,7 +105,7 @@ public class ExternalIssuesMediumTest { @Test public void testLoadIssuesFromJsonReport() throws URISyntaxException, IOException { - File projectDir = new File(IssuesMediumTest.class.getResource("/mediumtest/xoo/sample").toURI()); + File projectDir = new File("test-resources/mediumtest/xoo/sample"); File tmpDir = temp.newFolder(); FileUtils.copyDirectory(projectDir, tmpDir); diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/IssuesMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/IssuesMediumTest.java index 84de3e207e3..1a7b2b174c8 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/IssuesMediumTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/IssuesMediumTest.java @@ -52,7 +52,7 @@ public class IssuesMediumTest { @Test public void testOneIssuePerLine() throws Exception { - File projectDir = new File(IssuesMediumTest.class.getResource("/mediumtest/xoo/sample").toURI()); + File projectDir = new File("test-resources/mediumtest/xoo/sample"); File tmpDir = temp.newFolder(); FileUtils.copyDirectory(projectDir, tmpDir); @@ -72,7 +72,7 @@ public class IssuesMediumTest { @Test public void testOneExternalIssuePerLine() throws Exception { - File projectDir = new File(IssuesMediumTest.class.getResource("/mediumtest/xoo/sample").toURI()); + File projectDir = new File("test-resources/mediumtest/xoo/sample"); File tmpDir = temp.newFolder(); FileUtils.copyDirectory(projectDir, tmpDir); @@ -90,7 +90,7 @@ public class IssuesMediumTest { @Test public void findActiveRuleByInternalKey() throws Exception { - File projectDir = new File(IssuesMediumTest.class.getResource("/mediumtest/xoo/sample").toURI()); + File projectDir = new File("test-resources/mediumtest/xoo/sample"); File tmpDir = temp.newFolder(); FileUtils.copyDirectory(projectDir, tmpDir); @@ -105,7 +105,7 @@ public class IssuesMediumTest { @Test public void testOverrideQProfileSeverity() throws Exception { - File projectDir = new File(IssuesMediumTest.class.getResource("/mediumtest/xoo/sample").toURI()); + File projectDir = new File("test-resources/mediumtest/xoo/sample"); File tmpDir = temp.newFolder(); FileUtils.copyDirectory(projectDir, tmpDir); @@ -120,7 +120,7 @@ public class IssuesMediumTest { @Test public void testIssueExclusion() throws Exception { - File projectDir = new File(IssuesMediumTest.class.getResource("/mediumtest/xoo/sample").toURI()); + File projectDir = new File("test-resources/mediumtest/xoo/sample"); File tmpDir = temp.newFolder(); FileUtils.copyDirectory(projectDir, tmpDir); diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/MultilineIssuesMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/MultilineIssuesMediumTest.java index dba243a5801..67114046da1 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/MultilineIssuesMediumTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issues/MultilineIssuesMediumTest.java @@ -52,7 +52,7 @@ public class MultilineIssuesMediumTest { @Before public void prepare() throws Exception { - File projectDir = new File(MultilineIssuesMediumTest.class.getResource("/mediumtest/xoo/sample-multiline").toURI()); + File projectDir = new File("test-resources/mediumtest/xoo/sample-multiline"); File tmpDir = temp.getRoot(); FileUtils.copyDirectory(projectDir, tmpDir); diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/EmptyFileTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/EmptyFileTest.java index f0582ec7df3..75c5ae8df9f 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/EmptyFileTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/EmptyFileTest.java @@ -56,7 +56,7 @@ public class EmptyFileTest { @Test public void testIssueTrackingWithIssueOnEmptyFile() throws Exception { - File projectDir = copyProject("/mediumtest/xoo/sample-with-empty-file"); + File projectDir = copyProject("test-resources/mediumtest/xoo/sample-with-empty-file"); TaskResult result = tester .newScanTask(new File(projectDir, "sonar-project.properties")) @@ -72,7 +72,7 @@ public class EmptyFileTest { private File copyProject(String path) throws Exception { File projectDir = temp.newFolder(); - File originalProjectDir = new File(EmptyFileTest.class.getResource(path).toURI()); + File originalProjectDir = new File(path); FileUtils.copyDirectory(originalProjectDir, projectDir, FileFilterUtils.notFileFilter(FileFilterUtils.nameFileFilter(".sonar"))); return projectDir; } diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/IssueModeAndReportsMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/IssueModeAndReportsMediumTest.java index 3fc24522a66..fdc9577437f 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/IssueModeAndReportsMediumTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/IssueModeAndReportsMediumTest.java @@ -110,14 +110,14 @@ public class IssueModeAndReportsMediumTest { private File copyProject(String path) throws Exception { File projectDir = temp.newFolder(); - File originalProjectDir = new File(IssueModeAndReportsMediumTest.class.getResource(path).toURI()); + File originalProjectDir = new File(path); FileUtils.copyDirectory(originalProjectDir, projectDir, FileFilterUtils.notFileFilter(FileFilterUtils.nameFileFilter(".sonar"))); return projectDir; } @Test public void testIssueTracking() throws Exception { - File projectDir = copyProject("/mediumtest/xoo/sample"); + File projectDir = copyProject("test-resources/mediumtest/xoo/sample"); TaskResult result = tester .newScanTask(new File(projectDir, "sonar-project.properties")) @@ -163,7 +163,7 @@ public class IssueModeAndReportsMediumTest { @Test public void testPostJob() throws Exception { - File projectDir = copyProject("/mediumtest/xoo/sample"); + File projectDir = copyProject("test-resources/mediumtest/xoo/sample"); tester .newScanTask(new File(projectDir, "sonar-project.properties")) diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/NoPreviousAnalysisTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/NoPreviousAnalysisTest.java index 38c2ec89f66..c802e686c52 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/NoPreviousAnalysisTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/NoPreviousAnalysisTest.java @@ -53,7 +53,7 @@ public class NoPreviousAnalysisTest { @Test public void testIssueTrackingWithIssueOnEmptyFile() throws Exception { - File projectDir = copyProject("/mediumtest/xoo/sample"); + File projectDir = copyProject("test-resources/mediumtest/xoo/sample"); TaskResult result = tester .newScanTask(new File(projectDir, "sonar-project.properties")) @@ -65,7 +65,7 @@ public class NoPreviousAnalysisTest { private File copyProject(String path) throws Exception { File projectDir = temp.newFolder(); - File originalProjectDir = new File(IssueModeAndReportsMediumTest.class.getResource(path).toURI()); + File originalProjectDir = new File(path); FileUtils.copyDirectory(originalProjectDir, projectDir, FileFilterUtils.notFileFilter(FileFilterUtils.nameFileFilter(".sonar"))); return projectDir; } diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/ScanOnlyChangedTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/ScanOnlyChangedTest.java index d090056194f..c628ac1ad0e 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/ScanOnlyChangedTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/issuesmode/ScanOnlyChangedTest.java @@ -20,10 +20,8 @@ package org.sonar.scanner.mediumtest.issuesmode; import com.google.common.collect.ImmutableMap; -import com.google.common.io.Resources; import java.io.File; import java.io.IOException; -import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; @@ -97,9 +95,9 @@ public class ScanOnlyChangedTest { .addActiveRule("xoo", "OneIssuePerModule", null, "OneIssuePerModule", "MAJOR", null, "xoo"); @Before - public void prepare() throws IOException, URISyntaxException { + public void prepare() throws IOException { String filePath = "xources/hello/HelloJava.xoo"; - Path path = Paths.get(Resources.getResource("mediumtest/xoo/sample/" + filePath).toURI()); + Path path = Paths.get("test-resources/mediumtest/xoo/sample/" + filePath); String md5sum = new FileMetadata() .readMetadata(Files.newInputStream(path), StandardCharsets.UTF_8, filePath) .hash(); @@ -134,14 +132,14 @@ public class ScanOnlyChangedTest { private File copyProject(String path) throws Exception { File projectDir = temp.newFolder(); - File originalProjectDir = new File(IssueModeAndReportsMediumTest.class.getResource(path).toURI()); + File originalProjectDir = new File(path); FileUtils.copyDirectory(originalProjectDir, projectDir, FileFilterUtils.notFileFilter(FileFilterUtils.nameFileFilter(".sonar"))); return projectDir; } @Test public void testScanOnlyChangedFiles() throws Exception { - File projectDir = copyProject("/mediumtest/xoo/sample"); + File projectDir = copyProject("test-resources/mediumtest/xoo/sample"); TaskBuilder taskBuilder = tester .newScanTask(new File(projectDir, "sonar-project.properties")) @@ -169,7 +167,7 @@ public class ScanOnlyChangedTest { @Test public void testScanAll() throws Exception { - File projectDir = copyProject("/mediumtest/xoo/sample"); + File projectDir = copyProject("test-resources/mediumtest/xoo/sample"); TaskBuilder taskBuilder = tester .newScanTask(new File(projectDir, "sonar-project.properties")) diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/scm/ScmMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/scm/ScmMediumTest.java index 1fabbd37845..b302db19089 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/scm/ScmMediumTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/scm/ScmMediumTest.java @@ -320,8 +320,8 @@ public class ScmMediumTest { assertThat(file1Scm).isNotNull(); } - private String getNonAsciiAuthor() throws URISyntaxException { - return Files.contentOf(new File(this.getClass().getResource("/mediumtest/blameAuthor.txt").toURI()), StandardCharsets.UTF_8); + private String getNonAsciiAuthor() { + return Files.contentOf(new File("test-resources/mediumtest/blameAuthor.txt"), StandardCharsets.UTF_8); } diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/tests/GenericTestExecutionMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/tests/GenericTestExecutionMediumTest.java index 19ac322b2a7..95f18082b6c 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/tests/GenericTestExecutionMediumTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/tests/GenericTestExecutionMediumTest.java @@ -101,7 +101,7 @@ public class GenericTestExecutionMediumTest { @Test public void singleReport() throws IOException { - File projectDir = new File("src/test/resources/mediumtest/xoo/sample-generic-test-exec"); + File projectDir = new File("test-resources/mediumtest/xoo/sample-generic-test-exec"); TaskResult result = tester .setLogOutput((msg, level) -> logs.add(msg)) @@ -146,7 +146,7 @@ public class GenericTestExecutionMediumTest { @Test public void twoReports() throws IOException { - File projectDir = new File("src/test/resources/mediumtest/xoo/sample-generic-test-exec"); + File projectDir = new File("test-resources/mediumtest/xoo/sample-generic-test-exec"); TaskResult result = tester .setLogOutput((msg, level) -> logs.add(msg)) diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/CharsetValidationTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/CharsetValidationTest.java index ddf04c53f10..56472e32cfd 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/CharsetValidationTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/CharsetValidationTest.java @@ -20,7 +20,6 @@ package org.sonar.scanner.scan.filesystem; import java.io.IOException; -import java.net.URISyntaxException; import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.charset.CharacterCodingException; @@ -49,8 +48,8 @@ public class CharsetValidationTest { } @Test - public void testWithSourceCode() throws IOException, URISyntaxException { - Path path = Paths.get(this.getClass().getClassLoader().getResource("mediumtest/xoo/sample/xources/hello/HelloJava.xoo").toURI()); + public void testWithSourceCode() throws IOException { + Path path = Paths.get("test-resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo"); List<String> lines = Files.readAllLines(path, StandardCharsets.UTF_8); String text = lines.stream().collect(StringBuffer::new, StringBuffer::append, StringBuffer::append).toString(); diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/blameAuthor.txt b/sonar-scanner-engine/test-resources/mediumtest/blameAuthor.txt index 4b009ad0de6..4b009ad0de6 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/blameAuthor.txt +++ b/sonar-scanner-engine/test-resources/mediumtest/blameAuthor.txt diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo b/sonar-scanner-engine/test-resources/mediumtest/xoo/multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo index 74d29a4fa08..74d29a4fa08 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo b/sonar-scanner-engine/test-resources/mediumtest/xoo/multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo index 42039538a92..42039538a92 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo b/sonar-scanner-engine/test-resources/mediumtest/xoo/multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo index b83c3af128c..b83c3af128c 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo b/sonar-scanner-engine/test-resources/mediumtest/xoo/multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo index 20b8bb3876a..20b8bb3876a 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/sonar-project.properties b/sonar-scanner-engine/test-resources/mediumtest/xoo/multi-modules-sample/sonar-project.properties index b07be6f3e6f..b07be6f3e6f 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/multi-modules-sample/sonar-project.properties +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/multi-modules-sample/sonar-project.properties diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-coverage/coverage.xml b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-coverage/coverage.xml index e12af5e2fb2..e12af5e2fb2 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-coverage/coverage.xml +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-coverage/coverage.xml diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-coverage/coverage2.xml b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-coverage/coverage2.xml index 1a1e02b0f7b..1a1e02b0f7b 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-coverage/coverage2.xml +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-coverage/coverage2.xml diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-coverage/sonar-project.properties b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-coverage/sonar-project.properties index ac18398a604..ac18398a604 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-coverage/sonar-project.properties +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-coverage/sonar-project.properties diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-coverage/xources/hello/NoConditions.xoo b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-coverage/xources/hello/NoConditions.xoo index 1d9c60d56b7..1d9c60d56b7 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-coverage/xources/hello/NoConditions.xoo +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-coverage/xources/hello/NoConditions.xoo diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-coverage/xources/hello/WithConditions.xoo b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-coverage/xources/hello/WithConditions.xoo index 8f469103183..8f469103183 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-coverage/xources/hello/WithConditions.xoo +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-coverage/xources/hello/WithConditions.xoo diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-test-exec/sonar-project.properties b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-test-exec/sonar-project.properties index 8810e376701..8810e376701 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-test-exec/sonar-project.properties +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-test-exec/sonar-project.properties diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-test-exec/testx/ClassOneTest.xoo b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-test-exec/testx/ClassOneTest.xoo index 8c0967e496f..8c0967e496f 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-test-exec/testx/ClassOneTest.xoo +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-test-exec/testx/ClassOneTest.xoo diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-test-exec/unittest.xml b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-test-exec/unittest.xml index a29747422b9..a29747422b9 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-test-exec/unittest.xml +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-test-exec/unittest.xml diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-test-exec/unittest2.xml b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-test-exec/unittest2.xml index 203444d514d..203444d514d 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-test-exec/unittest2.xml +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-test-exec/unittest2.xml diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-test-exec/xources/hello/HelloJava.xoo b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-test-exec/xources/hello/HelloJava.xoo index 1d9c60d56b7..1d9c60d56b7 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-generic-test-exec/xources/hello/HelloJava.xoo +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-generic-test-exec/xources/hello/HelloJava.xoo diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/sonar-project.properties b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-multiline/sonar-project.properties index 0c8e5dc5354..0c8e5dc5354 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/sonar-project.properties +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-multiline/sonar-project.properties diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/Multiline.xoo b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-multiline/xources/hello/Multiline.xoo index 6e8a35f20a5..6e8a35f20a5 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/Multiline.xoo +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-multiline/xources/hello/Multiline.xoo diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/Multiple.xoo b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-multiline/xources/hello/Multiple.xoo index b6b1b8369a4..b6b1b8369a4 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/Multiple.xoo +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-multiline/xources/hello/Multiple.xoo diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/Single.xoo b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-multiline/xources/hello/Single.xoo index fc664425a99..fc664425a99 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/Single.xoo +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-multiline/xources/hello/Single.xoo diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/WithFlow.xoo b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-multiline/xources/hello/WithFlow.xoo index 9dc4685fe84..9dc4685fe84 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-multiline/xources/hello/WithFlow.xoo +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-multiline/xources/hello/WithFlow.xoo diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-empty-file/sonar-project.properties b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-with-empty-file/sonar-project.properties index 58f27e81f61..58f27e81f61 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-empty-file/sonar-project.properties +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-with-empty-file/sonar-project.properties diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-empty-file/xources/hello/Empty.xoo b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-with-empty-file/xources/hello/Empty.xoo index e69de29bb2d..e69de29bb2d 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-empty-file/xources/hello/Empty.xoo +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-with-empty-file/xources/hello/Empty.xoo diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-empty-file/xources/hello/HelloJava.xoo b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-with-empty-file/xources/hello/HelloJava.xoo index 1d9c60d56b7..1d9c60d56b7 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-empty-file/xources/hello/HelloJava.xoo +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-with-empty-file/xources/hello/HelloJava.xoo diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-symlink/.gitignore b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-with-symlink/.gitignore index ecbefd4f19d..ecbefd4f19d 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-symlink/.gitignore +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-with-symlink/.gitignore diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-symlink/sonar-project.properties b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-with-symlink/sonar-project.properties index 8810e376701..8810e376701 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-symlink/sonar-project.properties +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-with-symlink/sonar-project.properties diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-symlink/testx b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-with-symlink/testx index 7385ebd51cf..7385ebd51cf 120000 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-symlink/testx +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-with-symlink/testx diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-symlink/xources b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-with-symlink/xources index 15dca9d90d2..15dca9d90d2 120000 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample-with-symlink/xources +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample-with-symlink/xources diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/externalIssues.json b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample/externalIssues.json index 8ad6dd2c9ec..8ad6dd2c9ec 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/externalIssues.json +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample/externalIssues.json diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/sonar-project.properties b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample/sonar-project.properties index 8810e376701..8810e376701 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/sonar-project.properties +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample/sonar-project.properties diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo index 8c0967e496f..8c0967e496f 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo.measures b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo.measures index 23b08dc0e0e..23b08dc0e0e 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo.measures +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo.measures diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo.scm b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo.scm index 2cec35b8a72..2cec35b8a72 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo.scm +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample/testx/ClassOneTest.xoo.scm diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo index 1d9c60d56b7..1d9c60d56b7 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo.measures b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo.measures index 9eaf8ba2549..9eaf8ba2549 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo.measures +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo.measures diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo.scm b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo.scm index 03a9de2f486..03a9de2f486 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo.scm +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample/xources/hello/HelloJava.xoo.scm diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/helloscala.xoo b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample/xources/hello/helloscala.xoo index 53cb085156c..53cb085156c 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/helloscala.xoo +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample/xources/hello/helloscala.xoo diff --git a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/helloscala.xoo.measures b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample/xources/hello/helloscala.xoo.measures index d2c8386aed1..d2c8386aed1 100644 --- a/sonar-scanner-engine/src/test/resources/mediumtest/xoo/sample/xources/hello/helloscala.xoo.measures +++ b/sonar-scanner-engine/test-resources/mediumtest/xoo/sample/xources/hello/helloscala.xoo.measures |