Improve coverage.

jenkinsci · Jan 23, 2024 · c6d9882 · c6d9882
1 parent 392afeb
commit c6d9882
Showing 1 changed file with 38 additions and 16 deletions.
diff --git a/src/test/java/edu/hm/hafner/analysis/IssuesInModifiedCodeMarkerTest.java b/src/test/java/edu/hm/hafner/analysis/IssuesInModifiedCodeMarkerTest.java
@@ -1,86 +1,108 @@
 package edu.hm.hafner.analysis;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.assertj.core.api.AbstractListAssert;
+import org.assertj.core.api.ObjectAssert;
 import org.junit.jupiter.api.Test;
 
 import static edu.hm.hafner.analysis.assertions.Assertions.*;
 
 class IssuesInModifiedCodeMarkerTest {
+    private static final String TO_STRING_UNMODIFIED = "code.txt(12,0): -: : ";
+    private static final String TO_STRING_MODIFIED = "*code.txt(12,0): -: : ";
+
     @Test
     void shouldNotMarkAnythingForEmptyMap() {
         var report = createReportWithTwoIssues();
 
-        assertThat(report.get()).extracting(Issue::isPartOfModifiedCode).containsExactly(false, false);
+        assertThatModifiedCodeMarkers(report).containsExactly(false, false);
 
         var marker = new IssuesInModifiedCodeMarker();
         marker.markIssuesInModifiedCode(report, Map.of());
-        assertThat(report.get()).extracting(Issue::isPartOfModifiedCode).containsExactly(false, false);
+
+        assertThatModifiedCodeMarkers(report).containsExactly(false, false);
+        assertThatIssuesToString(report).containsExactly(TO_STRING_UNMODIFIED, TO_STRING_UNMODIFIED);
     }
 
     @Test
     void shouldNotMarkIfFileMatchesButLinesNot() {
         var report = createReportWithTwoIssues();
 
         var marker = new IssuesInModifiedCodeMarker();
-
         marker.markIssuesInModifiedCode(report, Map.of("/part/of/modified/code.txt", Set.of(10)));
-        assertThat(report.get()).extracting(Issue::isPartOfModifiedCode).containsExactly(false, false);
+
+        assertThatModifiedCodeMarkers(report).containsExactly(false, false);
+        assertThatIssuesToString(report).containsExactly(TO_STRING_UNMODIFIED, TO_STRING_UNMODIFIED);
     }
 
     @Test
     void shouldNotMarkIfLineMatchesButFileNot() {
         var report = createReportWithTwoIssues();
 
         var marker = new IssuesInModifiedCodeMarker();
-
         marker.markIssuesInModifiedCode(report, Map.of("/wrong/path/code.txt", Set.of(12, 20)));
-        assertThat(report.get()).extracting(Issue::isPartOfModifiedCode).containsExactly(false, false);
+
+        assertThatModifiedCodeMarkers(report).containsExactly(false, false);
+        assertThatIssuesToString(report).containsExactly(TO_STRING_UNMODIFIED, TO_STRING_UNMODIFIED);
     }
 
     @Test
     void shouldMarkIssuesIfOneFileAndLinesMatch() {
         var report = createReportWithTwoIssues();
 
         var marker = new IssuesInModifiedCodeMarker();
-
         marker.markIssuesInModifiedCode(report, Map.of("/part/of/modified/code.txt", Set.of(10, 20)));
-        assertThat(report.get()).extracting(Issue::isPartOfModifiedCode).containsExactly(true, false);
+
+        assertThatModifiedCodeMarkers(report).containsExactly(true, false);
+        assertThatIssuesToString(report).containsExactly(TO_STRING_MODIFIED, TO_STRING_UNMODIFIED);
     }
 
     @Test
     void shouldMarkIssuesIfAllFilesAndLinesMatch() {
         var report = createReportWithTwoIssues();
 
         var marker = new IssuesInModifiedCodeMarker();
-
         marker.markIssuesInModifiedCode(report, Map.of(
                 "/part/of/modified/code.txt", Set.of(12),
                 "/part/of/additional/modified/code.txt", Set.of(20)));
-        assertThat(report.get()).extracting(Issue::isPartOfModifiedCode).containsExactly(true, true);
+
+        assertThatModifiedCodeMarkers(report).containsExactly(true, true);
+        assertThatIssuesToString(report).containsExactly(TO_STRING_MODIFIED, TO_STRING_MODIFIED);
     }
 
     @Test
     void shouldMarkIssuesIfFilesPrefixMatches() {
         var report = createReportWithTwoIssues();
 
         var marker = new IssuesInModifiedCodeMarker();
+        marker.markIssuesInModifiedCode(report, Map.of("modified/code.txt", Set.of(12, 20)));
 
-        marker.markIssuesInModifiedCode(report, Map.of(
-                "modified/code.txt", Set.of(12, 20)));
-        assertThat(report.get()).extracting(Issue::isPartOfModifiedCode).containsExactly(true, true);
+        assertThatModifiedCodeMarkers(report).containsExactly(true, true);
+        assertThatIssuesToString(report).containsExactly(TO_STRING_MODIFIED, TO_STRING_MODIFIED);
     }
 
     @Test
     void shouldMarkIssuesIfFileNameUsesWindowsPath() {
         var report = createReportWithTwoIssues();
 
         var marker = new IssuesInModifiedCodeMarker();
+        marker.markIssuesInModifiedCode(report, Map.of("modified\\code.txt", Set.of(12, 20)));
 
-        marker.markIssuesInModifiedCode(report, Map.of(
-                "modified\\code.txt", Set.of(12, 20)));
-        assertThat(report.get()).extracting(Issue::isPartOfModifiedCode).containsExactly(true, true);
+        assertThatModifiedCodeMarkers(report).containsExactly(true, true);
+        assertThatIssuesToString(report).containsExactly(TO_STRING_MODIFIED, TO_STRING_MODIFIED);
+    }
+
+    private AbstractListAssert<?, List<? extends String>, String, ObjectAssert<String>> assertThatIssuesToString(
+            final Report report) {
+        return assertThat(report.get()).extracting(Issue::toString);
+    }
+
+    private AbstractListAssert<?, List<? extends Boolean>, Boolean, ObjectAssert<Boolean>> assertThatModifiedCodeMarkers(
+            final Report report) {
+        return assertThat(report.get()).extracting(Issue::isPartOfModifiedCode);
     }
 
     private Report createReportWithTwoIssues() {