Skip to content

Commit b39653e

Browse files
KMariuszKMariusz
committed
Version 2023.03.09: Adapt downloading web driver bonigarcia/webdrivermanager#744 
1 parent 414d402 commit b39653e

File tree

12 files changed

+42
-75
lines changed

12 files changed

+42
-75
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.08</version>
9+
<version>2023.03.09</version>
1010
</parent>
1111

1212
<artifactId>mrchecker-cli-module</artifactId>
13-
<version>2023.03.08</version>
13+
<version>2023.03.09</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.08</version>
63+
<version>2023.03.09</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.08</version>
10+
<version>2023.03.09</version>
1111
</parent>
1212

1313
<artifactId>mrchecker-core-module</artifactId>
14-
<version>2023.03.08</version>
14+
<version>2023.03.09</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.08</version>
9+
<version>2023.03.09</version>
1010
</parent>
1111

1212
<artifactId>mrchecker-database-module</artifactId>
13-
<version>2023.03.08</version>
13+
<version>2023.03.09</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.08</version>
83+
<version>2023.03.09</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.08</version>
10+
<version>2023.03.09</version>
1111
</parent>
1212

1313
<artifactId>mrchecker-mobile-module</artifactId>
14-
<version>2023.03.08</version>
14+
<version>2023.03.09</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.08</version>
55+
<version>2023.03.09</version>
5656
</dependency>
5757
<dependency>
5858
<groupId>${project.groupId}</groupId>
5959
<artifactId>mrchecker-selenium-module</artifactId>
60-
<version>2023.03.08</version>
60+
<version>2023.03.09</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.08</version>
10+
<version>2023.03.09</version>
1111
</parent>
1212

1313
<artifactId>mrchecker-playwright-module</artifactId>
14-
<version>2023.03.08</version>
14+
<version>2023.03.09</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.08</version>
71+
<version>2023.03.09</version>
7272
</dependency>
7373

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

‎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.08</version>
10+
<version>2023.03.09</version>
1111
</parent>
1212

1313
<artifactId>mrchecker-security-module</artifactId>
14-
<version>2023.03.08</version>
14+
<version>2023.03.09</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.08</version>
66+
<version>2023.03.09</version>
6767
</dependency>
6868

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

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

Lines changed: 8 additions & 5 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.08</version>
10+
<version>2023.03.09</version>
1111
</parent>
1212

1313
<artifactId>mrchecker-selenium-module</artifactId>
14-
<version>2023.03.08</version>
14+
<version>2023.03.09</version>
1515
<packaging>jar</packaging>
1616
<name>MrChecker - Selenium - Module</name>
1717
<description>MrChecker Test Framework Selenium supports:
@@ -82,6 +82,9 @@
8282

8383
<!-- Guava is a set of core libraries -->
8484
<google.guava.version>31.1-jre</google.guava.version>
85+
86+
<webdrivermanager.version>5.3.2</webdrivermanager.version>
87+
<google-api-client.version>2.2.0</google-api-client.version>
8588
</properties>
8689

8790
<dependencies>
@@ -98,7 +101,7 @@
98101
<dependency>
99102
<groupId>${project.groupId}</groupId>
100103
<artifactId>mrchecker-core-module</artifactId>
101-
<version>2023.03.08</version>
104+
<version>2023.03.09</version>
102105
</dependency>
103106

104107
<!--This dependency is necessary for Selenium plugin. -->
@@ -111,14 +114,14 @@
111114
<dependency>
112115
<groupId>com.google.api-client</groupId>
113116
<artifactId>google-api-client</artifactId>
114-
<version>2.2.0</version>
117+
<version>${google-api-client.version}</version>
115118
</dependency>
116119

117120
<!-- For auto-download the newest version of web drivers -->
118121
<dependency>
119122
<groupId>io.github.bonigarcia</groupId>
120123
<artifactId>webdrivermanager</artifactId>
121-
<version>5.3.2</version>
124+
<version>${webdrivermanager.version}</version>
122125
</dependency>
123126
</dependencies>
124127

