feat(selenium): add ReadUrl and deprecate ReadCurrentUrl

mcdcorp · May 30, 2018 · 6b67603 · 6b67603
1 parent 78e7052
commit 6b67603
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 29 deletions.
diff --git a/actor/selenium/src/main/java/org/getopentest/selenium/ReadCurrentUrl.java b/actor/selenium/src/main/java/org/getopentest/selenium/ReadCurrentUrl.java
@@ -1,32 +1,5 @@
 package org.getopentest.selenium;
 
-import org.getopentest.selenium.core.SeleniumTestAction;
-import java.net.URL;
-
-public class ReadCurrentUrl extends SeleniumTestAction {
-
-    @Override
-    public void run() {
-        super.run();
-
-        try {
-            String urlValue = driver.getCurrentUrl();
-            URL currentUrl = new URL(urlValue);
-
-            this.writeOutput("anchor", currentUrl.getRef());
-            this.writeOutput("authority", currentUrl.getAuthority());
-            this.writeOutput("defaultPort", currentUrl.getDefaultPort());
-            this.writeOutput("file", currentUrl.getFile());
-            this.writeOutput("host", currentUrl.getHost());
-            this.writeOutput("path", currentUrl.getPath());
-            int port = currentUrl.getPort();
-            this.writeOutput("port", port > 0 ? port : null);
-            this.writeOutput("protocol", currentUrl.getProtocol());
-            this.writeOutput("query", currentUrl.getQuery());
-            this.writeOutput("userInfo", currentUrl.getUserInfo());
-            this.writeOutput("url", urlValue);
-        } catch (Throwable ex) {
-            throw new RuntimeException("Failed reading the current URL", ex);
-        }
-    }
+@Deprecated
+public class ReadCurrentUrl extends ReadUrl {
 }
diff --git a/actor/selenium/src/main/java/org/getopentest/selenium/ReadUrl.java b/actor/selenium/src/main/java/org/getopentest/selenium/ReadUrl.java
@@ -0,0 +1,32 @@
+package org.getopentest.selenium;
+
+import org.getopentest.selenium.core.SeleniumTestAction;
+import java.net.URL;
+
+public class ReadUrl extends SeleniumTestAction {
+
+    @Override
+    public void run() {
+        super.run();
+
+        try {
+            String urlValue = driver.getCurrentUrl();
+            URL currentUrl = new URL(urlValue);
+
+            this.writeOutput("anchor", currentUrl.getRef());
+            this.writeOutput("authority", currentUrl.getAuthority());
+            this.writeOutput("defaultPort", currentUrl.getDefaultPort());
+            this.writeOutput("file", currentUrl.getFile());
+            this.writeOutput("host", currentUrl.getHost());
+            this.writeOutput("path", currentUrl.getPath());
+            int port = currentUrl.getPort();
+            this.writeOutput("port", port > 0 ? port : null);
+            this.writeOutput("protocol", currentUrl.getProtocol());
+            this.writeOutput("query", currentUrl.getQuery());
+            this.writeOutput("userInfo", currentUrl.getUserInfo());
+            this.writeOutput("url", urlValue);
+        } catch (Throwable ex) {
+            throw new RuntimeException("Failed reading the current URL", ex);
+        }
+    }
+}