From 7140e793bedaea77550693b9a8ce25dd21cffa66 Mon Sep 17 00:00:00 2001 From: Tobias Adler Date: Mon, 15 Jul 2024 08:48:40 +0200 Subject: [PATCH 1/4] Fixed null check for systemProxyUrl --- build.gradle | 2 +- .../tsystems/mms/tic/testframework/utils/ProxyUtils.java | 4 ++-- .../webdrivermanager/WebDriverProxyUtils.java | 9 +++++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 32e8a67cd..c3f1d5942 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ ext { core = project(':core') report = project(':report-ng') - seleniumVersion = '4.21.0' + seleniumVersion = '4.21.0' // TODO: Update to Selenium 4.23.0 to fix the local webdriver proxy issue: https://github.com/SeleniumHQ/selenium/issues/14162 // Must be the same like in Selenium 4 guavaVersion = "33.0.0-jre" diff --git a/core/src/main/java/eu/tsystems/mms/tic/testframework/utils/ProxyUtils.java b/core/src/main/java/eu/tsystems/mms/tic/testframework/utils/ProxyUtils.java index 33da67f7b..afa1bc1af 100644 --- a/core/src/main/java/eu/tsystems/mms/tic/testframework/utils/ProxyUtils.java +++ b/core/src/main/java/eu/tsystems/mms/tic/testframework/utils/ProxyUtils.java @@ -59,14 +59,14 @@ private static String getSpecificProxyTypeString(final String proxyType) { String proxyString = ""; final String proxyHost = PROPERTY_MANAGER.getProperty(proxyType + ".proxyHost"); - if (proxyHost != null) { + if (StringUtils.isNotBlank(proxyHost)) { proxyString += proxyHost; } else { return null; } final String proxyPort = PROPERTY_MANAGER.getProperty(proxyType + ".proxyPort"); - if (proxyPort != null) { + if (StringUtils.isNotBlank(proxyHost)) { proxyString += ":" + proxyPort; } diff --git a/driver-ui/src/main/java/eu/tsystems/mms/tic/testframework/webdrivermanager/WebDriverProxyUtils.java b/driver-ui/src/main/java/eu/tsystems/mms/tic/testframework/webdrivermanager/WebDriverProxyUtils.java index bfec15c56..cc5a616b5 100644 --- a/driver-ui/src/main/java/eu/tsystems/mms/tic/testframework/webdrivermanager/WebDriverProxyUtils.java +++ b/driver-ui/src/main/java/eu/tsystems/mms/tic/testframework/webdrivermanager/WebDriverProxyUtils.java @@ -57,7 +57,7 @@ private String toProxyString(final URL proxyUrl) { } /** - * @return Proxy based on an URL including socks proxy settings + * @return Proxy based on a URL including socks proxy settings */ public Proxy createSocksProxyFromUrl(URL url) { Proxy proxy = createHttpProxyFromUrl(url); @@ -76,7 +76,7 @@ public Proxy createSocksProxyFromUrl(URL url) { } /** - * @return Proxy based on an URL without socks proxy settings + * @return Proxy based on a URL without socks proxy settings */ public Proxy createHttpProxyFromUrl(URL url) { String proxyString = toProxyString(url); @@ -103,6 +103,11 @@ public Proxy getDefaultHttpProxy() { if (systemProxyUrl == null) { systemProxyUrl = ProxyUtils.getSystemHttpProxyUrl(); } + if (systemProxyUrl == null) { + Proxy proxy = new Proxy(); + proxy.setProxyType(Proxy.ProxyType.AUTODETECT); + return proxy; + } Proxy proxy = createHttpProxyFromUrl(systemProxyUrl); proxy.setNoProxy(PropertyManager.getProperty("https.nonProxyHosts")); return proxy; From 40c6c1a5ecc4668d0c103a6d955f68ef9c567e72 Mon Sep 17 00:00:00 2001 From: Tobias Adler Date: Mon, 22 Jul 2024 07:47:05 +0200 Subject: [PATCH 2/4] Update to Selenium 4.23 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c3f1d5942..ed639c833 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ ext { core = project(':core') report = project(':report-ng') - seleniumVersion = '4.21.0' // TODO: Update to Selenium 4.23.0 to fix the local webdriver proxy issue: https://github.com/SeleniumHQ/selenium/issues/14162 + seleniumVersion = '4.23.0' // Must be the same like in Selenium 4 guavaVersion = "33.0.0-jre" From 9f4fd82e8115490cee357143601da86f02de393c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gro=C3=9Fmann?= Date: Tue, 30 Jul 2024 11:16:27 +0200 Subject: [PATCH 3/4] Updated devtools imports --- docs/src/docs/selenium4/selenium4-cdp.adoc | 8 ++++---- .../tic/testframework/testing/SeleniumChromeDevTools.java | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/src/docs/selenium4/selenium4-cdp.adoc b/docs/src/docs/selenium4/selenium4-cdp.adoc index b3ccc933e..033fec83b 100644 --- a/docs/src/docs/selenium4/selenium4-cdp.adoc +++ b/docs/src/docs/selenium4/selenium4-cdp.adoc @@ -170,7 +170,7 @@ public class ChromeDevToolsTests extends TesterraTest implements .'Broken' page resources [source, java] ---- -import org.openqa.selenium.devtools.v125.log.model.LogEntry; +import org.openqa.selenium.devtools.v127.log.model.LogEntry; ... public class ChromeDevToolsTests extends TesterraTest implements @@ -211,9 +211,9 @@ public class ChromeDevToolsTests extends TesterraTest implements [source, java] ---- -import org.openqa.selenium.devtools.v125.network.Network; -import org.openqa.selenium.devtools.v125.network.model.RequestWillBeSent; -import org.openqa.selenium.devtools.v125.network.model.ResponseReceived; +import org.openqa.selenium.devtools.v127.network.Network; +import org.openqa.selenium.devtools.v127.network.model.RequestWillBeSent; +import org.openqa.selenium.devtools.v127.network.model.ResponseReceived; ... public class ChromeDevToolsTests extends TesterraTest implements diff --git a/driver-ui/src/main/java/eu/tsystems/mms/tic/testframework/testing/SeleniumChromeDevTools.java b/driver-ui/src/main/java/eu/tsystems/mms/tic/testframework/testing/SeleniumChromeDevTools.java index ae9f0ced9..ff5cdc916 100644 --- a/driver-ui/src/main/java/eu/tsystems/mms/tic/testframework/testing/SeleniumChromeDevTools.java +++ b/driver-ui/src/main/java/eu/tsystems/mms/tic/testframework/testing/SeleniumChromeDevTools.java @@ -28,10 +28,9 @@ import org.openqa.selenium.chrome.ChromeDriver; import org.openqa.selenium.devtools.DevTools; import org.openqa.selenium.devtools.HasDevTools; - -import org.openqa.selenium.devtools.v125.emulation.Emulation; -import org.openqa.selenium.devtools.v125.network.Network; -import org.openqa.selenium.devtools.v125.network.model.Headers; +import org.openqa.selenium.devtools.v127.emulation.Emulation; +import org.openqa.selenium.devtools.v127.network.Network; +import org.openqa.selenium.devtools.v127.network.model.Headers; import org.openqa.selenium.remote.Augmenter; import org.openqa.selenium.remote.RemoteWebDriver; From aacbf4108226b57d73d4ca08321378f8e8926438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gro=C3=9Fmann?= Date: Tue, 30 Jul 2024 11:17:08 +0200 Subject: [PATCH 4/4] Updated guava to the version used in Selenium 4.23 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ed639c833..ad9161a44 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ ext { seleniumVersion = '4.23.0' // Must be the same like in Selenium 4 - guavaVersion = "33.0.0-jre" + guavaVersion = "33.2.1-jre" moduleVersion = '2-SNAPSHOT' if (System.properties.containsKey('ttVersion')) {