From e4dd337edc7e8a6a6dc61c0cca443778e7264a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?U=C4=9EUR=20AK=C5=9EAH=C4=B0N?= Date: Thu, 20 Mar 2025 23:35:07 +0300 Subject: [PATCH 1/6] Update androidDexCompiler.xml --- .idea/androidDexCompiler.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.idea/androidDexCompiler.xml b/.idea/androidDexCompiler.xml index b28dce7dc34ad..ec54ed20bde02 100644 --- a/.idea/androidDexCompiler.xml +++ b/.idea/androidDexCompiler.xml @@ -1,7 +1,7 @@ - From ec50e60163ebe3b356a5a3af28276ef81fdeb625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?U=C4=9EUR=20AK=C5=9EAH=C4=B0N?= Date: Thu, 20 Mar 2025 23:39:00 +0300 Subject: [PATCH 2/6] Update compiler.xml --- .idea/compiler.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 8444a97ecdf2a..56ae915df35ac 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,7 +1,7 @@ - - - \ No newline at end of file + From 0988606b2922b0b992525caf66fec9526bb66d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?U=C4=9EUR=20AK=C5=9EAH=C4=B0N?= Date: Thu, 20 Mar 2025 23:48:54 +0300 Subject: [PATCH 3/6] Update AssemblyTeardown.cs --- dotnet/test/remote/AssemblyTeardown.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/dotnet/test/remote/AssemblyTeardown.cs b/dotnet/test/remote/AssemblyTeardown.cs index aca281e6ee801..8edd20db86a30 100644 --- a/dotnet/test/remote/AssemblyTeardown.cs +++ b/dotnet/test/remote/AssemblyTeardown.cs @@ -20,6 +20,7 @@ using NUnit.Framework; using OpenQA.Selenium.Environment; using System.Threading.Tasks; +using System; namespace OpenQA.Selenium.Remote { From 535ed66a746866daec272c7eec51427352155125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?U=C4=9EUR=20AK=C5=9EAH=C4=B0N?= Date: Fri, 21 Mar 2025 14:18:20 +0300 Subject: [PATCH 4/6] Update ChromeDriverFunctionalTest.java --- .../selenium/chrome/ChromeDriverFunctionalTest.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/java/test/org/openqa/selenium/chrome/ChromeDriverFunctionalTest.java b/java/test/org/openqa/selenium/chrome/ChromeDriverFunctionalTest.java index ce0d823408d00..2db687ae4c7ff 100644 --- a/java/test/org/openqa/selenium/chrome/ChromeDriverFunctionalTest.java +++ b/java/test/org/openqa/selenium/chrome/ChromeDriverFunctionalTest.java @@ -56,9 +56,16 @@ public void builderGeneratesDefaultChromeOptions() { // This test won't pass if we want to use Chrome in a non-standard location Assumptions.assumeThat(System.getProperty("webdriver.chrome.binary")).isNull(); - localDriver = ChromeDriver.builder().build(); - Capabilities capabilities = ((ChromeDriver) localDriver).getCapabilities(); + localDriver = initializeChromeDriver(); + assertDefaultChromeCapabilities((ChromeDriver) localDriver); + } + + private ChromeDriver initializeChromeDriver(){ + return ChromeDriver.builder().build(); + } + private void assertDefaultChromeCapabilities(ChromeDriver driver){ + Capabilities capabilities = driver.getCapabilities(); assertThat(localDriver.manage().timeouts().getImplicitWaitTimeout()).isEqualTo(Duration.ZERO); assertThat(capabilities.getCapability("browserName")).isEqualTo("chrome"); } From 23eccf21ef93e69019ea150f10b633698fb99ef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?U=C4=9EUR=20AK=C5=9EAH=C4=B0N?= Date: Fri, 21 Mar 2025 15:16:39 +0300 Subject: [PATCH 5/6] Update ExecutorServices.java --- .../selenium/concurrent/ExecutorServices.java | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/java/src/org/openqa/selenium/concurrent/ExecutorServices.java b/java/src/org/openqa/selenium/concurrent/ExecutorServices.java index 78b9cd8d942ef..73008fcb8f97a 100644 --- a/java/src/org/openqa/selenium/concurrent/ExecutorServices.java +++ b/java/src/org/openqa/selenium/concurrent/ExecutorServices.java @@ -1,4 +1,4 @@ -// Licensed to the Software Freedom Conservancy (SFC) under one + // Licensed to the Software Freedom Conservancy (SFC) under one // or more contributor license agreements. See the NOTICE file // distributed with this work for additional information // regarding copyright ownership. The SFC licenses this file @@ -26,18 +26,27 @@ public class ExecutorServices { private static final Logger LOG = Logger.getLogger(ExecutorServices.class.getName()); + private static final int DEFAULT_SHUTDOWN_TIMEOUT = 5; public static void shutdownGracefully(String name, ExecutorService service) { service.shutdown(); + if(!awaitTermination(name, service, DEFAULT_SHUTDOWN_TIMEOUT)){ + forceShutdown(name, service); + } + } + + private static boolean awaitTermination(String name, ExecutorService service, int timeoutSeconds){ + try { - if (!service.awaitTermination(5, SECONDS)) { - LOG.warning(String.format("Failed to shutdown %s", name)); - service.shutdownNow(); - } - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); + return service.awaitTermination(timeoutSeconds, SECONDS); + }catch(InterruptedException ex){ + Thread.currentThread().interrupt; LOG.log(WARNING, String.format("Failed to shutdown %s", name), e); - service.shutdownNow(); + return false; + + private static void forceShutDown(String name, ExecutorService, service){ + LOG.warning(String.format("Failed to shutdown %s", name), e); + service.shutdownNow(); + } } -} From a7b631551e4343df4ed5d343b143a6c66fd30af2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?U=C4=9EUR=20AK=C5=9EAH=C4=B0N?= Date: Sun, 23 Mar 2025 17:01:05 +0300 Subject: [PATCH 6/6] Update LocationContextTest.java --- .../openqa/selenium/html5/LocationContextTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/java/test/org/openqa/selenium/html5/LocationContextTest.java b/java/test/org/openqa/selenium/html5/LocationContextTest.java index c4ab2bccd2526..9b79fbb6de453 100644 --- a/java/test/org/openqa/selenium/html5/LocationContextTest.java +++ b/java/test/org/openqa/selenium/html5/LocationContextTest.java @@ -39,8 +39,8 @@ public void hasLocationContext() { void testShouldSetAndGetLatitude() { driver.get(pages.html5Page); - ((LocationContext) driver).setLocation(new Location(40.714353, -74.005973, 0.056747)); - Location location = ((LocationContext) driver).location(); + LocationContext locationContext = (LocationContext) driver; + Location location = setAndRetrieveLocation(locationContext, 40.714353, -74.005973, 0.056747); assertThat(location).isNotNull(); assertThat(location.getLatitude()).isCloseTo(40.714353, byLessThan(0.000001)); } @@ -49,8 +49,8 @@ void testShouldSetAndGetLatitude() { void testShouldSetAndGetLongitude() { driver.get(pages.html5Page); - ((LocationContext) driver).setLocation(new Location(40.714353, -74.005973, 0.056747)); - Location location = ((LocationContext) driver).location(); + LocationContext locationContext = (LocationContext) driver; + Location location = setAndRetrieveLocation(locationContext, 40.714353, -74.005973, 0.056747); assertThat(location).isNotNull(); assertThat(location.getLongitude()).isCloseTo(-74.005973, byLessThan(0.000001)); } @@ -60,9 +60,9 @@ void testShouldSetAndGetLongitude() { @NotYetImplemented(EDGE) public void testShouldSetAndGetAltitude() { driver.get(pages.html5Page); - - ((LocationContext) driver).setLocation(new Location(40.714353, -74.005973, 0.056747)); - Location location = ((LocationContext) driver).location(); + + LocationContext locationContext = (LocationContext) driver; + Location location = setAndRetrieveLocation(locationContext, 40.714353, -74.005973, 0.056747); assertThat(location).isNotNull(); assertThat(location.getAltitude()).isCloseTo(0.056747, byLessThan(0.000001)); }