[java] Deleting unused code

SeleniumHQ · Sep 28, 2019 · 5a56387 · 5a56387
1 parent c2a38eb
commit 5a56387
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 292 deletions.
diff --git a/java/client/src/org/openqa/selenium/net/PortProber.java b/java/client/src/org/openqa/selenium/net/PortProber.java
@@ -18,7 +18,6 @@
 package org.openqa.selenium.net;
 
 import static java.lang.Math.max;
-import static java.util.concurrent.TimeUnit.SECONDS;
 
 import org.openqa.selenium.Platform;
 
@@ -118,29 +117,6 @@ private static int checkPortIsFree(int port) {
     }
   }
 
-  public static boolean pollPort(int port) {
-    return pollPort(port, 15, SECONDS);
-  }
-
-  public static boolean pollPort(int port, int timeout, TimeUnit unit) {
-    long end = System.currentTimeMillis() + unit.toMillis(timeout);
-    while (System.currentTimeMillis() < end) {
-      try {
-        Socket socket = new Socket();
-        socket.setReuseAddress(true);
-        socket.bind(new InetSocketAddress("localhost", port));
-        socket.close();
-        return true;
-      } catch (ConnectException e) {
-        // Ignore this
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
-    }
-
-    return false;
-  }
-
   public static void waitForPortUp(int port, int timeout, TimeUnit unit) {
     long end = System.currentTimeMillis() + unit.toMillis(timeout);
     while (System.currentTimeMillis() < end) {

diff --git a/java/client/test/com/thoughtworks/selenium/BaseSuite.java b/java/client/test/com/thoughtworks/selenium/BaseSuite.java
@@ -17,8 +17,6 @@
 
 package com.thoughtworks.selenium;
 
-import com.thoughtworks.selenium.testing.SeleniumTestEnvironment;
-
 import org.junit.ClassRule;
 import org.junit.rules.ExternalResource;
 import org.junit.rules.RuleChain;

diff --git a/java/client/test/com/thoughtworks/selenium/SessionExtensionJsTest.java b/java/client/test/com/thoughtworks/selenium/SessionExtensionJsTest.java
diff --git a/java/client/test/com/thoughtworks/selenium/testing/SeleniumTestEnvironment.java b/java/client/test/com/thoughtworks/selenium/testing/SeleniumTestEnvironment.java
diff --git a/java/server/test/org/openqa/selenium/docker/DockerTest.java b/java/server/test/org/openqa/selenium/docker/DockerTest.java
@@ -18,7 +18,6 @@
 package org.openqa.selenium.docker;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.junit.Assert.assertTrue;
 import static org.openqa.selenium.docker.Port.tcp;
 
 import org.junit.Test;
@@ -49,7 +48,7 @@ public void bootstrap() throws IOException {
 
     container.start();
 
-    assertTrue(PortProber.pollPort(port, 10, SECONDS));
+    PortProber.waitForPortUp(port, 10, SECONDS);
 
     container.stop(Duration.ofSeconds(30));
     container.delete();