[issue-24] - fix for collecting results

Author: Denys Zaiats

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

@@ -21,19 +21,23 @@
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 import static util.validator.Constants.*;
 
 
 public class HtmlReportBuilder {
 
     private final Logger LOG = Logger.getLogger(HtmlReportBuilder.class);
+    private List<String> jsonFiles;
 
-    public void buildReport(String reportName) throws IOException, ParseException, InterruptedException {
+    public void buildReport(String reportName, List<String> jsonFiles) throws IOException, ParseException, InterruptedException {
+        this.jsonFiles = jsonFiles;
         writeReport(reportName);
     }
 
-    public void buildReport() throws IOException, ParseException, InterruptedException {
+    public void buildReport(List<String> jsonFiles) throws IOException, ParseException, InterruptedException {
+        this.jsonFiles = jsonFiles;
         writeReport("result");
     }
 
@@ -84,7 +88,7 @@ private Html buildHtml() throws IOException, ParseException {
 
                 if (listOfFiles != null) {
                     for (File file : listOfFiles) {
-                        if (file.isFile()) {
+                        if (file.isFile() && jsonFiles.contains(file.getName())) {
                             JSONParser parser = new JSONParser();
                             Object obj = parser.parse(new FileReader(file));
 
@@ -124,6 +128,7 @@ private Html buildHtml() throws IOException, ParseException {
                                         new Style("width: 96%; margin-left:2%"));
                             }};
 
+                            jsonFiles.remove(file.getName());
                             while (!file.delete()) ;
                         }
                     }

src/main/java/util/validator/ResponsiveUIValidator.java

@@ -39,7 +39,7 @@ public class ResponsiveUIValidator {
     static boolean drawRightOffsetLine = false;
     static boolean drawTopOffsetLine = false;
     static boolean drawBottomOffsetLine = false;
-    static boolean isMobileTopBar = false;
+    private static boolean isMobileTopBar = false;
     private static boolean withReport = false;
     private static String scenarioName = "Default";
     private static Color rootColor = new Color(255, 0, 0, 255);
@@ -50,6 +50,7 @@ public class ResponsiveUIValidator {
     private static BufferedImage img;
     private static Graphics2D g;
     private static JSONArray errorMessage;
+    private static List<String> jsonFiles = new ArrayList<>();
     String rootElementReadableName = "Root Element";
     List<WebElement> rootElements;
     ResponsiveUIValidator.Units units = PX;
@@ -201,11 +202,13 @@ public boolean validate() {
                 }
 
                 long ms = System.currentTimeMillis();
-                try (Writer writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(TARGET_AUTOMOTION_JSON + rootElementReadableName.replace(" ", "") + "-automotion" + ms + ".json"), StandardCharsets.UTF_8))) {
+                String jsonFileName = rootElementReadableName.replace(" ", "") + "-automotion" + ms + ".json";
+                try (Writer writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(TARGET_AUTOMOTION_JSON + jsonFileName), StandardCharsets.UTF_8))) {
                     writer.write(jsonResults.toJSONString());
                 } catch (IOException ex) {
                     LOG.error("Cannot create json report: " + ex.getMessage());
                 }
+                jsonFiles.add(jsonFileName);
                 try {
                     File file = new File(TARGET_AUTOMOTION_JSON + rootElementReadableName.replace(" ", "") + "-automotion" + ms + ".json");
                     if (file.getParentFile().mkdirs()) {
@@ -235,9 +238,9 @@ public boolean validate() {
      * Call method to generate HTML report
      */
     public void generateReport() {
-        if (withReport && isAutomotionFolderExists()) {
+        if (withReport && !jsonFiles.isEmpty()) {
             try {
-                new HtmlReportBuilder().buildReport();
+                new HtmlReportBuilder().buildReport(jsonFiles);
             } catch (IOException | ParseException | InterruptedException e) {
                 e.printStackTrace();
             }
@@ -250,9 +253,9 @@ public void generateReport() {
      * @param name
      */
     public void generateReport(String name) {
-        if (withReport && isAutomotionFolderExists()) {
+        if (withReport && !jsonFiles.isEmpty()) {
             try {
-                new HtmlReportBuilder().buildReport(name);
+                new HtmlReportBuilder().buildReport(name, jsonFiles);
             } catch (IOException | ParseException | InterruptedException e) {
                 e.printStackTrace();
             }