Bug 1348086 - Part 2 - Check whether an URL is already absolute before processing it. r?gbrown draft
authorJan Henning <jh+bugzilla@buttercookie.de>
Sat, 18 Mar 2017 20:11:24 +0100
changeset 503088 c2de34d14d09a3d92d5edc91aa9e422dab81f549
parent 503087 d3942916b32d4f9c4c776c1b2f9b0ea73a1b12bd
child 503089 c9128ae95decf6f63b141633f09a015951b89989
child 503107 29fe74b8e05906f9d3f214fd4a5cec02c4d8c9e9
push id50492
push usermozilla@buttercookie.de
push dateWed, 22 Mar 2017 20:44:05 +0000
reviewersgbrown
bugs1348086
milestone55.0a1
Bug 1348086 - Part 2 - Check whether an URL is already absolute before processing it. r?gbrown Necessary if we already have an absolute URL and want to pass that to ToolbarComponent.assertTitle(). MozReview-Commit-ID: adXLYGyAZ1
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/UITest.java
--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/UITest.java
+++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/UITest.java
@@ -137,17 +137,21 @@ abstract class UITest extends BaseRoboco
     }
 
     @Override
     public String getAbsoluteIpUrl(final String url) {
         return getAbsoluteUrl(mBaseIpUrl, url);
     }
 
     private String getAbsoluteUrl(final String baseUrl, final String url) {
-        return baseUrl + "/" + url.replaceAll("(^/)", "");
+        if (!url.startsWith(baseUrl)) {
+            return baseUrl + "/" + url.replaceAll("(^/)", "");
+        }
+
+        return url;
     }
 
     /**
      * Throws an Exception. Called from overridden JUnit methods to ensure JUnit assertions
      * are not accidentally used over AssertionHelper assertions (the latter of which contains
      * additional logging facilities for use in our test harnesses).
      */
     private static void junit() {