[java] Ignoring devtools tests in Firefox versions less than 83

barancev · barancev · commit 80beef765bf1 · 2021-02-07T00:00:52.000+03:00
diff --git a/java/client/test/org/openqa/selenium/devtools/DevToolsTestBase.java b/java/client/test/org/openqa/selenium/devtools/DevToolsTestBase.java
@@ -18,18 +18,19 @@
 package org.openqa.selenium.devtools;
 
 import static org.assertj.core.api.Assumptions.assumeThat;
+import static org.openqa.selenium.testing.TestUtilities.isFirefoxVersionNotLessThan;
 
 import org.junit.Before;
 import org.openqa.selenium.testing.JUnit4TestBase;
 
-
 public abstract class DevToolsTestBase extends JUnit4TestBase {
 
   protected DevTools devTools;
 
   @Before
   public void setUp() {
     assumeThat(driver).isInstanceOf(HasDevTools.class);
+    assumeThat(isFirefoxVersionNotLessThan(83, driver)).isTrue();
 
     devTools = ((HasDevTools) driver).getDevTools();
     devTools.createSessionIfThereIsNotOne();
diff --git a/java/client/test/org/openqa/selenium/html5/Html5CapabilitiesTest.java b/java/client/test/org/openqa/selenium/html5/Html5CapabilitiesTest.java
@@ -53,7 +53,6 @@ public class Html5CapabilitiesTest extends JUnit4TestBase {
   public void avoidRemote() {
     // TODO: Resolve why these tests don't work on the remote server
     assumeTrue(TestUtilities.isLocal());
-    assumeTrue(TestUtilities.getFirefoxVersion(driver) >= 12);
   }
 
   @Test
diff --git a/java/client/test/org/openqa/selenium/support/devtools/NetworkInterceptorTest.java b/java/client/test/org/openqa/selenium/support/devtools/NetworkInterceptorTest.java
@@ -38,6 +38,7 @@
 import static org.assertj.core.api.Assumptions.assumeThat;
 import static org.openqa.selenium.remote.http.Contents.utf8String;
 import static org.openqa.selenium.testing.Safely.safelyCall;
+import static org.openqa.selenium.testing.TestUtilities.isFirefoxVersionNotLessThan;
 
 public class NetworkInterceptorTest {
 
@@ -52,15 +53,16 @@ public static void shouldTestBeRunAtAll() {
   
   @Before
   public void setup() {
-    appServer = new NettyAppServer(req -> new HttpResponse()
-        .setStatus(200)
-        .addHeader("Content-Type", MediaType.XHTML_UTF_8.toString())
-        .setContent(utf8String("<html><head><title>Hello, World!</title></head><body/></html>")));
-    appServer.start();
-
     driver = new WebDriverBuilder().get();
 
     assumeThat(driver).isInstanceOf(HasDevTools.class);
+    assumeThat(isFirefoxVersionNotLessThan(83, driver)).isTrue();
+
+    appServer = new NettyAppServer(req -> new HttpResponse()
+      .setStatus(200)
+      .addHeader("Content-Type", MediaType.XHTML_UTF_8.toString())
+      .setContent(utf8String("<html><head><title>Hello, World!</title></head><body/></html>")));
+    appServer.start();
   }
 
   @After
diff --git a/java/client/test/org/openqa/selenium/testing/TestUtilities.java b/java/client/test/org/openqa/selenium/testing/TestUtilities.java
@@ -60,6 +60,10 @@ public static boolean isFirefox(WebDriver driver) {
     return getUserAgent(driver).contains("Firefox");
   }
 
+  public static boolean isFirefoxVersionNotLessThan(int version, WebDriver driver) {
+    return isFirefox(driver) && getFirefoxVersion(driver) >= version;
+  }
+
   public static boolean isInternetExplorer(WebDriver driver) {
     String userAgent = getUserAgent(driver);
     return userAgent != null && (userAgent.contains("MSIE") || userAgent.contains("Trident"));

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,6 @@ public class Html5CapabilitiesTest extends JUnit4TestBase {`
`53`	`53`	`public void avoidRemote() {`
`54`	`54`	`// TODO: Resolve why these tests don't work on the remote server`
`55`	`55`	`assumeTrue(TestUtilities.isLocal());`
`56`		`- assumeTrue(TestUtilities.getFirefoxVersion(driver) >= 12);`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`@Test`