Simplify testability of PathResolver.RelativePath

2 files changed, 2 insertions, 3 deletions

diff --git a/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/SonarEngineTest.java b/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/SonarEngineTest.java
index fbb7a0b7d32..7131fda4e3c 100644
--- a/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/SonarEngineTest.java
+++ b/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/SonarEngineTest.java
@@ -63,9 +63,8 @@ public class SonarEngineTest {
   public void testGetResource() {
     PathResolver pathResolver = mock(PathResolver.class);
     ModuleFileSystem fileSystem = mock(ModuleFileSystem.class);
-    RelativePath relativePath = mock(RelativePath.class);
+    RelativePath relativePath = new RelativePath(null, "com/foo/Bar.java");
     when(pathResolver.relativePath(anyCollection(), any(java.io.File.class))).thenReturn(relativePath);
-    when(relativePath.path()).thenReturn("com/foo/Bar.java");
 
     SonarEngine engine = new SonarEngine(null, fileSystem, pathResolver, null);
     Resource<?> resource = engine.getResource(new java.io.File(""));
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/PathResolver.java b/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/PathResolver.java
index d6c8921e602..5936b8e14f5 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/PathResolver.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/PathResolver.java
@@ -101,7 +101,7 @@ public class PathResolver implements BatchComponent {
     private File dir;
     private String path;
 
-    private RelativePath(File dir, String path) {
+    public RelativePath(File dir, String path) {
       this.dir = dir;
       this.path = path;
     }