SONAR-16290 Minor fix for unit-tests

diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scm/git/CompositeBlameCommandTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scm/git/CompositeBlameCommandTest.java
index af610eae2c52f04f9f647bc5750ff2f08810fc00..5b566b72724001b6939cfde5e08b411c88aa9013 100644 (file)
--- a/sonar-scanner-engine/src/test/java/org/sonar/scm/git/CompositeBlameCommandTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scm/git/CompositeBlameCommandTest.java
@@ -170,6 +170,8 @@ public class CompositeBlameCommandTest {
     javaUnzip("dummy-git.zip", projectDir);
 
     File baseDir = new File(projectDir, "dummy-git");
+    DefaultFileSystem fs = new DefaultFileSystem(baseDir);
+    when(input.fileSystem()).thenReturn(fs);
     String relativePath2 = "src/main/java/org/dummy/Dummy2.java";
     DefaultInputFile inputFile = new TestInputFileBuilder("foo", DUMMY_JAVA)
       .setModuleBaseDir(baseDir.toPath())

diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scm/git/GitScmProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scm/git/GitScmProviderTest.java
index d7f5006e03502e7c6ac86ed318608c9414f3cb1a..af58e703ef6cd70efbde1d71ddd979de9cb11859 100644 (file)
--- a/sonar-scanner-engine/src/test/java/org/sonar/scm/git/GitScmProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scm/git/GitScmProviderTest.java
@@ -142,7 +142,7 @@ public class GitScmProviderTest {
     CompositeBlameCommand compositeBlameCommand = new CompositeBlameCommand(analysisWarnings, new PathResolver(), jblameCommand, nativeBlameCommand);
     GitScmProvider gitScmProvider = new GitScmProvider(compositeBlameCommand, analysisWarnings, gitIgnoreCommand, system2);
 
-    assertThat(gitScmProvider.blameCommand()).isEqualTo(jblameCommand);
+    assertThat(gitScmProvider.blameCommand()).isEqualTo(compositeBlameCommand);
   }
 
   /**