[grid] Enhancing CdpEndpointFinder to get debuggerAddress URI

This is part of the work needed for #9327

Author: diemol

java/client/src/org/openqa/selenium/devtools/CdpEndpointFinder.java

@@ -17,6 +17,7 @@
 
 package org.openqa.selenium.devtools;
 
+import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.json.Json;
 import org.openqa.selenium.remote.http.ClientConfig;
@@ -68,4 +69,32 @@ public static Optional<URI> getCdpEndPoint(HttpClient.Factory clientFactory, URI
     }
   }
 
+  public static Optional<URI> getReportedUri(String capabilityKey, Capabilities caps) {
+    Object raw = caps.getCapability(capabilityKey);
+
+    if ((raw instanceof Map)) {
+      raw = ((Map<?, ?>) raw).get("debuggerAddress");
+    }
+
+    if (!(raw instanceof String)) {
+      LOG.fine("No debugger address");
+      return Optional.empty();
+    }
+
+    int index = ((String) raw).lastIndexOf(':');
+    if (index == -1 || index == ((String) raw).length() - 1) {
+      LOG.fine("No index in " + raw);
+      return Optional.empty();
+    }
+
+    try {
+      URI uri = new URI(String.format("http://%s", raw));
+      LOG.fine("URI found: " + uri);
+      return Optional.of(uri);
+    } catch (URISyntaxException e) {
+      LOG.warning("Unable to create URI from: " + raw);
+      return Optional.empty();
+    }
+  }
+
 }

java/client/test/org/openqa/selenium/chromium/ChromiumDevToolsLocatorTest.java renamed to java/client/test/org/openqa/selenium/devtools/CdpEndpointFinderTest.java

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.chromium;
+package org.openqa.selenium.devtools;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -30,23 +30,36 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @Category(UnitTests.class)
-public class ChromiumDevToolsLocatorTest {
+public class CdpEndpointFinderTest {
 
   @Test
   public void shouldReturnEmptyIfNoDebuggerAddressIsGiven() {
-    Optional<URI> uri = ChromiumDevToolsLocator.getReportedUri("foo:options", new ImmutableCapabilities());
+    Optional<URI> uri = CdpEndpointFinder
+      .getReportedUri("foo:options", new ImmutableCapabilities());
 
     assertThat(uri).isEmpty();
   }
 
   @Test
   public void shouldReturnUriIfPresent() {
-    Capabilities caps = new Json().toType("{\"ms:edgeOptions\": { \"debuggerAddress\": \"localhost:55498\" }}",
-      Capabilities.class);
+    Capabilities caps = new Json()
+      .toType(
+        "{\"ms:edgeOptions\": { \"debuggerAddress\": \"localhost:55498\" }}",
+        Capabilities.class);
 
-    Optional<URI> uri = ChromiumDevToolsLocator.getReportedUri("ms:edgeOptions", caps);
+    Optional<URI> uri = CdpEndpointFinder.getReportedUri("ms:edgeOptions", caps);
 
     assertThat(uri.get()).isEqualTo(URI.create("http://localhost:55498"));
   }
 
+  @Test
+  public void shouldReturnUriIfPresentAndIsAtTopLevel() {
+    Capabilities caps = new Json().toType(
+      "{\"moz:debuggerAddress\": \"localhost:93487\" }",
+      Capabilities.class);
+
+    Optional<URI> uri = CdpEndpointFinder.getReportedUri("moz:debuggerAddress", caps);
+
+    assertThat(uri.get()).isEqualTo(URI.create("http://localhost:93487"));
+  }
 }