Skip to content

Commit 37a75fd

Browse files
author
Denys Zaiats
committed
[master] - fir for functions of measuring the margins
1 parent 0262353 commit 37a75fd

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ void validateNotSameSize(List<WebElement> elements, int type) {
581581

582582
void validateBelowElement(WebElement element, int minMargin, int maxMargin) {
583583
int yBelowElement = element.getLocation().y;
584-
int marginBetweenRoot = yBelowElement - yRoot + heightRoot;
584+
int marginBetweenRoot = yBelowElement - (yRoot + heightRoot);
585585
if (marginBetweenRoot < minMargin || marginBetweenRoot > maxMargin) {
586586
putJsonDetailsWithElement(String.format("Below element aligned not properly. Expected margin should be between %spx and %spx. Actual margin is %spx", minMargin, maxMargin, marginBetweenRoot), element);
587587
}
@@ -600,7 +600,7 @@ void validateBelowElement(WebElement element) {
600600
void validateAboveElement(WebElement element, int minMargin, int maxMargin) {
601601
int yAboveElement = element.getLocation().y;
602602
int heightAboveElement = element.getSize().height;
603-
int marginBetweenRoot = yRoot - yAboveElement + heightAboveElement;
603+
int marginBetweenRoot = yRoot - (yAboveElement + heightAboveElement);
604604
if (marginBetweenRoot < minMargin || marginBetweenRoot > maxMargin) {
605605
putJsonDetailsWithElement(String.format("Above element aligned not properly. Expected margin should be between %spx and %spx. Actual margin is %spx", minMargin, maxMargin, marginBetweenRoot), element);
606606
}
@@ -618,7 +618,7 @@ void validateAboveElement(WebElement element) {
618618

619619
void validateRightElement(WebElement element, int minMargin, int maxMargin) {
620620
int xRightElement = element.getLocation().x;
621-
int marginBetweenRoot = xRightElement - xRoot + widthRoot;
621+
int marginBetweenRoot = xRightElement - (xRoot + widthRoot);
622622
if (marginBetweenRoot < minMargin || marginBetweenRoot > maxMargin) {
623623
putJsonDetailsWithElement(String.format("Right element aligned not properly. Expected margin should be between %spx and %spx. Actual margin is %spx", minMargin, maxMargin, marginBetweenRoot), element);
624624
}
@@ -637,7 +637,7 @@ void validateRightElement(WebElement element) {
637637
void validateLeftElement(WebElement leftElement, int minMargin, int maxMargin) {
638638
int xLeftElement = leftElement.getLocation().x;
639639
int widthLeftElement = leftElement.getSize().width;
640-
int marginBetweenRoot = xRoot - xLeftElement + widthLeftElement;
640+
int marginBetweenRoot = xRoot - (xLeftElement + widthLeftElement);
641641
if (marginBetweenRoot < minMargin || marginBetweenRoot > maxMargin) {
642642
putJsonDetailsWithElement(String.format("Left element aligned not properly. Expected margin should be between %spx and %spx. Actual margin is %spx", minMargin, maxMargin, marginBetweenRoot), leftElement);
643643
}

0 commit comments

Comments
 (0)