[java] add some timeouts and logging

SeleniumHQ · Jan 8, 2024 · ce0a19e · ce0a19e
1 parent e1e538e
commit ce0a19e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/java/test/org/openqa/selenium/chrome/ChromeDriverFunctionalTest.java b/java/test/org/openqa/selenium/chrome/ChromeDriverFunctionalTest.java
@@ -30,6 +30,7 @@
 import java.util.Map;
 import org.assertj.core.api.Assumptions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.SessionNotCreatedException;
@@ -52,6 +53,7 @@ class ChromeDriverFunctionalTest extends JupiterTestBase {
   private final String CLIPBOARD_WRITE = "clipboard-write";
 
   @Test
+  @Timeout(120)
   @NoDriverBeforeTest
   public void builderGeneratesDefaultChromeOptions() {
     // This test won't pass if we want to use Chrome in a non-standard location
@@ -65,6 +67,7 @@ public void builderGeneratesDefaultChromeOptions() {
   }
 
   @Test
+  @Timeout(120)
   @NoDriverBeforeTest
   public void builderOverridesDefaultChromeOptions() {
     ChromeOptions options = (ChromeOptions) CHROME.getCapabilities();
@@ -75,6 +78,7 @@ public void builderOverridesDefaultChromeOptions() {
   }
 
   @Test
+  @Timeout(120)
   @NoDriverBeforeTest
   public void driverOverridesDefaultClientConfig() {
     assertThatThrownBy(
@@ -91,6 +95,7 @@ public void driverOverridesDefaultClientConfig() {
   }
 
   @Test
+  @Timeout(120)
   void builderWithClientConfigThrowsException() {
     ClientConfig clientConfig = ClientConfig.defaultConfig().readTimeout(Duration.ofMinutes(1));
     RemoteWebDriverBuilder builder =
@@ -102,6 +107,7 @@ void builderWithClientConfigThrowsException() {
   }
 
   @Test
+  @Timeout(120)
   @Ignore(value = CHROME, reason = "https://bugs.chromium.org/p/chromedriver/issues/detail?id=4350")
   void canSetPermission() {
     HasPermissions permissions = (HasPermissions) driver;
@@ -132,6 +138,7 @@ public String checkPermission(WebDriver driver, String permission) {
   }
 
   @Test
+  @Timeout(120)
   @Ignore(gitHubActions = true)
   void canCast() {
     HasCasting caster = (HasCasting) driver;
@@ -151,6 +158,7 @@ void canCast() {
   }
 
   @Test
+  @Timeout(120)
   @Ignore(gitHubActions = true)
   public void canCastOnDesktop() {
     HasCasting caster = (HasCasting) driver;
@@ -170,6 +178,7 @@ public void canCastOnDesktop() {
   }
 
   @Test
+  @Timeout(120)
   void canManageNetworkConditions() {
     HasNetworkConditions conditions = (HasNetworkConditions) driver;
 
@@ -192,6 +201,7 @@ void canManageNetworkConditions() {
   }
 
   @Test
+  @Timeout(120)
   void canExecuteCdpCommands() {
     HasCdp cdp = (HasCdp) driver;
 

diff --git a/java/test/org/openqa/selenium/testing/JupiterTestBase.java b/java/test/org/openqa/selenium/testing/JupiterTestBase.java
@@ -22,9 +22,11 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.time.Duration;
+import java.util.logging.Logger;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriver;
@@ -37,6 +39,7 @@
 
 public abstract class JupiterTestBase {
 
+  private static final Logger LOG = Logger.getLogger(JupiterTestBase.class.getName());
   @RegisterExtension protected static SeleniumExtension seleniumExtension = new SeleniumExtension();
 
   protected TestEnvironment environment;
@@ -53,7 +56,7 @@ public static void shouldTestBeRunAtAll() {
   }
 
   @BeforeEach
-  public void prepareEnvironment() {
+  public void prepareEnvironment(TestInfo info) {
     environment = GlobalTestEnvironment.getOrCreate(InProcessTestEnvironment::new);
     appServer = environment.getAppServer();
 
@@ -62,10 +65,12 @@ public void prepareEnvironment() {
     driver = seleniumExtension.getDriver();
     wait = seleniumExtension::waitUntil;
     shortWait = seleniumExtension::shortWaitUntil;
+    LOG.info("start test: " + info.getDisplayName());
   }
 
   @AfterEach
-  public void quitLocalDriver() {
+  public void quitLocalDriver(TestInfo info) {
+    LOG.info("done with test: " + info.getDisplayName());
     if (localDriver != null) {
       localDriver.quit();
     }