SONAR-926 Fix org.sonar.api.resources.InputFile#getRelativePath()

Contrary to org.sonar.api.batch.fs.InputFile#relativePath(), it's the path relative to source dir

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/DefaultInputFile.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/DefaultInputFile.java
index 226a975765c0024d922649daea69d4ca011c09ad..63e3c9ec01d5021110c7dcc9e2fbf31faf0b41bf 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/DefaultInputFile.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/fs/internal/DefaultInputFile.java
@@ -20,6 +20,7 @@
 package org.sonar.api.batch.fs.internal;
 
 import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.lang.StringUtils;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.utils.PathUtils;
 
@@ -239,7 +240,7 @@ public class DefaultInputFile implements InputFile, org.sonar.api.resources.Inpu
   @Deprecated
   @Override
   public String getRelativePath() {
-    return relativePath();
+    return pathRelativeToSourceDir;
   }
 
   @Override

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/batch/fs/internal/DefaultInputFileTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/batch/fs/internal/DefaultInputFileTest.java
index afbc74f29286d446fa9f4417ff78e3ce5a7add1d..ff77bfe256576a7b36dd87259e8adebd0edb808b 100644 (file)
--- a/sonar-plugin-api/src/test/java/org/sonar/api/batch/fs/internal/DefaultInputFileTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/batch/fs/internal/DefaultInputFileTest.java
@@ -43,10 +43,12 @@ public class DefaultInputFileTest {
       .setLines(42)
       .setLanguage("php")
       .setStatus(InputFile.Status.ADDED)
-      .setType(InputFile.Type.TEST);
+      .setType(InputFile.Type.TEST)
+      .setPathRelativeToSourceDir("Foo.php");
 
     assertThat(inputFile.relativePath()).isEqualTo("src/Foo.php");
-    assertThat(inputFile.getRelativePath()).isEqualTo("src/Foo.php");
+    // deprecated method is different -> path relative to source dir
+    assertThat(inputFile.getRelativePath()).isEqualTo("Foo.php");
     assertThat(new File(inputFile.relativePath())).isRelative();
     assertThat(inputFile.absolutePath()).endsWith("Foo.php");
     assertThat(new File(inputFile.absolutePath())).isAbsolute();