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
--- 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() {