Removed code duplications.

Author: uhafner

src/test/java/io/jenkins/plugins/git/forensics/blame/GitBlamerTest.java

@@ -68,13 +68,7 @@ void shouldAbortIfRefParseThrowsException() throws InterruptedException {
 
     @Test
     void shouldAbortIfWithRepositoryThrowsException() throws InterruptedException, IOException {
-        GitClient gitClient = mock(GitClient.class);
-
-        ObjectId id = mock(ObjectId.class);
-        when(gitClient.revParse(HEAD)).thenReturn(id);
-        when(gitClient.withRepository(any())).thenThrow(new IOException());
-        FilePath workTree = createWorkTreeStub();
-        when(gitClient.getWorkTree()).thenReturn(workTree);
+        GitClient gitClient = createStubbedClientWithException(new IOException());
 
         GitBlamer blamer = new GitBlamer(gitClient, HEAD);
         Blames blames = blamer.blame(createLocations());
@@ -83,27 +77,33 @@ void shouldAbortIfWithRepositoryThrowsException() throws InterruptedException, I
         assertThat(blames.getErrorMessages()).contains(GitBlamer.BLAME_ERROR);
     }
 
-    private FilePath createWorkTreeStub() {
-        File mock = mock(File.class);
-        when(mock.getPath()).thenReturn("/");
-        return new FilePath(mock);
-    }
-
     @Test
     void shouldFinishWithIntermediateResultIfInterrupted() throws InterruptedException, IOException {
+        GitClient gitClient = createStubbedClientWithException(new InterruptedException());
+
+        GitBlamer blamer = new GitBlamer(gitClient, HEAD);
+        Blames blames = blamer.blame(createLocations());
+
+        assertThat(blames.isEmpty()).isTrue();
+        assertThat(blames.getErrorMessages()).isEmpty();
+    }
+
+    private GitClient createStubbedClientWithException(final Exception exception) throws InterruptedException, IOException {
         GitClient gitClient = mock(GitClient.class);
 
         ObjectId id = mock(ObjectId.class);
         when(gitClient.revParse(HEAD)).thenReturn(id);
-        when(gitClient.withRepository(any())).thenThrow(new InterruptedException());
+        when(gitClient.withRepository(any())).thenThrow(exception);
         FilePath workTree = createWorkTreeStub();
         when(gitClient.getWorkTree()).thenReturn(workTree);
 
-        GitBlamer blamer = new GitBlamer(gitClient, HEAD);
-        Blames blames = blamer.blame(createLocations());
+        return gitClient;
+    }
 
-        assertThat(blames.isEmpty()).isTrue();
-        assertThat(blames.getErrorMessages()).isEmpty();
+    private FilePath createWorkTreeStub() {
+        File mock = mock(File.class);
+        when(mock.getPath()).thenReturn("/");
+        return new FilePath(mock);
     }
 
     @Test
@@ -147,7 +147,7 @@ void shouldMapResultToRequestWithOneLine() throws GitAPIException {
     }
 
     @Test
-    void shouldMapResultToRequestWithTwoLines() throws GitAPIException {
+    void shouldMapResultToRequestWithTwoLinesOfAbsolutePaths() throws GitAPIException {
         FileLocations locations = createLocations();
         locations.addLine(ABSOLUTE_PATH, 1);
         locations.addLine(ABSOLUTE_PATH, 2);
@@ -163,6 +163,8 @@ void shouldMapResultToRequestWithTwoLines() throws GitAPIException {
         BlameRunner blameRunner = createBlameRunner(result);
         callback.run(FILE, blameRunner);
 
+        assertThat(blames.contains(ABSOLUTE_PATH)).isTrue();
+        assertThat(blames.contains(FILE)).isFalse();
         FileBlame blame = blames.getBlame(ABSOLUTE_PATH);
         verifyResult(blame, 1);
         verifyResult(blame, 2);
@@ -181,32 +183,7 @@ private BlameCallback createCallback(final Blames blames, final FileLocations bl
     private FileLocations createLocations() {
         FileSystem fileSystem = mock(FileSystem.class);
         when(fileSystem.resolveAbsolutePath(anyString(), any())).thenReturn(WORKSPACE);
-        FileLocations locations = new FileLocations(WORKSPACE, fileSystem);
-        return locations;
-    }
-
-    @Test
-    void shouldStoreAbsolutePaths() throws GitAPIException {
-        FileLocations locations = createLocations();
-        locations.addLine(ABSOLUTE_PATH, 1);
-        locations.addLine(ABSOLUTE_PATH, 2);
-
-        Blames blames = new Blames();
-        BlameCallback callback = createCallback(blames, locations);
-
-        BlameResult result = createResult(2);
-
-        stubResultForIndex(result, 0);
-        stubResultForIndex(result, 1);
-
-        BlameRunner blameRunner = createBlameRunner(result);
-        callback.run(FILE, blameRunner);
-
-        assertThat(blames.contains(ABSOLUTE_PATH)).isTrue();
-        assertThat(blames.contains(FILE)).isFalse();
-        FileBlame blame = blames.getBlame(ABSOLUTE_PATH);
-        verifyResult(blame, 1);
-        verifyResult(blame, 2);
+        return new FileLocations(WORKSPACE, fileSystem);
     }
 
     @Test