SONAR-8769 Display project and organization keys in the analysis logs

1 files changed, 40 insertions, 1 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 aa095aa5c2e..61b67475086 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
@@ -86,7 +86,7 @@ public class FileSystemMediumTest {
     tester.stop();
     logs = new LogOutputRecorder();
   }
-  
+
   private ImmutableMap.Builder<String, String> createBuilder() {
     return ImmutableMap.<String, String>builder()
       .put("sonar.task", "scan")
@@ -132,6 +132,45 @@ public class FileSystemMediumTest {
   }
 
   @Test
+  public void logProjectKeyAndOrganizationKey() throws IOException {
+    builder = createBuilder();
+    builder.put("sonar.organization", "my org");
+    File srcDir = new File(baseDir, "src");
+    srcDir.mkdir();
+
+    File xooFile = new File(srcDir, "sample.xoo");
+    FileUtils.write(xooFile, "Sample xoo\ncontent");
+
+    tester.newTask()
+      .properties(builder
+        .put("sonar.sources", "src")
+        .build())
+      .start();
+
+    assertThat(logs.getAllAsString()).contains("Project key: com.foo.project");
+    assertThat(logs.getAllAsString()).contains("Organization key: my org");
+  }
+  
+  @Test
+  public void dontLogInvalidOrganization() throws IOException {
+    builder = createBuilder();
+    File srcDir = new File(baseDir, "src");
+    srcDir.mkdir();
+
+    File xooFile = new File(srcDir, "sample.xoo");
+    FileUtils.write(xooFile, "Sample xoo\ncontent");
+
+    tester.newTask()
+      .properties(builder
+        .put("sonar.sources", "src")
+        .build())
+      .start();
+
+    assertThat(logs.getAllAsString()).contains("Project key: com.foo.project");
+    assertThat(logs.getAllAsString()).doesNotContain("Organization key");
+  }
+
+  @Test
   public void onlyGenerateMetadataIfNeeded() throws IOException {
     builder = createBuilder();