From: Klaudio Sinani Date: Tue, 19 Apr 2022 12:54:46 +0000 (+0200) Subject: SONAR-16290 Minor fix for unit-tests X-Git-Tag: 9.5.0.56709~230 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9eac13aaa5b3c6151e1c1954573a80e01c12b564;p=sonarqube.git 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 af610eae2c5..5b566b72724 100644 --- 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 d7f5006e035..af58e703ef6 100644 --- 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); } /**