[bazel] More tests passing in the EngFlow grid

shs96c · shs96c · commit edb838bcd36c · 2023-05-23T18:48:00.000+01:00
diff --git a/java/test/org/openqa/selenium/bidi/browsingcontext/BrowsingContextTest.java b/java/test/org/openqa/selenium/bidi/browsingcontext/BrowsingContextTest.java
@@ -25,24 +25,24 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WindowType;
 import org.openqa.selenium.bidi.BiDiException;
 import org.openqa.selenium.environment.webserver.AppServer;
 import org.openqa.selenium.environment.webserver.NettyAppServer;
-import org.openqa.selenium.firefox.FirefoxDriver;
-import org.openqa.selenium.firefox.FirefoxOptions;
+import org.openqa.selenium.testing.NeedsFreshDriver;
+import org.openqa.selenium.testing.SeleniumExtension;
 
 class BrowsingContextTest {
 
+  @RegisterExtension static SeleniumExtension seleniumExtension = new SeleniumExtension();
   private AppServer server;
-  private FirefoxDriver driver;
+  private WebDriver driver;
 
   @BeforeEach
   public void setUp() {
-    FirefoxOptions options = new FirefoxOptions();
-    options.setCapability("webSocketUrl", true);
-
-    driver = new FirefoxDriver(options);
+    driver = seleniumExtension.getDriver();
 
     server = new NettyAppServer();
     server.start();
@@ -141,6 +141,7 @@ void canGetTreeWithDepth() {
   }
 
   @Test
+  @NeedsFreshDriver
   void canGetAllTopLevelContexts() {
     BrowsingContext window1 = new BrowsingContext(driver, driver.getWindowHandle());
     BrowsingContext window2 = new BrowsingContext(driver, WindowType.WINDOW);
@@ -175,9 +176,6 @@ void canCloseATab() {
 
   @AfterEach
   public void quitDriver() {
-    if (driver != null) {
-      driver.quit();
-    }
-    safelyCall(server::stop);
+    safelyCall(seleniumExtension::removeDriver, server::stop);
   }
 }
diff --git a/java/test/org/openqa/selenium/bidi/log/LogInspectorTest.java b/java/test/org/openqa/selenium/bidi/log/LogInspectorTest.java
@@ -33,26 +33,26 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WindowType;
 import org.openqa.selenium.bidi.LogInspector;
 import org.openqa.selenium.environment.webserver.AppServer;
 import org.openqa.selenium.environment.webserver.NettyAppServer;
-import org.openqa.selenium.firefox.FirefoxDriver;
-import org.openqa.selenium.firefox.FirefoxOptions;
+import org.openqa.selenium.testing.NeedsFreshDriver;
+import org.openqa.selenium.testing.SeleniumExtension;
 
 class LogInspectorTest {
 
+  @RegisterExtension static SeleniumExtension seleniumExtension = new SeleniumExtension();
   String page;
   private AppServer server;
-  private FirefoxDriver driver;
+  private WebDriver driver;
 
   @BeforeEach
   public void setUp() {
-    FirefoxOptions options = new FirefoxOptions();
-    options.setCapability("webSocketUrl", true);
-
-    driver = new FirefoxDriver(options);
+    driver = seleniumExtension.getDriver();
 
     server = new NettyAppServer();
     server.start();
@@ -188,6 +188,7 @@ void canListenToJavascriptErrorLog()
   }
 
   @Test
+  @NeedsFreshDriver
   void canRetrieveStacktraceForALog()
       throws ExecutionException, InterruptedException, TimeoutException {
     try (LogInspector logInspector = new LogInspector(driver)) {
@@ -478,9 +479,6 @@ void canListenToLogsWithMultipleConsumers()
 
   @AfterEach
   public void quitDriver() {
-    if (driver != null) {
-      driver.quit();
-    }
-    safelyCall(server::stop);
+    safelyCall(seleniumExtension::removeDriver, server::stop);
   }
 }
diff --git a/java/test/org/openqa/selenium/testing/drivers/Browser.java b/java/test/org/openqa/selenium/testing/drivers/Browser.java
@@ -129,6 +129,8 @@ public Capabilities getCapabilities() {
         options.addArguments("-headless");
       }
 
+      options.setCapability("webSocketUrl", true);
+
       return options;
     }
   },

Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,8 @@ public Capabilities getCapabilities() {`
`129`	`129`	`options.addArguments("-headless");`
`130`	`130`	`}`
`131`	`131`
	`132`	`+ options.setCapability("webSocketUrl", true);`
	`133`	`+`
`132`	`134`	`return options;`
`133`	`135`	`}`
`134`	`136`	`},`