Skip to content

Commit d2c717f

Browse files
KMariuszKMariusz
committed
Version 2023.03.07: Handle all throwable on BasicElement usability check
1 parent 70abb05 commit d2c717f

File tree

11 files changed

+41
-29
lines changed

11 files changed

+41
-29
lines changed

‎mrchecker-framework-modules/mrchecker-cli-module/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<parent>
77
<artifactId>mrchecker-test-framework</artifactId>
88
<groupId>com.capgemini.mrchecker</groupId>
9-
<version>2023.03.06</version>
9+
<version>2023.03.07</version>
1010
</parent>
1111

1212
<artifactId>mrchecker-cli-module</artifactId>
13-
<version>2023.03.06</version>
13+
<version>2023.03.07</version>
1414
<packaging>jar</packaging>
1515
<name>MrChecker - CLI - Module</name>
1616
<description>MrChecker CLI Module supports:
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>${project.groupId}</groupId>
6262
<artifactId>mrchecker-core-module</artifactId>
63-
<version>2023.03.06</version>
63+
<version>2023.03.07</version>
6464
</dependency>
6565
</dependencies>
6666

‎mrchecker-framework-modules/mrchecker-core-module/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<artifactId>mrchecker-test-framework</artifactId>
99
<groupId>com.capgemini.mrchecker</groupId>
10-
<version>2023.03.06</version>
10+
<version>2023.03.07</version>
1111
</parent>
1212

1313
<artifactId>mrchecker-core-module</artifactId>
14-
<version>2023.03.06</version>
14+
<version>2023.03.07</version>
1515
<packaging>jar</packaging>
1616
<name>MrChecker - Test core - Module</name>
1717
<description>MrChecker Test Framework Core is responsible for:

‎mrchecker-framework-modules/mrchecker-database-module/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<parent>
77
<artifactId>mrchecker-test-framework</artifactId>
88
<groupId>com.capgemini.mrchecker</groupId>
9-
<version>2023.03.06</version>
9+
<version>2023.03.07</version>
1010
</parent>
1111

1212
<artifactId>mrchecker-database-module</artifactId>
13-
<version>2023.03.06</version>
13+
<version>2023.03.07</version>
1414
<packaging>jar</packaging>
1515
<name>MrChecker - Database - Module</name>
1616
<description>MrChecker Database Module:
@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>${project.groupId}</groupId>
8282
<artifactId>mrchecker-core-module</artifactId>
83-
<version>2023.03.06</version>
83+
<version>2023.03.07</version>
8484
</dependency>
8585

8686
<!-- JPA dependencies -->

‎mrchecker-framework-modules/mrchecker-mobile-module/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<artifactId>mrchecker-test-framework</artifactId>
99
<groupId>com.capgemini.mrchecker</groupId>
10-
<version>2023.03.06</version>
10+
<version>2023.03.07</version>
1111
</parent>
1212

1313
<artifactId>mrchecker-mobile-module</artifactId>
14-
<version>2023.03.06</version>
14+
<version>2023.03.07</version>
1515
<packaging>jar</packaging>
1616
<name>MrChecker - Mobile - Module</name>
1717
<description>MrChecker Test Framework name supports:
@@ -52,12 +52,12 @@
5252
<dependency>
5353
<groupId>${project.groupId}</groupId>
5454
<artifactId>mrchecker-core-module</artifactId>
55-
<version>2023.03.06</version>
55+
<version>2023.03.07</version>
5656
</dependency>
5757
<dependency>
5858
<groupId>${project.groupId}</groupId>
5959
<artifactId>mrchecker-selenium-module</artifactId>
60-
<version>2023.03.06</version>
60+
<version>2023.03.07</version>
6161
</dependency>
6262

6363
<!--This dependency is necessary for Appium plugin. -->

‎mrchecker-framework-modules/mrchecker-playwright-module/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<artifactId>mrchecker-test-framework</artifactId>
99
<groupId>com.capgemini.mrchecker</groupId>
10-
<version>2023.03.06</version>
10+
<version>2023.03.07</version>
1111
</parent>
1212

1313
<artifactId>mrchecker-playwright-module</artifactId>
14-
<version>2023.03.06</version>
14+
<version>2023.03.07</version>
1515
<packaging>jar</packaging>
1616
<name>MrChecker - Playwright - Module</name>
1717
<description>MrChecker Test Framework Playwright</description>
@@ -68,7 +68,7 @@
6868
<dependency>
6969
<groupId>${project.groupId}</groupId>
7070
<artifactId>mrchecker-core-module</artifactId>
71-
<version>2023.03.06</version>
71+
<version>2023.03.07</version>
7272
</dependency>
7373

