SCANNERAPI-173 Fix simulation mode

Author: henryju

api/src/main/java/org/sonarsource/scanner/api/internal/SimulatedLauncher.java

@@ -22,12 +22,15 @@
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
+import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.Comparator;
+import java.util.Collections;
+import java.util.Enumeration;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.TreeSet;
 import org.sonarsource.scanner.api.internal.batch.IsolatedLauncher;
 import org.sonarsource.scanner.api.internal.batch.LogOutput;
 import org.sonarsource.scanner.api.internal.cache.Logger;
@@ -49,11 +52,16 @@ public void execute(Map<String, String> props, LogOutput logOutput) {
   }
 
   private static void writeProperties(String filePath, Map<String, String> p) {
-    try (BufferedWriter output = Files.newBufferedWriter(Paths.get(filePath), StandardCharsets.ISO_8859_1)) {
-      output.write("# Generated by a SonarQube Scanner");
-      output.newLine();
-      p.entrySet().stream().sorted(Comparator.comparing(Map.Entry::getKey)).forEach(e -> writeProp(output, e));
-
+    // This is to have output file content sorted by key
+    Properties props = new Properties() {
+      @Override
+      public synchronized Enumeration<Object> keys() {
+        return Collections.enumeration(new TreeSet<Object>(super.keySet()));
+      }
+    };
+    props.putAll(p);
+    try (OutputStream outputStream = Files.newOutputStream(Paths.get(filePath))) {
+      props.store(outputStream, "# Generated by a SonarQube Scanner");
     } catch (Exception e) {
       throw new IllegalStateException("Fail to export scanner properties", e);
     }

api/src/test/java/org/sonarsource/scanner/api/internal/SimulatedLauncherTest.java

@@ -69,7 +69,7 @@ public void failToWriteProperty() throws IOException {
     Map<String, String> props = createProperties();
     BufferedWriter writer = mock(BufferedWriter.class);
     doThrow(new IOException("error")).when(writer).write(anyString());
-    
+
     SimulatedLauncher.writeProp(writer, props.entrySet().iterator().next());
   }
 
@@ -89,7 +89,7 @@ public void error_dump() throws IOException {
 
   private Map<String, String> createProperties() {
     Map<String, String> prop = new HashMap<>();
-    prop.put("key1", "value1");
+    prop.put("key1:subkey", "value1");
     prop.put("key2", "value2");
     prop.put(InternalProperties.SCANNER_DUMP_TO_FILE, filename);
     return prop;

batch/pom.xml

@@ -10,7 +10,7 @@
   <name>SonarQube Scanner API - Batch</name>
 
   <properties>
-    <sonarQubeVersion>6.4</sonarQubeVersion>
+    <sonarQubeVersion>6.6</sonarQubeVersion>
   </properties>
 
   <dependencies>