diff options
author | Julien HENRY <julien.henry@sonarsource.com> | 2019-02-11 17:14:32 +0100 |
---|---|---|
committer | SonarTech <sonartech@sonarsource.com> | 2019-02-18 20:20:56 +0100 |
commit | aaf851d1f104a7493e2db9d15a1d77652f6804c0 (patch) | |
tree | 88ccb2b1c1d8e426b8c5ea7fb46c063c548b7bd5 /sonar-scanner-engine/src/test | |
parent | 2b8cc73a602be586c15754f7d87242dbaa5ccfd7 (diff) | |
download | sonarqube-aaf851d1f104a7493e2db9d15a1d77652f6804c0.tar.gz sonarqube-aaf851d1f104a7493e2db9d15a1d77652f6804c0.zip |
SONAR-11558 Index basedir by default when sonar.sources is not provided
Diffstat (limited to 'sonar-scanner-engine/src/test')
2 files changed, 14 insertions, 7 deletions
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 a70e2ac2389..dee1c8b1781 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 @@ -1096,4 +1096,18 @@ public class FileSystemMediumTest { assertThat(result.inputFile("xources/hello/ClassOne.xoo")).isNotNull(); assertThat(result.inputFile("testx/ClassOneTest.xoo")).isNotNull(); } + + @Test + public void index_basedir_by_default() throws IOException { + File xooFile = new File(baseDir, "sample.xoo"); + FileUtils.write(xooFile, "Sample xoo\ncontent", StandardCharsets.UTF_8); + + AnalysisResult result = tester.newAnalysis() + .properties(builder + .build()) + .execute(); + + assertThat(logTester.logs()).contains("1 file indexed"); + assertThat(result.inputFile("sample.xoo")).isNotNull(); + } } diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ProjectReactorBuilderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ProjectReactorBuilderTest.java index c9bd41df8e7..5e4099793aa 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ProjectReactorBuilderTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/ProjectReactorBuilderTest.java @@ -78,13 +78,6 @@ public class ProjectReactorBuilderTest { } @Test - public void fail_if_sources_not_set() { - thrown.expect(MessageException.class); - thrown.expectMessage("You must define the following mandatory properties for 'com.foo.project': sonar.sources"); - loadProjectDefinition("simple-project-with-missing-source-dir"); - } - - @Test public void shouldNotFailIfBlankSourceDirectory() { loadProjectDefinition("simple-project-with-blank-source-dir"); } |