Cucumber reporting - New Generation UI

pom.xml

@@ -3,7 +3,7 @@
     <groupId>net.masterthought</groupId>
     <artifactId>cucumber-reporting</artifactId>
     <packaging>jar</packaging>
-    <version>5.1.1</version>
+    <version>5.1.2-SNAPSHOT</version>
     <name>cucumber-reporting</name>
     <url>https://github.com/damianszczepanik/cucumber-reporting</url>
 
@@ -12,39 +12,10 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
         <maven.compile.encoding>UTF-8</maven.compile.encoding>
-
         <powermock.version>1.7.0</powermock.version>
-
         <test.integration.pattern>**/*IntegrationTest*.java</test.integration.pattern>
     </properties>
 
-    <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>7</version>
-    </parent>
-
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-        <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-    </distributionManagement>
-
-    <scm>
-        <connection>scm:git:[email protected]:damianszczepanik/cucumber-reporting.git</connection>
-        <developerConnection>scm:git:[email protected]:damianszczepanik/cucumber-reporting.git</developerConnection>
-        <url>[email protected]:damianszczepanik/cucumber-reporting.git</url>
-    </scm>
-    <ciManagement>
-        <system>travis</system>
-        <url>https://travis-ci.org/damianszczepanik/cucumber-reporting</url>
-    </ciManagement>
-
     <description>
         Provides pretty html reports for Cucumber. It works by generating html from the cucumber json file.
     </description>
@@ -85,26 +56,6 @@
                 <gpg.keyname>0738FA8F</gpg.keyname>
                 <release.username>Damian Szczepanik</release.username>
             </properties>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.6</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-
         </profile>
     </profiles>
 
@@ -135,20 +86,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
@@ -168,10 +105,27 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <source>8</source>
+                    <doclint>none</doclint>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.20</version>
+                <version>2.22.1</version>
                 <configuration>
                     <systemPropertyVariables>
                         <!-- JaCoCo runtime must know where to dump coverage: -->
@@ -186,7 +140,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.20</version>
+                <version>2.22.1</version>
                 <configuration>
                     <includes>
                         <!-- Run only integration tests -->

src/main/java/net/masterthought/cucumber/ReportBuilder.java

@@ -1,34 +1,19 @@
 package net.masterthought.cucumber;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.Reader;
-import java.io.Writer;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import org.apache.commons.io.FileUtils;
-
-import net.masterthought.cucumber.generators.ErrorPage;
-import net.masterthought.cucumber.generators.FailuresOverviewPage;
-import net.masterthought.cucumber.generators.FeatureReportPage;
-import net.masterthought.cucumber.generators.FeaturesOverviewPage;
-import net.masterthought.cucumber.generators.StepsOverviewPage;
-import net.masterthought.cucumber.generators.TagReportPage;
-import net.masterthought.cucumber.generators.TagsOverviewPage;
-import net.masterthought.cucumber.generators.TrendsOverviewPage;
+import net.masterthought.cucumber.generators.*;
 import net.masterthought.cucumber.json.Feature;
 import net.masterthought.cucumber.json.support.TagObject;
+import org.apache.commons.io.FileUtils;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class ReportBuilder {
 
@@ -69,6 +54,7 @@ public ReportBuilder(List<String> jsonFiles, Configuration configuration) {
     /**
      * Parses provided files and generates the report. When generating process fails
      * report with information about error is provided.
+     *
      * @return stats for the generated report
      */
     public Reportable generateReports() {
@@ -124,7 +110,8 @@ private void copyStaticResources() {
                 "fontawesome-webfont.eot", "fontawesome-webfont.ttf", "fontawesome-webfont.woff2",
                 "glyphicons-halflings-regular.eot", "glyphicons-halflings-regular.eot",
                 "glyphicons-halflings-regular.woff2", "glyphicons-halflings-regular.woff",
-                "glyphicons-halflings-regular.ttf", "glyphicons-halflings-regular.svg");
+                "glyphicons-halflings-regular.ttf", "glyphicons-halflings-regular.svg", "HarmoniaSans.ttf", "HarmoniaSans.otf",
+                "Inter-UI-Regular.woff2", "Inter-UI-Regular.woff", "Inter-UI-Medium.woff", "Inter-UI-Medium.woff2");
         copyResources("images", "favicon.png");
     }
 
@@ -147,27 +134,27 @@ private void copyResources(String resourceLocation, String... resources) {
         }
     }
 
