Skip to content

1.4.2 update unique names for images json #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dzaiats merged 4 commits into from
Dec 26, 2016
Merged

1.4.2 update unique names for images json #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25f57ca
[1.4.2-updated-unique-json-names] - fix for collecting results
Dec 23, 2016
f4df5c9
[1.4.2-minor fixes] - common fixes
dzaiats Dec 26, 2016
6a5edb2
[1.4.2-minor fixes] - common fixes
dzaiats Dec 26, 2016
ddbb180
[1.4.2-minor fixes] - common fixes
dzaiats Dec 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 43 additions & 83 deletions src/main/java/util/validator/ResponsiveUIValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package util.validator;

import http.helpers.Helper;
import org.apache.commons.io.FileUtils;
import org.apache.log4j.Logger;
import org.json.simple.JSONArray;
Expand All @@ -23,7 +24,6 @@
import java.util.concurrent.atomic.AtomicLong;

import static environment.EnvironmentFactory.*;
import static util.general.SystemHelper.isAutomotionFolderExists;
import static util.general.SystemHelper.isRetinaDisplay;
import static util.validator.Constants.*;
import static util.validator.ResponsiveUIValidator.Units.PX;
Expand Down Expand Up @@ -177,17 +177,15 @@ public boolean validate() {
if (!errorMessage.isEmpty()) {
jsonResults.put(ERROR_KEY, true);
jsonResults.put(DETAILS, errorMessage);
}

if (withReport && !errorMessage.isEmpty()) {
try {
screenshot = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE);
img = ImageIO.read(screenshot);
} catch (Exception e) {
LOG.error("Failed to create screenshot file: " + e.getMessage());
}
if (withReport) {
try {
screenshot = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE);
img = ImageIO.read(screenshot);
} catch (Exception e) {
LOG.error("Failed to create screenshot file: " + e.getMessage());
}

if (!errorMessage.isEmpty()) {
JSONObject rootDetails = new JSONObject();
rootDetails.put(X, xRoot);
rootDetails.put(Y, yRoot);
Expand All @@ -199,31 +197,32 @@ public boolean validate() {
jsonResults.put(TIME_EXECUTION, String.valueOf(System.currentTimeMillis() - startTime) + " milliseconds");
jsonResults.put(ELEMENT_NAME, rootElementReadableName);
jsonResults.put(SCREENSHOT, rootElementReadableName.replace(" ", "") + "-" + screenshot.getName());
}

long ms = System.currentTimeMillis();
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()) {
if (file.createNewFile()) {
BufferedWriter writer = new BufferedWriter(new FileWriter(file));
writer.write(jsonResults.toJSONString());
writer.close();
long ms = System.currentTimeMillis();
String uuid = Helper.getGeneratedStringWithLength(7);
String jsonFileName = rootElementReadableName.replace(" ", "") + "-automotion" + ms + uuid + ".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 + uuid + ".json");
if (file.getParentFile().mkdirs()) {
if (file.createNewFile()) {
BufferedWriter writer = new BufferedWriter(new FileWriter(file));
writer.write(jsonResults.toJSONString());
writer.close();
}
}
} catch (IOException e) {
e.printStackTrace();
}
} catch (IOException e) {
e.printStackTrace();
}

if ((boolean) jsonResults.get(ERROR_KEY)) {
drawScreenshot();
if ((boolean) jsonResults.get(ERROR_KEY)) {
drawScreenshot();
}
}
}
} else {
Expand Down Expand Up @@ -319,7 +318,7 @@ void validateGridAlignment(int columns, int rows) {
int mapSize = map.size();
if (rows > 0) {
if (mapSize != rows) {
putJsonDetailsWithoutElement("Elements in a grid are not aligned properly. Looks like grid has wrong amount of rows. Expected is " + rows + ". Actual is " + mapSize + "");
putJsonDetailsWithoutElement(String.format("Elements in a grid are not aligned properly. Looks like grid has wrong amount of rows. Expected is %d. Actual is %d", rows, mapSize));
}
}

Expand All @@ -329,7 +328,7 @@ void validateGridAlignment(int columns, int rows) {
if (rowCount <= mapSize) {
int actualInARow = entry.getValue().intValue();
if (actualInARow != columns) {
putJsonDetailsWithoutElement("Elements in a grid are not aligned properly in row #" + rowCount + ". Expected " + columns + " elements in a row. Actually it's " + actualInARow + "");
putJsonDetailsWithoutElement(String.format("Elements in a grid are not aligned properly in row #%d. Expected %d elements in a row. Actually it's %d", rowCount, columns, actualInARow));
}
rowCount++;
}
Expand All @@ -341,78 +340,78 @@ void validateGridAlignment(int columns, int rows) {
void validateRightOffsetForChunk(List<WebElement> elements) {
for (int i = 0; i < elements.size() - 1; i++) {
if (!elementsHaveEqualLeftRightOffset(false, elements.get(i), elements.get(i + 1))) {
putJsonDetailsWithElement("Element #" + (i + 1) + " has not the same right offset as element #" + (i + 2) + "", elements.get(i + 1));
putJsonDetailsWithElement(String.format("Element #%d has not the same right offset as element #%d", i + 1, i + 2), elements.get(i + 1));
}
}
}

void validateLeftOffsetForChunk(List<WebElement> elements) {
for (int i = 0; i < elements.size() - 1; i++) {
if (!elementsHaveEqualLeftRightOffset(true, elements.get(i), elements.get(i + 1))) {
putJsonDetailsWithElement("Element #" + (i + 1) + " has not the same left offset as element #" + (i + 2) + "", elements.get(i + 1));
putJsonDetailsWithElement(String.format("Element #%d has not the same left offset as element #%d", i + 1, i + 2), elements.get(i + 1));
}
}
}

void validateTopOffsetForChunk(List<WebElement> elements) {
for (int i = 0; i < elements.size() - 1; i++) {
if (!elementsHaveEqualTopBottomOffset(true, elements.get(i), elements.get(i + 1))) {
putJsonDetailsWithElement("Element #" + (i + 1) + " has not the same top offset as element #" + (i + 2) + "", elements.get(i + 1));
putJsonDetailsWithElement(String.format("Element #%d has not the same top offset as element #%d", i + 1, i + 2), elements.get(i + 1));
}
}
}

void validateBottomOffsetForChunk(List<WebElement> elements) {
for (int i = 0; i < elements.size() - 1; i++) {
if (!elementsHaveEqualTopBottomOffset(false, elements.get(i), elements.get(i + 1))) {
putJsonDetailsWithElement("Element #" + (i + 1) + " has not the same bottom offset as element #" + (i + 2) + "", elements.get(i + 1));
putJsonDetailsWithElement(String.format("Element #%d has not the same bottom offset as element #%d", i + 1, i + 2), elements.get(i + 1));
}
}
}

void validateRightOffsetForElements(WebElement element, String readableName) {
if (!element.equals(rootElement)) {
if (!elementsHaveEqualLeftRightOffset(false, element)) {
if (!elementsHaveEqualLeftRightOffset(false, rootElement, element)) {
putJsonDetailsWithElement(String.format("Element '%s' has not the same right offset as element '%s'", rootElementReadableName, readableName), element);
}
}
}

void validateLeftOffsetForElements(WebElement element, String readableName) {
if (!element.equals(rootElement)) {
if (!elementsHaveEqualLeftRightOffset(true, element)) {
if (!elementsHaveEqualLeftRightOffset(true, rootElement, element)) {
putJsonDetailsWithElement(String.format("Element '%s' has not the same left offset as element '%s'", rootElementReadableName, readableName), element);
}
}
}

void validateTopOffsetForElements(WebElement element, String readableName) {
if (!element.equals(rootElement)) {
if (!elementsHaveEqualTopBottomOffset(true, element)) {
if (!elementsHaveEqualTopBottomOffset(true, rootElement, element)) {
putJsonDetailsWithElement(String.format("Element '%s' has not the same top offset as element '%s'", rootElementReadableName, readableName), element);
}
}
}

void validateBottomOffsetForElements(WebElement element, String readableName) {
if (!element.equals(rootElement)) {
if (!elementsHaveEqualTopBottomOffset(false, element)) {
if (!elementsHaveEqualTopBottomOffset(false, rootElement, element)) {
putJsonDetailsWithElement(String.format("Element '%s' has not the same bottom offset as element '%s'", rootElementReadableName, readableName), element);
}
}
}

void validateNotOverlappingWithElements(WebElement element, String readableName) {
if (!element.equals(rootElement)) {
if (elementsAreOverlapped(element)) {
if (elementsAreOverlapped(rootElement, element)) {
putJsonDetailsWithElement(String.format("Element '%s' is overlapped with element '%s' but should not", rootElementReadableName, readableName), element);
}
}
}

void validateOverlappingWithElements(WebElement element, String readableName) {
if (!element.equals(rootElement)) {
if (!elementsAreOverlapped(element)) {
if (!elementsAreOverlapped(rootElement, element)) {
putJsonDetailsWithElement(String.format("Element '%s' is not overlapped with element '%s' but should be", rootElementReadableName, readableName), element);
}
}
Expand Down Expand Up @@ -839,7 +838,7 @@ private boolean elementsAreOverlappedOnBorder(WebElement rootElement, WebElement
int sqRootElement = widthRoot * heightRoot;
int sqElement = elSize.width * elSize.height;

int sqCommon = 0;
int sqCommon;
if (xRoot < elLoc.x && yRoot == elLoc.y) {
sqCommon = (widthRoot + (elLoc.x - (xRoot + widthRoot) + elSize.width)) * (heightRoot);
} else if (yRoot < elLoc.y && xRoot == elLoc.x) {
Expand All @@ -855,22 +854,6 @@ private boolean elementsAreOverlappedOnBorder(WebElement rootElement, WebElement
return sqCommon < sqRootElement + sqElement;
}

private boolean elementsAreOverlapped(WebElement elementOverlapWith) {
Point elLoc = elementOverlapWith.getLocation();
Dimension elSize = elementOverlapWith.getSize();
return ((xRoot >= elLoc.x && yRoot > elLoc.y && xRoot < elLoc.x + elSize.width && yRoot < elLoc.y + elSize.height)
|| (xRoot + widthRoot > elLoc.x && yRoot > elLoc.y && xRoot + widthRoot < elLoc.x + elSize.width && yRoot < elLoc.y + elSize.height)
|| (xRoot > elLoc.x && yRoot + heightRoot > elLoc.y && xRoot < elLoc.x + elSize.width && yRoot + heightRoot < elLoc.y + elSize.height)
|| (xRoot + widthRoot > elLoc.x && yRoot + heightRoot > elLoc.y && xRoot + widthRoot < elLoc.x + elSize.width && yRoot + heightRoot < elLoc.y + elSize.height))

|| ((elLoc.x > xRoot && elLoc.y > yRoot && elLoc.x + elSize.width < xRoot && elLoc.y + elSize.height < yRoot)
|| (elLoc.x > xRoot + widthRoot && elLoc.y > yRoot && elLoc.x + elSize.width < xRoot + widthRoot && elLoc.y + elSize.height < yRoot)
|| (elLoc.x > xRoot && elLoc.y > yRoot + heightRoot && elLoc.x + elSize.width < xRoot && elLoc.y + elSize.height < yRoot + heightRoot)
|| (elLoc.x > xRoot + widthRoot && elLoc.y > yRoot + heightRoot && elLoc.x + elSize.width < xRoot + widthRoot && elLoc.y + elSize.height < yRoot + heightRoot))

|| elementsAreOverlappedOnBorder(rootElement, elementOverlapWith);
}

private boolean elementsAreOverlapped(WebElement rootElement, WebElement elementOverlapWith) {
Point elLoc = elementOverlapWith.getLocation();
Dimension elSize = elementOverlapWith.getSize();
Expand All @@ -892,17 +875,6 @@ private boolean elementsAreOverlapped(WebElement rootElement, WebElement element
|| elementsAreOverlappedOnBorder(rootElement, elementOverlapWith);
}

private boolean elementsHaveEqualLeftRightOffset(boolean isLeft, WebElement elementToCompare) {
Point elLoc = elementToCompare.getLocation();
Dimension elSize = elementToCompare.getSize();

if (isLeft) {
return xRoot == elLoc.getX();
} else {
return (pageWidth - xRoot + widthRoot) == (pageWidth - elLoc.getX() + elSize.getWidth());
}
}

private boolean elementsHaveEqualLeftRightOffset(boolean isLeft, WebElement element, WebElement elementToCompare) {
Point elLoc = elementToCompare.getLocation();
Dimension elSize = elementToCompare.getSize();
Expand All @@ -916,18 +888,6 @@ private boolean elementsHaveEqualLeftRightOffset(boolean isLeft, WebElement elem
}
}


private boolean elementsHaveEqualTopBottomOffset(boolean isTop, WebElement elementToCompare) {
Point elLoc = elementToCompare.getLocation();
Dimension elSize = elementToCompare.getSize();

if (isTop) {
return yRoot == elLoc.getY();
} else {
return (pageHeight - yRoot + heightRoot) == (pageHeight - elLoc.getY() + elSize.getHeight());
}
}

private boolean elementsHaveEqualTopBottomOffset(boolean isTop, WebElement element, WebElement elementToCompare) {
Point elLoc = elementToCompare.getLocation();
Dimension elSize = elementToCompare.getSize();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/util/validator/UIValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public UIValidator withLeftElement(WebElement element) {
}

/**
* // Verify that element which located left to is correct with specified margins
* Verify that element which located left to is correct with specified margins
*
* @param element
* @param minMargin
Expand Down