SONARPLUGINS-1230 Work dir can be absolute or relative

diff --git a/src/main/java/org/sonar/runner/Runner.java b/src/main/java/org/sonar/runner/Runner.java
index 60b6a454901d6cbe712e18ea8420e5075bf251a3..1a51496aae9c72e3ff5990c5fdaf0db5b320b560 100644 (file)
--- a/src/main/java/org/sonar/runner/Runner.java
+++ b/src/main/java/org/sonar/runner/Runner.java
@@ -109,7 +109,22 @@ public final class Runner {
     if (!projectDir.isDirectory() || !projectDir.exists()) {
       throw new IllegalArgumentException("Project home must be an existing directory: " + path);
     }
-    workDir = new File(projectDir, properties.getProperty(PROPERTY_WORK_DIRECTORY, DEF_VALUE_WORK_DIRECTORY));
+    workDir = initWorkDir();
+  }
+
+  private File initWorkDir() {
+    String customWorkDir = properties.getProperty(PROPERTY_WORK_DIRECTORY);
+    if (customWorkDir == null || customWorkDir.trim().length() == 0) {
+      return new File(projectDir, DEF_VALUE_WORK_DIRECTORY);
+    }
+    return defineCustomizedWorkDir(new File(customWorkDir));
+  }
+
+  private File defineCustomizedWorkDir(File customWorkDir) {
+    if (customWorkDir.isAbsolute()) {
+      return customWorkDir;
+    }
+    return new File(projectDir, customWorkDir.getPath());
   }
 
   public File getProjectDir() {

diff --git a/src/test/java/org/sonar/runner/RunnerTest.java b/src/test/java/org/sonar/runner/RunnerTest.java
index c0495fc1a570b3b84bededc74554c08f1c397b4b..877e85d203629add8a26cf456ad6e3c2c34e6e8d 100644 (file)
--- a/src/test/java/org/sonar/runner/RunnerTest.java
+++ b/src/test/java/org/sonar/runner/RunnerTest.java
@@ -153,9 +153,20 @@ public class RunnerTest {
     Runner runner = Runner.create(properties);
     assertThat(runner.getWorkDir()).isEqualTo(new File(".", ".sonar"));
 
+    // empty string
+    properties.setProperty(Runner.PROPERTY_WORK_DIRECTORY, "    ");
+    runner = Runner.create(properties);
+    assertThat(runner.getWorkDir()).isEqualTo(new File(".", ".sonar"));
+
+    // real relative path
     properties.setProperty(Runner.PROPERTY_WORK_DIRECTORY, "temp-dir");
     runner = Runner.create(properties);
     assertThat(runner.getWorkDir()).isEqualTo(new File(".", "temp-dir"));
+
+    // real asbolute path
+    properties.setProperty(Runner.PROPERTY_WORK_DIRECTORY, new File("target").getAbsolutePath());
+    runner = Runner.create(properties);
+    assertThat(runner.getWorkDir()).isEqualTo(new File("target").getAbsoluteFile());
   }
 
   @Test