‎mrchecker-framework-modules/mrchecker-selenium-module/src/main/java/com/capgemini/mrchecker/selenium/core/base/properties/PropertiesSelenium.java‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.google.inject.name.Named;
55

66
public class PropertiesSelenium {
7-
private String webDrivers = "./lib/webdrivers";
7+
private final String webDrivers = "./lib/webdrivers";
88
private String seleniumChrome = webDrivers + "/chrome/chromedriver.exe";
99
private String driverVersionChrome = "";
1010
private String seleniumEdge = webDrivers + "/edge/msedgedriver.exe";
@@ -13,7 +13,6 @@ public class PropertiesSelenium {
1313
private String driverVersionFirefox = "";
1414
private String seleniumIE = webDrivers + "/internetexplorer/IEDriverServer.exe";
1515
private String driverVersionIE = "";
16-
private String proxy = "";
1716
private boolean driverAutoUpdateFlag = true;
1817

1918
@Inject(optional = true)
@@ -56,26 +55,6 @@ public String getSeleniumIE() {
5655
return seleniumIE;
5756
}
5857

59-
@Inject(optional = true)
60-
@SuppressWarnings("unused")
61-
private void setWebDrivers(@Named("selenium.webdrivers") String path) {
62-
webDrivers = path;
63-
}
64-
65-
public String getWebDrivers() {
66-
return webDrivers;
67-
}
68-
69-
@Inject(optional = true)
70-
@SuppressWarnings("unused")
71-
private void setProxy(@Named("selenium.proxy") String path) {
72-
proxy = path;
73-
}
74-
75-
public String getProxy() {
76-
return proxy;
77-
}
78-
7958
@Inject(optional = true)
8059
@SuppressWarnings("unused")
8160
private void setDriverAutoUpdateFlag(@Named("selenium.driverAutoUpdate") boolean flag) {

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

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -171,18 +171,13 @@ public INewWebDriver getDriver() {
171171
protected abstract INewWebDriver getDriver();
172172
}
173173

174-
private static <T extends RemoteWebDriver> void downloadNewestOrGivenVersionOfWebDriver(Class<T> webDriverType) {
175-
String proxy = DriverManager.propertiesSelenium.getProxy();
176-
String webDriversPath = DriverManager.propertiesSelenium.getWebDrivers();
174+
private static <T extends RemoteWebDriver> void downloadNewestOrGivenVersionOfWebDriver(Class<T> webDriverType, String browserPath) {
177175
try {
178-
System.setProperty("wdm.targetPath", webDriversPath);
179-
System.setProperty("wdm.useBetaVersions", "false");
180-
181-
WebDriverManager.getInstance(webDriverType)
182-
.proxy(proxy)
183-
.setup();
184-
BFLogger.logDebug("Downloaded version of driver=" + WebDriverManager.getInstance(webDriverType).getDownloadedDriverVersion());
185-
176+
WebDriverManager wdm = WebDriverManager.getInstance(webDriverType);
177+
wdm.config().setUseBetaVersions(false).setClearDriverCache(true).setCachePath(DOWNLOAD_DIR);
178+
wdm.setup();
179+
BFLogger.logDebug("Downloaded version of driver=" + wdm.getDownloadedDriverVersion());
180+
OperationsOnFiles.moveWithPruneEmptydirectories(wdm.getDownloadedDriverPath(), browserPath);
186181
} catch (WebDriverManagerException e) {
187182
BFLogger.logError("Unable to download driver automatically. "
188183
+ "Please try to set up the proxy in properties file. "
@@ -293,8 +288,7 @@ private static INewWebDriver getChromeDriver(ChromeOptions chromeOptions) {
293288
if (!DriverManager.propertiesSelenium.getChromeDriverVersion().isEmpty()) {
294289
System.setProperty("wdm.chromeDriverVersion", DriverManager.propertiesSelenium.getChromeDriverVersion());
295290
}
296-
downloadNewestOrGivenVersionOfWebDriver(ChromeDriver.class);
297-
OperationsOnFiles.moveWithPruneEmptydirectories(WebDriverManager.getInstance(ChromeDriver.class).getDownloadedDriverPath(), browserPath);
291+
downloadNewestOrGivenVersionOfWebDriver(ChromeDriver.class, browserPath);
298292
}
299293
driverDownloadedChrome = true;
300294
}
@@ -314,8 +308,7 @@ private static INewWebDriver getEdgeDriver(EdgeOptions edgeOptions) {
314308
if (!DriverManager.propertiesSelenium.getEdgeDriverVersion().isEmpty()) {
315309
System.setProperty("wdm.edgeVersion", DriverManager.propertiesSelenium.getEdgeDriverVersion());
316310
}
317-
downloadNewestOrGivenVersionOfWebDriver(EdgeDriver.class);
318-
OperationsOnFiles.moveWithPruneEmptydirectories(WebDriverManager.getInstance(EdgeDriver.class).getDownloadedDriverPath(), browserPath);
311+
downloadNewestOrGivenVersionOfWebDriver(EdgeDriver.class, browserPath);
319312
}
320313
driverDownloadedMicrosoftEdge = true;
321314
}
@@ -335,8 +328,7 @@ private static INewWebDriver getFirefoxDriver(FirefoxOptions firefoxOptions) {
335328
if (!DriverManager.propertiesSelenium.getGeckoDriverVersion().isEmpty()) {
336329
System.setProperty("wdm.geckoDriverVersion", DriverManager.propertiesSelenium.getGeckoDriverVersion());
337330
}
338-
downloadNewestOrGivenVersionOfWebDriver(FirefoxDriver.class);
339-
OperationsOnFiles.moveWithPruneEmptydirectories(WebDriverManager.getInstance(FirefoxDriver.class).getDownloadedDriverPath(), browserPath);
331+
downloadNewestOrGivenVersionOfWebDriver(FirefoxDriver.class, browserPath);
340332
}
341333
driverDownloadedFirefox = true;
342334
}
@@ -358,9 +350,7 @@ private static INewWebDriver getInternetExplorerDriver(InternetExplorerOptions i
358350
.equals("")) {
359351
System.setProperty("wdm.internetExplorerDriverVersion", DriverManager.propertiesSelenium.getInternetExplorerDriverVersion());
360352
}
361-
downloadNewestOrGivenVersionOfWebDriver(InternetExplorerDriver.class);
362-
OperationsOnFiles.moveWithPruneEmptydirectories(WebDriverManager.getInstance(InternetExplorerDriver.class).getDownloadedDriverPath()
363-
, browserPath);
353+
downloadNewestOrGivenVersionOfWebDriver(InternetExplorerDriver.class, browserPath);
364354
}
365355
driverDownloadedInternetExplorer = true;
366356
}

‎mrchecker-framework-modules/mrchecker-selenium-module/src/resources/settings.properties‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@ selenium.chrome=./lib/webdrivers/chrome/chromedriver.exe
22
selenium.firefox=./lib/webdrivers/firefox/geckodriver.exe
33
selenium.ie=./lib/webdrivers/internetexplorer/IEDriverServer.exe
44
selenium.edge=./lib/webdrivers/edge/msedgedriver.exe
5-
selenium.opera=./lib/webdrivers/opera/operadriver.exe
6-
selenium.webdrivers=./lib/webdrivers
7-
selenium.proxy=
85
selenium.driverAutoUpdate=true
96
wdm.chromeDriverVersion=83.0.4103.39
107
wdm.internetExplorerDriverVersion=
118
wdm.geckoDriverVersion=
12-
wdm.edgeVersion=
13-
wdm.edgeFeatureOnDemand=true
14-
wdm.operaDriverVersion=
9+
wdm.edgeVersion=

0 commit comments

Comments
 (0)