7474
<!--This dependency is necessary for Playwright plugin. -->

‎mrchecker-framework-modules/mrchecker-playwright-module/src/main/java/com/capgemini/mrchecker/playwright/core/newDrivers/elementType/BasicElement.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,22 @@ public String getElementTypeName() {
3333
return getElementType().getName();
3434
}
3535

36+
private boolean checkLocator() {
37+
if (Objects.isNull(locator)) {
38+
return false;
39+
}
40+
try {
41+
// Calling any method forces a locator check
42+
locator.isEnabled();
43+
return true;
44+
} catch (Throwable throwable) {
45+
return false;
46+
}
47+
}
48+
3649
@Override
3750
public Locator getLocator() {
38-
if (Objects.isNull(locator)) {
51+
if (!checkLocator()) {
3952
locator = BasePage.getDriver().currentPage().locator(getSelector());
4053
}
4154
return locator;

‎mrchecker-framework-modules/mrchecker-security-module/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<artifactId>mrchecker-test-framework</artifactId>
99
<groupId>com.capgemini.mrchecker</groupId>
10-
<version>2023.03.06</version>
10+
<version>2023.03.07</version>
1111
</parent>
1212

1313
<artifactId>mrchecker-security-module</artifactId>
14-
<version>2023.03.06</version>
14+
<version>2023.03.07</version>
1515
<packaging>jar</packaging>
1616
<name>MrChecker - Security - Module</name>
1717
<description>MrChecker Test Framework Security supports:
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>${project.groupId}</groupId>
6565
<artifactId>mrchecker-core-module</artifactId>
66-
<version>2023.03.06</version>
66+
<version>2023.03.07</version>
6767
</dependency>
6868

6969
<!-- Needed to perform all API calls -->

‎mrchecker-framework-modules/mrchecker-selenium-module/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<artifactId>mrchecker-test-framework</artifactId>
99
<groupId>com.capgemini.mrchecker</groupId>
10-
<version>2023.03.06</version>
10+
<version>2023.03.07</version>
1111
</parent>
1212

1313
<artifactId>mrchecker-selenium-module</artifactId>
14-
<version>2023.03.06</version>
14+
<version>2023.03.07</version>
1515
<packaging>jar</packaging>
1616
<name>MrChecker - Selenium - Module</name>
1717
<description>MrChecker Test Framework Selenium supports:
@@ -98,7 +98,7 @@
9898
<dependency>
9999
<groupId>${project.groupId}</groupId>
100100
<artifactId>mrchecker-core-module</artifactId>
101-
<version>2023.03.06</version>
101+
<version>2023.03.07</version>
102102
</dependency>
103103

104104
<!--This dependency is necessary for Selenium plugin. -->

‎mrchecker-framework-modules/mrchecker-selenium-module/src/main/java/com/capgemini/mrchecker/selenium/core/newDrivers/elementType/BasicElement.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.capgemini.mrchecker.selenium.core.exceptions.BFElementNotFoundException;
55
import com.capgemini.mrchecker.selenium.core.utils.ScrollUtils;
66
import org.openqa.selenium.By;
7-
import org.openqa.selenium.StaleElementReferenceException;
87
import org.openqa.selenium.WebElement;
98

109
import java.util.List;
@@ -43,10 +42,10 @@ private boolean checkWebElement() {
4342
return false;
4443
}
4544
try {
46-
// Calling any method forces a staleness check
45+
// Calling any method forces a WebElement check
4746
webElement.isEnabled();
4847
return true;
49-
} catch (StaleElementReferenceException expected) {
48+
} catch (Throwable throwable) {
5049
return false;
5150
}
5251
}

‎mrchecker-framework-modules/mrchecker-webapi-module/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<artifactId>mrchecker-test-framework</artifactId>
99
<groupId>com.capgemini.mrchecker</groupId>
10-
<version>2023.03.06</version>
10+
<version>2023.03.07</version>
1111
</parent>
1212

1313
<artifactId>mrchecker-webapi-module</artifactId>
14-
<version>2023.03.06</version>
14+
<version>2023.03.07</version>
1515
<packaging>jar</packaging>
1616
<name>MrChecker - WebApi - Module</name>
1717
<description>
@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>${project.groupId}</groupId>
8282
<artifactId>mrchecker-core-module</artifactId>
83-
<version>2023.03.06</version>
83+
<version>2023.03.07</version>
8484
</dependency>
8585

8686
<!-- Dependency to REST and SOAP lib -->

0 commit comments

Comments
 (0)