[responsive-validator] - improved HTML reporting. Added new validations

Author: dzaiats

src/main/java/util/general/HtmlReportBuilder.java

@@ -8,6 +8,7 @@
 import com.webfirmframework.wffweb.tag.html.lists.Li;
 import com.webfirmframework.wffweb.tag.html.lists.Ol;
 import com.webfirmframework.wffweb.tag.html.metainfo.Head;
+import com.webfirmframework.wffweb.tag.html.stylesandsemantics.Div;
 import com.webfirmframework.wffweb.tag.htmlwff.NoTag;
 import org.apache.log4j.Logger;
 import org.json.simple.JSONArray;
@@ -17,27 +18,31 @@
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import static util.validator.Constants.*;
+
 
-/**
- * Created by ZayCo on 25/11/16.
- */
 public class HtmlReportBuilder {
 
-    private static final String TARGET_AUTOMOTION_JSON = "target/automotion/json/";
-    private static final String TARGET_AUTOMOTION = "target/automotion/";
     private final Logger LOG = Logger.getLogger(HtmlReportBuilder.class);
 
     public void buildReport() throws IOException, ParseException, InterruptedException {
         Thread.sleep(3000);
-        Html html = new Html(null) {{
+        Html html = new Html(null, new Style("background-color: rgb(255,250,250)")) {{
             new Head(this) {{
                 new TitleTag(this) {{
                     new NoTag(this, "Automotion report");
                 }};
             }};
             new Body(this) {{
 
-
+                new Div(this, new Style("width: 100%; background-color: rgb(0,191,255); color: white; padding: 10px")) {{
+                    new H1(this) {{
+                        new NoTag(this, "Results from: " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                    }};
+                }};
                 File folder = new File(TARGET_AUTOMOTION_JSON);
                 File[] listOfFiles = folder.listFiles();
 
@@ -47,20 +52,20 @@ public void buildReport() throws IOException, ParseException, InterruptedExcepti
                         Object obj = parser.parse(new FileReader(file));
 
                         JSONObject jsonObject = (JSONObject) obj;
-                        JSONArray details = (JSONArray) jsonObject.get("details");
+                        JSONArray details = (JSONArray) jsonObject.get(DETAILS);
                         new H1(this,
-                                new Style("color: black")) {{
-                            new NoTag(this, "Element: " + jsonObject.get("elementName"));
+                                new Style("color: rgb(0,139,139); margin-top: 50px;")) {{
+                            new NoTag(this, "Element: \"" + jsonObject.get(ELEMENT_NAME) + "\"");
                         }};
                         new H2(this,
-                                new Style("color: red")) {{
+                                new Style("color: rgb(255,69,0)")) {{
                             new NoTag(this, "Failures:");
                         }};
                         new Ol(this) {{
                             for (Object details : details) {
                                 JSONObject det = (JSONObject) details;
-                                JSONObject reason = (JSONObject) det.get("reason");
-                                String numE = (String) reason.get("message");
+                                JSONObject reason = (JSONObject) det.get(REASON);
+                                String numE = (String) reason.get(MESSAGE);
 
                                 new Li(this) {{
                                     new NoTag(this, numE.toString());
@@ -69,9 +74,9 @@ public void buildReport() throws IOException, ParseException, InterruptedExcepti
                         }};
                         new P(this) {{
                             new Img(this,
-                                    new Src("img/" + jsonObject.get("screenshot")),
+                                    new Src("img/" + jsonObject.get(SCREENSHOT)),
                                     new Alt("screenshot"),
-                                    new Style("width: 100%"));
+                                    new Style("width: 90%; margin-left:5%"));
                         }};
                     }
                 }

src/main/java/util/validator/Constants.java

@@ -0,0 +1,19 @@
+package util.validator;
+
+public class Constants {
+    public static final String X = "x";
+    public static final String Y = "y";
+    public static final String WIDTH = "width";
+    public static final String HEIGHT = "height";
+    public static final String ERROR_KEY = "error";
+    public static final String MESSAGE = "message";
+    public static final String DETAILS = "details";
+    public static final Object REASON = "reason";
+    public static final String ELEMENT = "element";
+    public static final String SCREENSHOT = "screenshot";
+    public static final String ELEMENT_NAME = "elementName";
+    public static final String ROOT_ELEMENT = "rootElement";
+    public static final String TARGET_AUTOMOTION_JSON = "target/automotion/json/";
+    public static final String TARGET_AUTOMOTION_IMG = "target/automotion/img/";
+    public static final String TARGET_AUTOMOTION = "target/automotion/";
+}