Fix wrong location of the sonarUserHome

Author: henryju

its/it-tests/src/test/java/com/sonar/scanner/lib/it/PropertiesTest.java

@@ -56,17 +56,28 @@ public void testRuntimeEnvironmentPassedAsUserAgent() throws IOException {
   @Test
   public void passConfigurationUsingEnvVariables() throws IOException {
     SimpleScanner scanner = new SimpleScanner();
-    BuildResult buildResult = scanner.executeSimpleProject(project("js-sample"), ORCHESTRATOR.getServer().getUrl(), Map.of(), Map.of("SONAR_SCANNER_JSON_PARAMS", "{\"sonar.exclusions\": \"**/Hello.js\"}"));
+    BuildResult buildResult = scanner.executeSimpleProject(project("js-sample"), ORCHESTRATOR.getServer().getUrl(), Map.of(),
+      Map.of("SONAR_SCANNER_JSON_PARAMS", "{\"sonar.exclusions\": \"**/Hello.js\"}"));
     assertThat(buildResult.getLastStatus()).isZero();
 
     assertThat(buildResult.getLogs()).contains("1 file indexed");
   }
 
+  @Test
+  public void cacheIsInUserHomeByDefault() throws IOException {
+    SimpleScanner scanner = new SimpleScanner();
+    BuildResult buildResult = scanner.executeSimpleProject(project("js-sample"), ORCHESTRATOR.getServer().getUrl(), Map.of(), Map.of());
+    assertThat(buildResult.getLastStatus()).isZero();
+
+    assertThat(Paths.get(System.getProperty("user.home")).resolve(".sonar/cache")).isDirectoryRecursivelyContaining(("glob:**/*scanner-engine*.jar"));
+  }
+
   @Test
   public void overrideHomeDirectoryWithEnv() throws IOException {
     var userHome = temp.newFolder();
     SimpleScanner scanner = new SimpleScanner();
-    BuildResult buildResult = scanner.executeSimpleProject(project("js-sample"), ORCHESTRATOR.getServer().getUrl(), Map.of(), Map.of("SONAR_USER_HOME", userHome.getAbsolutePath()));
+    BuildResult buildResult = scanner.executeSimpleProject(project("js-sample"), ORCHESTRATOR.getServer().getUrl(), Map.of(),
+      Map.of("SONAR_USER_HOME", userHome.getAbsolutePath()));
     assertThat(buildResult.getLastStatus()).isZero();
 
     assertThat(userHome.toPath().resolve("cache")).isDirectoryRecursivelyContaining(("glob:**/*scanner-engine*.jar"));

lib/src/main/java/org/sonarsource/scanner/lib/ScannerEngineBootstrapper.java

@@ -24,6 +24,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import org.sonarsource.scanner.lib.internal.ClassloadRules;
 import org.sonarsource.scanner.lib.internal.InternalProperties;
@@ -71,7 +72,13 @@ public ScannerEngineFacade bootstrap() {
     ClassloadRules rules = new ClassloadRules(Collections.emptySet(), unmaskRules);
     var properties = Map.copyOf(bootstrapProperties);
     var isSonarCloud = getSonarCloudUrl().equals(properties.get(ScannerProperties.HOST_URL));
-    var sonarUserHome = properties.getOrDefault(ScannerProperties.SONAR_USER_HOME, Paths.get("").resolve(".sonar").toString());
+    String sonarUserHome;
+    if (properties.containsKey(ScannerProperties.SONAR_USER_HOME)) {
+      sonarUserHome = properties.get(ScannerProperties.SONAR_USER_HOME);
+    } else {
+      var userHome = Objects.requireNonNull(System.getProperty("user.home"), "The system property 'user.home' is expected to be non null");
+      sonarUserHome = Paths.get(userHome, ".sonar").toAbsolutePath().toString();
+    }
     var launcherFactory = new IsolatedLauncherFactory(new LoggerAdapter(logOutput), new SonarUserHome(Paths.get(sonarUserHome)));
     var launcher = launcherFactory.createLauncher(properties, rules);
     return new ScannerEngineFacade(properties, launcher, logOutput, isSonarCloud);

lib/src/test/java/org/sonarsource/scanner/lib/internal/http/ServerConnectionTest.java

@@ -23,7 +23,6 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
@@ -87,11 +86,12 @@ void test_downloadFile(@TempDir Path tmpFolder) throws Exception {
   }
 
   @Test
-  void downloadFile_fails_on_url_validation() {
+  void downloadFile_fails_on_url_validation(@TempDir Path tmpFolder) {
+    var toFile = tmpFolder.resolve("index.txt");
     ServerConnection connection = create();
     answer(HELLO_WORLD);
 
-    assertThatThrownBy(() -> connection.downloadFile("should_fail", Paths.get("test-path")))
+    assertThatThrownBy(() -> connection.downloadFile("should_fail", toFile))
       .isInstanceOf(IllegalArgumentException.class)
       .hasMessage("URL path must start with slash: should_fail");
   }