-	private void generatePages(Trends trends) {
-		new FeaturesOverviewPage(reportResult, configuration).generatePage();
-		
-		for (Feature feature : reportResult.getAllFeatures()) {
-			new FeatureReportPage(reportResult, configuration, feature).generatePage();
-		}
-		
-		new TagsOverviewPage(reportResult, configuration).generatePage();
-		
-		for (TagObject tagObject : reportResult.getAllTags()) {
-			new TagReportPage(reportResult, configuration, tagObject).generatePage();
-		}
-
-		new StepsOverviewPage(reportResult, configuration).generatePage();
-		new FailuresOverviewPage(reportResult, configuration).generatePage();
-
-		if (configuration.isTrendsAvailable()) {
-		    new TrendsOverviewPage(reportResult, configuration, trends).generatePage();
-		}
-	}
-	
+    private void generatePages(Trends trends) {
+        new FeaturesOverviewPage(reportResult, configuration).generatePage();
+
+        for (Feature feature : reportResult.getAllFeatures()) {
+            new FeatureReportPage(reportResult, configuration, feature).generatePage();
+        }
+
+        new TagsOverviewPage(reportResult, configuration).generatePage();
+
+        for (TagObject tagObject : reportResult.getAllTags()) {
+            new TagReportPage(reportResult, configuration, tagObject).generatePage();
+        }
+
+        new StepsOverviewPage(reportResult, configuration).generatePage();
+        new FailuresOverviewPage(reportResult, configuration).generatePage();
+
+        if (configuration.isTrendsAvailable()) {
+            new TrendsOverviewPage(reportResult, configuration, trends).generatePage();
+        }
+    }
+
     private Trends updateAndSaveTrends(Reportable reportable) {
         Trends trends = loadOrCreateTrends();
         appendToTrends(trends, reportable);

src/main/java/net/masterthought/cucumber/ReportParser.java

@@ -1,16 +1,6 @@
 package net.masterthought.cucumber;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.InjectableValues;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import net.masterthought.cucumber.json.Feature;
-import net.masterthought.cucumber.reducers.ReducingMethod;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang3.ArrayUtils;
+import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
@@ -21,7 +11,18 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.InjectableValues;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+
+import net.masterthought.cucumber.json.Feature;
+import net.masterthought.cucumber.reducers.ReducingMethod;
 
 /**
  * @author Damian Szczepanik (damianszczepanik@github)

src/main/java/net/masterthought/cucumber/Reportable.java

@@ -9,51 +9,83 @@
  */
 public interface Reportable {
 
-    /** Returns name of the element that will be displayed to user. */
+    /**
+     * Returns name of the element that will be displayed to user.
+     */
     String getName();
 
-    /** Returns number of features for this element. */
+    /**
+     * Returns number of features for this element.
+     */
     int getFeatures();
 
-    /** Returns number of passed features for this element. */
+    /**
+     * Returns number of passed features for this element.
+     */
     int getPassedFeatures();
 
-    /** Returns number of failed features for this element. */
+    /**
+     * Returns number of failed features for this element.
+     */
     int getFailedFeatures();
 
-    /** Returns number of scenarios for this element. */
+    /**
+     * Returns number of scenarios for this element.
+     */
     int getScenarios();
 
-    /** Returns number of passed scenarios for this element. */
+    /**
+     * Returns number of passed scenarios for this element.
+     */
     int getPassedScenarios();
 
-    /** Returns number of failed scenarios for this element. */
+    /**
+     * Returns number of failed scenarios for this element.
+     */
     int getFailedScenarios();
 
-    /** Returns number of all steps for this element. */
+    /**
+     * Returns number of all steps for this element.
+     */
     int getSteps();
 
-    /** Returns number of passed steps for this element. */
+    /**
+     * Returns number of passed steps for this element.
+     */
     int getPassedSteps();
 
-    /** Returns number of failed steps for this element. */
+    /**
+     * Returns number of failed steps for this element.
+     */
     int getFailedSteps();
 
-    /** Returns number of skipped steps for this element. */
+    /**
+     * Returns number of skipped steps for this element.
+     */
     int getSkippedSteps();
 
-    /** Returns number of undefined steps for this element. */
+    /**
+     * Returns number of undefined steps for this element.
+     */
     int getUndefinedSteps();
 
-    /** Returns number of pending steps for this element. */
+    /**
+     * Returns number of pending steps for this element.
+     */
     int getPendingSteps();
 
-    /** Returns duration as milliseconds for this element. */
+    /**
+     * Returns duration as milliseconds for this element.
+     */
     long getDuration();
 
-    /** Returns formatted duration for this element. */
+    /**
+     * Returns formatted duration for this element.
+     */
     String getFormattedDuration();
 
-    /** Returns status for this element. */
+    /**
+     * Returns status for this element.
+     */
     Status getStatus();
 }