[improve-html-report] - commit 12

Author: dzaiats

pom.xml

@@ -129,7 +129,7 @@
             <plugin>
                 <groupId>net.itarray</groupId>
                 <artifactId>automotion-maven-plugin</artifactId>
-                <version>1.0.0</version>
+                <version>1.0.1</version>
             </plugin>
         </plugins>
     </build>

src/main/java/net/itarray/automotion/internal/DrawableScreenshot.java

@@ -24,7 +24,7 @@ public class DrawableScreenshot {
     public DrawableScreenshot(Vector extend, SimpleTransform transform, DrawingConfiguration drawingConfiguration, String rootElementReadableName, File screenshotName) {
         this.drawingConfiguration = drawingConfiguration;
         this.screenshotName = screenshotName;
-        drawingsOutput = new File(TARGET_AUTOMOTION_IMG + rootElementReadableName.replace(" ", "") + "-draw-" + System.currentTimeMillis() + Helper.getGeneratedStringWithLength(7) + ".png");
+        drawingsOutput = new File(TARGET_AUTOMOTION_IMG + rootElementReadableName.replaceAll("[\\W]|_", "") + "-draw-" + System.currentTimeMillis() + Helper.getGeneratedStringWithLength(7) + ".png");
 
         try {
             this.extend = extend;
@@ -41,7 +41,7 @@ public DrawableScreenshot(Vector extend, SimpleTransform transform, DrawingConfi
     }
 
     public static File takeScreenshot(DriverFacade driver, String rootElementReadableName) {
-        File screenshotName = new File(TARGET_AUTOMOTION_IMG + rootElementReadableName.replace(" ", "") + "-" + System.currentTimeMillis() + Helper.getGeneratedStringWithLength(7) + ".png");
+        File screenshotName = new File(TARGET_AUTOMOTION_IMG + rootElementReadableName.replaceAll("[\\W]|_", "") + "-" + System.currentTimeMillis() + Helper.getGeneratedStringWithLength(7) + ".png");
         driver.takeScreenshot(screenshotName);
         return screenshotName;
     }

src/main/java/net/itarray/automotion/internal/HtmlReportBuilder.java

@@ -22,6 +22,7 @@
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
+import java.awt.*;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
@@ -200,10 +201,21 @@ private Html buildHtml() throws IOException, ParseException {
                     new Div(this,
                             new ClassAttribute("row")) {{
                         new Div(this,
-                                new Style("background-color: rgb(0,191,255); color: white; padding: 10px;")) {{
-                            new H1(this, new Style("font-size:22px; font-weight: 200;")) {{
+                                new Style("background-color: rgb(0,191,255); color: white; padding: 10px; height: 90px")) {{
+                            new H1(this, new Style("font-size:22px; font-weight: 200;"),
+                                    new ClassAttribute("col-md-10")) {{
                                 new NoTag(this, String.format("Results from: %s", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())));
                             }};
+//                            new com.webfirmframework.wffweb.tag.html.formsandinputs.Button(this,
+//                                    new Style("margin: 10px"),
+//                                    new ClassAttribute("col-md-1 btn btn-success")){{
+//                                        new NoTag(this, "Passed");
+//                            }};
+//                            new com.webfirmframework.wffweb.tag.html.formsandinputs.Button(this,
+//                                    new Style("margin: 10px"),
+//                                    new ClassAttribute("col-md-1 btn btn-danger")){{
+//                                new NoTag(this, "Failed");
+//                            }};
                         }};
                     }};
 
@@ -233,15 +245,18 @@ private Html buildHtml() throws IOException, ParseException {
                                 boolean isFailed = (Boolean) jsonObject.get("error");
 
                                 counter++;
-
+                                String className;
                                 if (isFailed) {
                                     failuresCounter++;
+                                    className = "failed";
                                 } else {
                                     successCounter++;
+                                    className = "passed";
                                 }
 
                                 barDuration += String.format("%s, ", ((String) jsonObject.get(TIME_EXECUTION)).split(" ")[0]);
                                 barScenariosNames += String.format("'%d. %s', ", counter, jsonObject.get(SCENARIO));
+                                String finalClassName = className;
                                 new Div(this,
                                         new ClassAttribute("row")) {
                                     {
@@ -251,7 +266,7 @@ private Html buildHtml() throws IOException, ParseException {
                                         }
                                         new Div(this,
                                                 new Style("margin-top:2px;" + bgColor),
-                                                new ClassAttribute("accordion")) {{
+                                                new ClassAttribute("accordion " + finalClassName)) {{
                                             new H1(this,
                                                     new Style("color: rgb(47,79,79); font-size:24px; font-size:18px; font-weight: 300; text-decoration: underline;")) {{
                                                 new NoTag(this, String.format("Scenario: \"%s\"", jsonObject.get(SCENARIO)));

src/test/java/ResponsiveValidatorNewDSLTest.java

@@ -1,3 +1,4 @@
+import net.itarray.automotion.internal.FinalReportBuilder;
 import net.itarray.automotion.tools.driver.WebDriverFactory;
 import net.itarray.automotion.tools.helpers.EnvironmentHelper;
 import net.itarray.automotion.validation.ResponsiveUIValidator;
@@ -149,14 +150,14 @@ public void testThatResponsiveValidatorWorks() {
         responsiveUIValidator.generateReport("Home Page");
         time("-9-");
 
-//        try {
-//            new FinalReportBuilder().execute();
-//        } catch (MojoExecutionException e) {
-//            e.printStackTrace();
-//        }
         softly.assertAll();
     }
 
+    @Test
+    public void testFinalReport() {
+        new FinalReportBuilder().execute();
+    }
+
     @After
     public void tearDown() {
         if (driver != null) {