Skip to content

Commit a113392

Browse files
committed
[improve-html-report] - split the success and failures results into separate folders
1 parent b0b8cad commit a113392

File tree

3 files changed

+42
-11
lines changed

3 files changed

+42
-11
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>net.itarray</groupId>
88
<artifactId>automotion</artifactId>
9-
<version>2.1.0-beta1</version>
9+
<version>2.1.0-beta2</version>
1010
<name>Automotion</name>
1111
<description>Library for smart visual automation testing</description>
1212
<url>https://automotion.itarray.net</url>
@@ -129,7 +129,7 @@
129129
<plugin>
130130
<groupId>net.itarray</groupId>
131131
<artifactId>automotion-maven-plugin</artifactId>
132-
<version>1.0.1</version>
132+
<version>1.0.2</version>
133133
</plugin>
134134
</plugins>
135135
</build>

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.json.simple.parser.JSONParser;
2323
import org.json.simple.parser.ParseException;
2424

25-
import java.awt.*;
2625
import java.io.*;
2726
import java.nio.charset.StandardCharsets;
2827
import java.text.SimpleDateFormat;
@@ -44,6 +43,11 @@ public class HtmlReportBuilder {
4443
private String barDuration = "";
4544
private String barScenariosNames = "";
4645

46+
public HtmlReportBuilder() {
47+
failuresCounter = 0;
48+
successCounter = 0;
49+
}
50+
4751
public void buildReport(String reportName, List<String> jsonFiles) {
4852
this.jsonFiles = jsonFiles;
4953
try {
@@ -59,7 +63,12 @@ private void writeReport(String reportName) throws IOException, ParseException {
5963
long ms = System.currentTimeMillis();
6064
String uuid = Helper.getGeneratedStringWithLength(7);
6165

62-
File report = new File(TARGET_AUTOMOTION_HTML + reportName.replace(" ", "_") + "-" + ms + uuid + ".html");
66+
String statusFolder = "success/";
67+
if (failuresCounter > 0) {
68+
statusFolder = "failure/";
69+
}
70+
71+
File report = new File(TARGET_AUTOMOTION_HTML + statusFolder + reportName.replace(" ", "_") + "-" + ms + uuid + ".html");
6372
report.getParentFile().mkdirs();
6473
try (FileOutputStream fos = new FileOutputStream(report);
6574
BufferedOutputStream bos = new BufferedOutputStream(fos);) {
@@ -330,13 +339,13 @@ private Html buildHtml() throws IOException, ParseException {
330339
if (isFailed) {
331340
new Img(this,
332341
new Style("position:relative; left: 0; top:0"),
333-
new Src(String.format("../img/%s", jsonObject.get(SCREENSHOT))),
342+
new Src(String.format("../../img/%s", jsonObject.get(SCREENSHOT))),
334343
new Alt("screenshot"));
335344
new Img(this,
336345
new Id(screenshotDrawingOverlay.toString()),
337346
new Style("position:absolute; left: 0; top:0;"),
338347
//new Style("position:absolute; left: 0; top:0; display:none;"),
339-
new Src(String.format("../img/%s", screenshotDrawingOverlay.toString())),
348+
new Src(String.format("../../img/%s", screenshotDrawingOverlay.toString())),
340349
new OnClick("showModal('" + screenshotDrawingOverlay.toString() + "')"),
341350
new Alt("screenshot-overlay"));
342351
}

src/test/java/ResponsiveValidatorNewDSLTest.java

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import net.itarray.automotion.validation.properties.Padding;
66
import org.assertj.core.api.SoftAssertions;
77
import org.junit.After;
8+
import org.junit.Before;
89
import org.junit.Ignore;
910
import org.junit.Test;
1011
import org.openqa.selenium.By;
@@ -26,6 +27,9 @@ public class ResponsiveValidatorNewDSLTest {
2627

2728
private static WebDriver driver;
2829
private static long start;
30+
private TestPage page;
31+
private ResponsiveUIValidator responsiveUIValidator;
32+
private SoftAssertions softly;
2933

3034
public static void main(String[] args) {
3135
ManualTestSupport.deleteOutputDirectory();
@@ -49,8 +53,8 @@ private static void time(String msg) {
4953
System.out.println((stop - start) + " ms " + msg);
5054
}
5155

52-
@Test
53-
public void testThatResponsiveValidatorWorks() {
56+
@Before
57+
public void setUp() {
5458
Map<String, String> sysProp = new HashMap<>();
5559
//sysProp.put("BROWSER", "Chrome");
5660
//sysProp.put("IS_LOCAL", "true");
@@ -64,13 +68,31 @@ public void testThatResponsiveValidatorWorks() {
6468

6569
start = System.currentTimeMillis();
6670

67-
TestPage page = new TestPage(driver);
71+
page = new TestPage(driver);
6872

69-
ResponsiveUIValidator responsiveUIValidator = new ResponsiveUIValidator(driver);
73+
responsiveUIValidator = new ResponsiveUIValidator(driver);
7074

7175
responsiveUIValidator.setLinesColor(Color.BLACK);
72-
SoftAssertions softly = new SoftAssertions();
76+
softly = new SoftAssertions();
77+
}
7378

79+
@Test
80+
public void testGenerateGreenTests() {
81+
time("-1-");
82+
UISnapshot mainSnapshot = responsiveUIValidator.snapshot("Main");
83+
boolean success3 = mainSnapshot.findElements(page.gridElements())
84+
.alignedAsGrid(4, 3)
85+
.doNotOverlap()
86+
.validate();
87+
88+
softly.assertThat(success3).isEqualTo(true).overridingErrorMessage("Failed validation of Grid");
89+
90+
responsiveUIValidator.generateReport("Home Page");
91+
92+
softly.assertAll();
93+
}
94+
@Test
95+
public void testThatResponsiveValidatorWorks() {
7496
time("-1-");
7597
UISnapshot mainSnapshot = responsiveUIValidator.snapshot("Main");
7698
boolean success1 = mainSnapshot.findElement(page.topSlider(), "Top Slider")

0 commit comments

Comments
 (0)