Issues reported by sonar

damianszczepanik · damianszczepanik · commit c574ce7d33d6 · 2025-09-12T21:32:58.000+02:00
diff --git a/src/main/java/net/masterthought/cucumber/ReportBuilder.java b/src/main/java/net/masterthought/cucumber/ReportBuilder.java
@@ -12,7 +12,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
-import com.fasterxml.jackson.core.StreamReadConstraints;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
diff --git a/src/main/java/net/masterthought/cucumber/reducers/ElementComparator.java b/src/main/java/net/masterthought/cucumber/reducers/ElementComparator.java
@@ -1,10 +1,10 @@
 package net.masterthought.cucumber.reducers;
 
-import net.masterthought.cucumber.json.Element;
-import org.apache.commons.lang3.StringUtils;
-
 import java.util.Comparator;
 
+import net.masterthought.cucumber.json.Element;
+import org.apache.commons.lang3.Strings;
+
 /**
  * Compares two elements and shows if they have the same Id for scenario type
  * or they are on the same line if it's a background.
@@ -33,6 +33,6 @@ public int compare(Element element1, Element element2) {
 
     private boolean hasSameType(Element element1, Element element2) {
         return element1 != null && element2 != null &&
-                StringUtils.equalsIgnoreCase(element1.getType(), element2.getType());
+                Strings.CI.equals(element1.getType(), element2.getType());
     }
 }
diff --git a/src/main/java/net/masterthought/cucumber/util/StepNameFormatter.java b/src/main/java/net/masterthought/cucumber/util/StepNameFormatter.java
@@ -1,10 +1,9 @@
 package net.masterthought.cucumber.util;
 
-import org.apache.commons.text.StringEscapeUtils;
+import net.masterthought.cucumber.json.support.Argument;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
-
-import net.masterthought.cucumber.json.support.Argument;
+import org.apache.commons.text.StringEscapeUtils;
 
 public class StepNameFormatter {
 
@@ -46,7 +45,7 @@ private static void surroundArguments(Argument[] arguments, String preArgument,
     }
 
     private static boolean isValidArgument(Argument argument) {
-        return argument.getOffset() != null && argument.getVal().length() > 0;
+        return !(argument.getOffset() == null || argument.getVal().isEmpty());
     }
 
     private static void escape(String[] chars) {
diff --git a/src/test/java/net/masterthought/cucumber/ReportGenerator.java b/src/test/java/net/masterthought/cucumber/ReportGenerator.java
@@ -16,8 +16,8 @@
  */
 public abstract class ReportGenerator {
 
-    public final static String JSON_DIRECTORY = "json/";
-    public final static String CLASSIFICATIONS_DIRECTORY = "classifications/";
+    public static final String JSON_DIRECTORY = "json/";
+    public static final String CLASSIFICATIONS_DIRECTORY = "classifications/";
 
     protected static final String SAMPLE_JSON = "sample.json";
     protected static final String CUCUMBER_TIMESTAMPED_JSON = "timestamped/all-last-failed.json";
@@ -54,6 +54,7 @@ public ReportGenerator() {
             configuration = new Configuration(reportDirectory, projectName);
             configuration.setSortingMethod(SortingMethod.ALPHABETICAL);
             configuration.getEmbeddingDirectory().mkdirs();
+            configuration.setBuildNumber("123321");
         } catch (URISyntaxException e) {
             throw new ValidationException(e);
         }
diff --git a/src/test/java/net/masterthought/cucumber/TrendsTest.java b/src/test/java/net/masterthought/cucumber/TrendsTest.java
@@ -55,7 +55,7 @@ void addBuild_OnMissingDataForSteps_FillsMissingDataForSteps() {
         trends.addBuild("buildName", result);
         final String[] buildNumbers = new String[]{"a", "b", "e"};
         Whitebox.setInternalState(trends, "buildNumbers", buildNumbers);
-        
+
         // when
         trends.addBuild("the build!", result);
 
@@ -122,7 +122,7 @@ void copyLastElements_OnBigLimit_ReturnsPassedIntArray() throws Exception {
         int[] limitedArray = Whitebox.invokeMethod(Trends.class, "copyLastElements", array, limit);
 
         // then
-        assertThat(limitedArray).isSameAs(array);
+        assertThat(limitedArray).containsExactly(array);
     }
 
     @Test
@@ -136,7 +136,7 @@ void copyLastElements_OnBigLimit_ReturnsPassedLongArray() throws Exception {
         long[] limitedArray = Whitebox.invokeMethod(Trends.class, "copyLastElements", array, limit);
 
         // then
-        assertThat(limitedArray).isSameAs(array);
+        assertThat(limitedArray).containsExactly(array);
     }
 
     @Test
@@ -150,7 +150,7 @@ void copyLastElements_OnBigLimit_ReturnsPassedStringArray() throws Exception {
         String[] limitedArray = Whitebox.invokeMethod(Trends.class, "copyLastElements", array, limit);
 
         // then
-        assertThat(limitedArray).isSameAs(array);
+        assertThat(limitedArray).containsExactly(array);
     }
 
     @Test
diff --git a/src/test/java/net/masterthought/cucumber/generators/OverviewReportTest.java b/src/test/java/net/masterthought/cucumber/generators/OverviewReportTest.java
@@ -148,14 +148,14 @@ void incDuration_AddsDuration() {
 
         // given
         long offset = 5555555;
-        OverviewReport RefReport = buildSampleReport();
+        OverviewReport refReport = buildSampleReport();
         OverviewReport report = buildSampleReport();
 
         // when
         report.incDurationBy(offset);
 
         // then
-        assertThat(report.getDuration()).isEqualTo(RefReport.getDuration() + offset);
+        assertThat(report.getDuration()).isEqualTo(refReport.getDuration() + offset);
     }
 
     @Test
@@ -185,7 +185,7 @@ void getName_ThrowsException() {
         OverviewReport report = buildSampleReport();
 
         // when & then
-        assertThatThrownBy(() -> report.getName()).
+        assertThatThrownBy(report::getName).
                 isInstanceOf(NotImplementedException.class);
     }
 
@@ -196,7 +196,7 @@ void getStatus_ThrowsException() {
         OverviewReport report = buildSampleReport();
 
         // when & then
-        assertThatThrownBy(() -> report.getStatus())
+        assertThatThrownBy(report::getStatus)
                 .isInstanceOf(NotImplementedException.class);
     }
 
diff --git a/src/test/java/net/masterthought/cucumber/generators/integrations/ErrorPageIntegrationTest.java b/src/test/java/net/masterthought/cucumber/generators/integrations/ErrorPageIntegrationTest.java
@@ -21,7 +21,8 @@ void generatePage_generatesTitle() {
         // given
         setUpWithJson(SAMPLE_JSON);
         page = new ErrorPage(reportResult, configuration, cause, jsonReports);
-        final String titleValue = String.format("Cucumber Reports  - Error Page");
+        final String titleValue = String.format("Cucumber Reports (no %s) - Error Page",
+                configuration.getBuildNumber());
 
         // when
         page.generatePage();
diff --git a/src/test/java/net/masterthought/cucumber/generators/integrations/FeatureReportPageIntegrationTest.java b/src/test/java/net/masterthought/cucumber/generators/integrations/FeatureReportPageIntegrationTest.java
@@ -1,5 +1,7 @@
 package net.masterthought.cucumber.generators.integrations;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import java.io.File;
 import java.util.Arrays;
 import java.util.Collections;
@@ -30,8 +32,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Test;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 /**
  * @author Damian Szczepanik (damianszczepanik@github)
  */
@@ -44,7 +44,8 @@ void generatePage_generatesTitle() {
         setUpWithJson(SAMPLE_JSON);
         final Feature feature = features.get(0);
         page = new FeatureReportPage(reportResult, configuration, feature);
-        final String titleValue = String.format("Cucumber Reports  - Feature: %s", feature.getName());
+        final String titleValue = String.format("Cucumber Reports (no %s) - Feature: %s",
+                configuration.getBuildNumber(), feature.getName());
 
         // when
         page.generatePage();
diff --git a/src/test/java/net/masterthought/cucumber/generators/integrations/PageIntegrationTest.java b/src/test/java/net/masterthought/cucumber/generators/integrations/PageIntegrationTest.java
@@ -5,8 +5,6 @@
 import java.io.File;
 import java.util.Locale;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 import net.masterthought.cucumber.generators.FailuresOverviewPage;
 import net.masterthought.cucumber.generators.FeaturesOverviewPage;
 import net.masterthought.cucumber.generators.StepsOverviewPage;
@@ -19,6 +17,8 @@
 import net.masterthought.cucumber.generators.integrations.helpers.TableRowAssertion;
 import net.masterthought.cucumber.generators.integrations.helpers.WebAssertion;
 import net.masterthought.cucumber.presentation.PresentationMode;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Damian Szczepanik (damianszczepanik@github)
@@ -75,7 +75,7 @@ void generatePage_onJenkinsConfiguration_generatesAllItemsInNaviBar() {
         navigation.hasPluginName();
         assertThat(navigation.getNaviBarLinks()).hasSize(7);
 
-        menuItems[0].hasLinkToJenkins(configuration);
+        menuItems[0].hasLinkToJenkins();
         menuItems[1].hasLinkToPreviousResult(configuration, page.getWebPage());
         menuItems[2].hasLinkToLastResult(configuration, page.getWebPage());
     }
@@ -118,10 +118,10 @@ void generatePage_onDefaultConfiguration_generatesSummaryTable() {
         BuildInfoAssertion buildInfo = document.getBuildInfo();
 
         TableRowAssertion headValues = buildInfo.getHeaderRow();
-        headValues.hasExactValues("Project", "Date");
+        headValues.hasExactValues("Project", "Number", "Date");
 
         assertThat(buildInfo.getProjectName()).isEqualTo(configuration.getProjectName());
-        buildInfo.hasBuildDate(false);
+        buildInfo.hasBuildDate(true);
     }
 
     @Test
diff --git a/src/test/java/net/masterthought/cucumber/generators/integrations/TagReportPageIntegrationTest.java b/src/test/java/net/masterthought/cucumber/generators/integrations/TagReportPageIntegrationTest.java
@@ -24,7 +24,8 @@ void generatePage_generatesTitle() {
         setUpWithJson(SAMPLE_JSON);
         final TagObject tag = tags.get(0);
         page = new TagReportPage(reportResult, configuration, tag);
-        final String titleValue = String.format("Cucumber Reports  - Tag: %s", tag.getName());
+        final String titleValue = String.format("Cucumber Reports (no %s) - Tag: %s",
+                configuration.getBuildNumber(), tag.getName());
 
         // when
         page.generatePage();
diff --git a/src/test/java/net/masterthought/cucumber/generators/integrations/TagsOverviewPageIntegrationTest.java b/src/test/java/net/masterthought/cucumber/generators/integrations/TagsOverviewPageIntegrationTest.java
@@ -21,7 +21,7 @@ void generatePage_generatesTitle() {
         // given
         setUpWithJson(SAMPLE_JSON);
         page = new TagsOverviewPage(reportResult, configuration);
-        final String titleValue = String.format("Cucumber Reports  - Tags Overview",
+        final String titleValue = String.format("Cucumber Reports (no %s) - Tags Overview",
                 configuration.getBuildNumber());
 
         // when
diff --git a/src/test/java/net/masterthought/cucumber/generators/integrations/TrendsOverviewPageIntegrationTest.java b/src/test/java/net/masterthought/cucumber/generators/integrations/TrendsOverviewPageIntegrationTest.java
@@ -1,15 +1,15 @@
 package net.masterthought.cucumber.generators.integrations;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.jupiter.api.Test;
-import org.powermock.reflect.Whitebox;
 
 import net.masterthought.cucumber.ReportBuilder;
 import net.masterthought.cucumber.Trends;
 import net.masterthought.cucumber.generators.TrendsOverviewPage;
 import net.masterthought.cucumber.generators.integrations.helpers.DocumentAssertion;
 import net.masterthought.cucumber.generators.integrations.helpers.LeadAssertion;
 import net.masterthought.cucumber.generators.integrations.helpers.WebAssertion;
+import org.junit.jupiter.api.Test;
+import org.powermock.reflect.Whitebox;
 
 /**
  * @author Damian Szczepanik (damianszczepanik@github)
@@ -23,7 +23,7 @@ void generatePage_generatesTitle() throws Exception {
         setUpWithJson(SAMPLE_JSON);
         Trends trends = Whitebox.invokeMethod(ReportBuilder.class, "loadTrends", TRENDS_FILE);
         page = new TrendsOverviewPage(reportResult, configuration, trends);
-        final String titleValue = String.format("Cucumber Reports  - Trends Overview",
+        final String titleValue = String.format("Cucumber Reports (no %s) - Trends Overview",
                 configuration.getBuildNumber());
 
         // when
diff --git a/src/test/java/net/masterthought/cucumber/generators/integrations/helpers/DocumentAssertion.java b/src/test/java/net/masterthought/cucumber/generators/integrations/helpers/DocumentAssertion.java
@@ -31,6 +31,7 @@ public TableRowAssertion[] getClassifications() {
         return byId("classifications", WebAssertion.class).allBySelector("tbody tr", TableRowAssertion.class);
     }
 
+    @Override
     public SummaryAssertion getReport() {
         return byId("report", SummaryAssertion.class);
     }
diff --git a/src/test/java/net/masterthought/cucumber/generators/integrations/helpers/NavigationItemAssertion.java b/src/test/java/net/masterthought/cucumber/generators/integrations/helpers/NavigationItemAssertion.java
@@ -8,7 +8,7 @@
  */
 public class NavigationItemAssertion extends LinkAssertion {
 
-    public void hasLinkToJenkins(Configuration configuration) {
+    public void hasLinkToJenkins() {
         hasLabelAndAddress("Jenkins", "../");
     }
 
diff --git a/src/test/java/net/masterthought/cucumber/generators/integrations/helpers/WebAssertion.java b/src/test/java/net/masterthought/cucumber/generators/integrations/helpers/WebAssertion.java
@@ -61,8 +61,8 @@ public <T extends WebAssertion> T childByClass(String cssClass, Class<T> clazz)
         assertNotEmpty(matched, cssClass);
         if (matched.size() > 1) {
             StringBuilder sb = new StringBuilder();
-            for (Element element : matched) {
-                sb.append(element).append("\n");
+            for (Element matchedElement : matched) {
+                sb.append(matchedElement).append("\n");
             }
             throw new IllegalArgumentException(String.format("Expected one but found %d elements with class '%s': %s",
                     matched.size(), cssClass, sb.toString()));
@@ -104,14 +104,14 @@ public <T extends WebAssertion> T[] allBySelector(String selector, Class<T> claz
 
     private <T extends WebAssertion> T[] toArray(Elements inners, Class<T> clazz) {
         List<T> elements = new ArrayList<>();
-        for (Element element : inners) {
+        for (Element innersElement : inners) {
             T assertion = null;
             try {
                 assertion = (T) clazz.getDeclaredConstructor().newInstance();
             } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) {
                 throw new IllegalArgumentException(e);
             }
-            assertion.element = element;
+            assertion.element = innersElement;
             elements.add(assertion);
         }
 
diff --git a/src/test/java/net/masterthought/cucumber/json/support/TagObjectTest.java b/src/test/java/net/masterthought/cucumber/json/support/TagObjectTest.java
@@ -92,7 +92,7 @@ void getPassedFeatures_ThrowsException() {
         TagObject tag = new TagObject("@checkout");
 
         // when & then
-        assertThatThrownBy(() -> tag.getPassedFeatures())
+        assertThatThrownBy(tag::getPassedFeatures)
                 .isInstanceOf(NotImplementedException.class);
     }
 
@@ -103,7 +103,7 @@ void getFailedFeatures_ThrowsException() {
         TagObject tag = new TagObject("@checkout");
 
         // when & then
-        assertThatThrownBy(() -> tag.getFailedFeatures())
+        assertThatThrownBy(tag::getFailedFeatures)
                 .isInstanceOf(NotImplementedException.class);
     }
 
diff --git a/src/test/java/net/masterthought/cucumber/util/StepNameFormatterTest.java b/src/test/java/net/masterthought/cucumber/util/StepNameFormatterTest.java
@@ -2,10 +2,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 import net.masterthought.cucumber.generators.integrations.PageTest;
 import net.masterthought.cucumber.json.Step;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 class StepNameFormatterTest extends PageTest {
 
@@ -105,19 +105,6 @@ void format_OnMultipleArguments_ReturnsFormattedValue() {
         assertThat(formatted).isEqualTo("the Account Holder requests <arg>10</arg>, entering PIN <arg>1234</arg>");
     }
 
-    @Test
-    void format_OnEmptyValue_ReturnsUnchangedValue() {
-
-        // given
-        Step step = features.get(0).getElements()[1].getSteps()[3];
-
-        // when
-        String formatted = StepNameFormatter.format(step.getName(), step.getMatch().getArguments(), "<arg>", "</arg>");
-
-        // then
-        assertThat(formatted).isEqualTo("the Account Holder requests <arg>10</arg>, entering PIN <arg>1234</arg>");
-    }
-
     @Test
     void format_optionalArgumentNotMatched() {
 
diff --git a/src/test/java/net/masterthought/cucumber/util/UtilTest.java b/src/test/java/net/masterthought/cucumber/util/UtilTest.java
@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
+import java.util.stream.Stream;
 
 import net.masterthought.cucumber.generators.integrations.PageTest;
 import net.masterthought.cucumber.json.Hook;
@@ -74,12 +75,14 @@ void toValidFileName_RemovesInvalidChars() {
     void eliminateEmptyHooks_RemovesEmptyHooks() {
 
         // given
-        Hook[] hooks = features.get(0).getElements()[0].getBefore();
+        Hook[] hook = features.get(0).getElements()[1].getAfter();
+        Hook[] emptyHook = new Hook[0];
+        Hook[] hooks = Stream.of(hook, emptyHook).flatMap(Stream::of).toArray(Hook[]::new);
 
         // when
         List<Hook> reducedHooks = Util.eliminateEmptyHooks(hooks);
 
         // then
-        assertThat(reducedHooks).isEmpty();
+        assertThat(reducedHooks).containsExactly(hook);
     }
 }
