1 files changed, 13 insertions, 14 deletions
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/scm/DefaultBlameOutputTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scm/DefaultBlameOutputTest.java
index dce0ef0a204..7cc1de01a4c 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/scm/DefaultBlameOutputTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scm/DefaultBlameOutputTest.java
@@ -25,45 +25,42 @@ import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.internal.TestInputFileBuilder;
 import org.sonar.api.batch.scm.BlameLine;
 import org.sonar.api.utils.System2;
-import org.sonar.scanner.bootstrap.ScannerWsClient;
 import org.sonar.scanner.notifications.DefaultAnalysisWarnings;
 
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 public class DefaultBlameOutputTest {
 
   private System2 system2 = mock(System2.class);
   private DefaultAnalysisWarnings analysisWarnings = new DefaultAnalysisWarnings(system2);
-  private ScannerWsClient client = mock(ScannerWsClient.class);
 
   @Test
   public void shouldNotFailIfNotSameNumberOfLines() {
     InputFile file = new TestInputFileBuilder("foo", "src/main/java/Foo.java").setLines(10).build();
 
-    new DefaultBlameOutput(null, analysisWarnings, singletonList(file), client).blameResult(file, singletonList(new BlameLine().revision("1").author("guy")));
+    new DefaultBlameOutput(null, analysisWarnings, singletonList(file)).blameResult(file, singletonList(new BlameLine().revision("1").author("guy")));
   }
 
   @Test
   public void addWarningIfFilesMissing() {
     InputFile file = new TestInputFileBuilder("foo", "src/main/java/Foo.java").setLines(10).build();
-    when(client.baseUrl()).thenReturn("http://sonarqube/v1");
-    new DefaultBlameOutput(null, analysisWarnings, singletonList(file), client).finish(true);
+    new DefaultBlameOutput(null, analysisWarnings, singletonList(file)).finish(true);
     assertThat(analysisWarnings.warnings()).extracting(DefaultAnalysisWarnings.Message::getText)
       .containsOnly("Missing blame information for 1 file. This may lead to some features not working correctly. " +
-        "Please check the analysis logs and refer to <a href=\"http://sonarqube/v1/documentation/analysis/scm-integration/\" target=\"_blank\">the documentation</a>.");
+        "Please check the analysis logs and refer to <a href=\"/documentation/analysis/scm-integration/\" target=\"_blank\">the documentation</a>.");
   }
 
   @Test
   public void shouldFailIfNotExpectedFile() {
     InputFile file = new TestInputFileBuilder("foo", "src/main/java/Foo.java").build();
+    var blameOutput = new DefaultBlameOutput(null, analysisWarnings,
+      singletonList(new TestInputFileBuilder("foo", "src/main/java/Foo2.java").build()));
+    var lines = singletonList(new BlameLine().revision("1").author("guy"));
 
-    assertThatThrownBy(() -> new DefaultBlameOutput(null, analysisWarnings,
-      singletonList(new TestInputFileBuilder("foo", "src/main/java/Foo2.java").build()), client)
-      .blameResult(file, singletonList(new BlameLine().revision("1").author("guy"))))
+    assertThatThrownBy(() -> blameOutput.blameResult(file, lines))
       .isInstanceOf(IllegalArgumentException.class)
       .hasMessage("It was not expected to blame file " + file);
   }
@@ -71,9 +68,10 @@ public class DefaultBlameOutputTest {
   @Test
   public void shouldFailIfNullDate() {
     InputFile file = new TestInputFileBuilder("foo", "src/main/java/Foo.java").setLines(1).build();
+    var blameOutput = new DefaultBlameOutput(null, analysisWarnings, singletonList(file));
+    var lines = singletonList(new BlameLine().revision("1").author("guy"));
 
-    assertThatThrownBy(() -> new DefaultBlameOutput(null, analysisWarnings, singletonList(file), client)
-      .blameResult(file, singletonList(new BlameLine().revision("1").author("guy"))))
+    assertThatThrownBy(() -> blameOutput.blameResult(file, lines))
       .isInstanceOf(IllegalArgumentException.class)
       .hasMessage("Blame date is null for file " + file + " at line 1");
   }
@@ -81,9 +79,10 @@ public class DefaultBlameOutputTest {
   @Test
   public void shouldFailIfNullRevision() {
     InputFile file = new TestInputFileBuilder("foo", "src/main/java/Foo.java").setLines(1).build();
+    var blameOUtput = new DefaultBlameOutput(null, analysisWarnings, singletonList(file));
+    var lines = singletonList(new BlameLine().date(new Date()).author("guy"));
 
-    assertThatThrownBy(() ->     new DefaultBlameOutput(null, analysisWarnings, singletonList(file), client)
-      .blameResult(file, singletonList(new BlameLine().date(new Date()).author("guy"))))
+    assertThatThrownBy(() -> blameOUtput.blameResult(file, lines))
       .isInstanceOf(IllegalArgumentException.class)
       .hasMessage("Blame revision is blank for file " + file + " at line 1");
   }