[improve-html-report] - split the success and failures results into separate folders

Author: dzaiats

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.itarray</groupId>
     <artifactId>automotion</artifactId>
-    <version>2.1.0-beta1</version>
+    <version>2.1.0-beta2</version>
     <name>Automotion</name>
     <description>Library for smart visual automation testing</description>
     <url>https://automotion.itarray.net</url>
@@ -129,7 +129,7 @@
             <plugin>
                 <groupId>net.itarray</groupId>
                 <artifactId>automotion-maven-plugin</artifactId>
-                <version>1.0.1</version>
+                <version>1.0.2</version>
             </plugin>
         </plugins>
     </build>

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

@@ -22,7 +22,6 @@
 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;
@@ -44,6 +43,11 @@ public class HtmlReportBuilder {
     private String barDuration = "";
     private String barScenariosNames = "";
 
+    public HtmlReportBuilder() {
+        failuresCounter = 0;
+        successCounter = 0;
+    }
+
     public void buildReport(String reportName, List<String> jsonFiles) {
         this.jsonFiles = jsonFiles;
         try {
@@ -59,7 +63,12 @@ private void writeReport(String reportName) throws IOException, ParseException {
         long ms = System.currentTimeMillis();
         String uuid = Helper.getGeneratedStringWithLength(7);
 
-        File report = new File(TARGET_AUTOMOTION_HTML + reportName.replace(" ", "_") + "-" + ms + uuid + ".html");
+        String statusFolder = "success/";
+        if (failuresCounter > 0) {
+            statusFolder = "failure/";
+        }
+
+        File report = new File(TARGET_AUTOMOTION_HTML + statusFolder + reportName.replace(" ", "_") + "-" + ms + uuid + ".html");
         report.getParentFile().mkdirs();
         try (FileOutputStream fos = new FileOutputStream(report);
              BufferedOutputStream bos = new BufferedOutputStream(fos);) {
@@ -330,13 +339,13 @@ private Html buildHtml() throws IOException, ParseException {
                                                     if (isFailed) {
                                                         new Img(this,
                                                                 new Style("position:relative; left: 0; top:0"),
-                                                                new Src(String.format("../img/%s", jsonObject.get(SCREENSHOT))),
+                                                                new Src(String.format("../../img/%s", jsonObject.get(SCREENSHOT))),
                                                                 new Alt("screenshot"));
                                                         new Img(this,
                                                                 new Id(screenshotDrawingOverlay.toString()),
                                                                 new Style("position:absolute; left: 0; top:0;"),
                                                                 //new Style("position:absolute; left: 0; top:0; display:none;"),
-                                                                new Src(String.format("../img/%s", screenshotDrawingOverlay.toString())),
+                                                                new Src(String.format("../../img/%s", screenshotDrawingOverlay.toString())),
                                                                 new OnClick("showModal('" + screenshotDrawingOverlay.toString() + "')"),
                                                                 new Alt("screenshot-overlay"));
                                                     }

src/test/java/ResponsiveValidatorNewDSLTest.java

@@ -5,6 +5,7 @@
 import net.itarray.automotion.validation.properties.Padding;
 import org.assertj.core.api.SoftAssertions;
 import org.junit.After;
+import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.openqa.selenium.By;
@@ -26,6 +27,9 @@ public class ResponsiveValidatorNewDSLTest {
 
     private static WebDriver driver;
     private static long start;
+    private TestPage page;
+    private ResponsiveUIValidator responsiveUIValidator;
+    private SoftAssertions softly;
 
     public static void main(String[] args) {
         ManualTestSupport.deleteOutputDirectory();
@@ -49,8 +53,8 @@ private static void time(String msg) {
         System.out.println((stop - start) + " ms " + msg);
     }
 
-    @Test
-    public void testThatResponsiveValidatorWorks() {
+    @Before
+    public void setUp() {
         Map<String, String> sysProp = new HashMap<>();
         //sysProp.put("BROWSER", "Chrome");
         //sysProp.put("IS_LOCAL", "true");
@@ -64,13 +68,31 @@ public void testThatResponsiveValidatorWorks() {
 
         start = System.currentTimeMillis();
 
-        TestPage page = new TestPage(driver);
+        page = new TestPage(driver);
 
-        ResponsiveUIValidator responsiveUIValidator = new ResponsiveUIValidator(driver);
+        responsiveUIValidator = new ResponsiveUIValidator(driver);
 
         responsiveUIValidator.setLinesColor(Color.BLACK);
-        SoftAssertions softly = new SoftAssertions();
+        softly = new SoftAssertions();
+    }
 
+    @Test
+    public void testGenerateGreenTests() {
+        time("-1-");
+        UISnapshot mainSnapshot = responsiveUIValidator.snapshot("Main");
+        boolean success3 = mainSnapshot.findElements(page.gridElements())
+                .alignedAsGrid(4, 3)
+                .doNotOverlap()
+                .validate();
+
+        softly.assertThat(success3).isEqualTo(true).overridingErrorMessage("Failed validation of Grid");
+
+        responsiveUIValidator.generateReport("Home Page");
+
+        softly.assertAll();
+    }
+    @Test
+    public void testThatResponsiveValidatorWorks() {
         time("-1-");
         UISnapshot mainSnapshot = responsiveUIValidator.snapshot("Main");
         boolean success1 = mainSnapshot.findElement(page.topSlider(), "Top Slider")