Unify test behaviour on java and android

DEVSIX-6330

Author: Egor Martsynkovsky

styled-xml-parser/src/test/java/com/itextpdf/styledxmlparser/resolver/resource/UriResolverTest.java

@@ -237,13 +237,28 @@ public void uriResolverTest14() throws MalformedURLException {
         UriResolver resolver = new UriResolver("base/uri/index.html");
         String runFolder = Paths.get("").toUri().toURL().toExternalForm();
         Assert.assertEquals(runFolder + "base/uri/index.html", resolver.getBaseUri());
-        Assert.assertEquals("file:/c:/test/folder/img.txt", resolver.resolveAgainstBaseUri("file:/c:/test/folder/img.txt").toExternalForm());
-        Assert.assertEquals("file://c:/test/folder/img.txt", resolver.resolveAgainstBaseUri("file://c:/test/folder/img.txt").toExternalForm());
-        Assert.assertEquals("file:/c:/test/folder/data.jpg", resolver.resolveAgainstBaseUri("file:///c:/test/folder/data.jpg").toExternalForm());
+
+        final String firstUriResolvingResult = resolver.resolveAgainstBaseUri("file:/c:/test/folder/img.txt")
+                .toExternalForm();
+        final String expectedUriWithSingleSlash = "file:/c:/test/folder/img.txt";
+        final String expectedUriWithTripleSlash = "file:///c:/test/folder/img.txt";
+
+        // Both variants(namely with triple and single slashes) are valid.
+        Assert.assertTrue(expectedUriWithSingleSlash.equals(firstUriResolvingResult)
+                || expectedUriWithTripleSlash.equals(firstUriResolvingResult));
+
+        Assert.assertEquals("file://c:/test/folder/img.txt",
+                resolver.resolveAgainstBaseUri("file://c:/test/folder/img.txt").toExternalForm());
+
+        final String thirdUriResolvingResult = resolver.resolveAgainstBaseUri("file:///c:/test/folder/img.txt")
+                .toExternalForm();
+        // Result of resolving uri with triple slash should be the same as if it contained single slash.
+        Assert.assertEquals(firstUriResolvingResult, thirdUriResolvingResult);
 
         // It is windows specific to assume this to work. On unix it shall fail, as it will assume that it is
         // an absolute URI with scheme 'c', and will not recognize this scheme.
-        // Assert.assertEquals("file:/c:/test/folder/data.jpg", resolver.resolveAgainstBaseUri("c:/test/folder/data.jpg").toExternalForm());
+        // Assert.assertEquals("file:/c:/test/folder/data.jpg", resolver.resolveAgainstBaseUri("c:/test/folder/data
+        // .jpg").toExternalForm());
     }
 
     @Test

svg/src/test/java/com/itextpdf/svg/css/SvgStyleResolverTest.java

@@ -186,9 +186,21 @@ public void svgCssResolverXlinkTest() {
         Map<String, String> attr = sr.resolveStyles(node, new SvgCssContext());
 
         String fileName = baseUri + "itis.jpg";
-        String expectedURL = UrlUtil.toNormalizedURI(fileName).toString();
+        final String expectedUrl = UrlUtil.toNormalizedURI(fileName).toString();
+        String expectedUrlAnotherValidVersion;
 
-        Assert.assertEquals(expectedURL, attr.get("xlink:href"));
+        if (expectedUrl.startsWith("file:///")) {
+            expectedUrlAnotherValidVersion = "file:/" + expectedUrl.substring("file:///".length());
+        } else if (expectedUrl.startsWith("file:/")) {
+            expectedUrlAnotherValidVersion = "file:///" + expectedUrl.substring("file:/".length());
+        } else {
+            expectedUrlAnotherValidVersion = expectedUrl;
+        }
+
+        final String url = attr.get("xlink:href");
+
+        // Both variants(namely with triple and single slashes) are valid.
+        Assert.assertTrue(expectedUrl.equals(url) || expectedUrlAnotherValidVersion.equals(url));
     }
 
     @Test

svg/src/test/java/com/itextpdf/svg/processors/impl/DefaultSvgProcessorUnitTest.java

@@ -275,11 +275,14 @@ public void xLinkAttributeBaseDirDoesNotExistTest() {
         SvgTagSvgNodeRenderer rootActual = (SvgTagSvgNodeRenderer) processor().process(root, props).getRootRenderer();
 
         String fileName = resolvedBaseUrl + "/img.png";
-        String expectedURL  = UrlUtil.toNormalizedURI(fileName).toString();
+        final String expectedURL = UrlUtil.toNormalizedURI(fileName).toString();
+        final String expectedURLAnotherValidVersion = createAnotherValidUrlVersion(expectedURL);
 
         ISvgNodeRenderer imageRendered = rootActual.getChildren().get(0);
         String url = imageRendered.getAttribute(SvgConstants.Attributes.XLINK_HREF);
-        Assert.assertEquals(expectedURL, url);
+
+        // Both variants(namely with triple and single slashes) are valid.
+        Assert.assertTrue(expectedURL.equals(url) || expectedURLAnotherValidVersion.equals(url));
     }
 
     @Test
@@ -290,12 +293,14 @@ public void xLinkAttributeResolveNonEmptyBaseUrlTest() {
         SvgTagSvgNodeRenderer rootActual = (SvgTagSvgNodeRenderer) processor().process(root, props).getRootRenderer();
 
         String fileName = baseUrl + "/img.png";
-        String expectedURL  = UrlUtil.toNormalizedURI(fileName).toString();
+        final String expectedURL = UrlUtil.toNormalizedURI(fileName).toString();
+        final String expectedURLAnotherValidVersion = createAnotherValidUrlVersion(expectedURL);
 
         ISvgNodeRenderer imageRendered = rootActual.getChildren().get(0);
         String url = imageRendered.getAttribute(SvgConstants.Attributes.XLINK_HREF);
 
-        Assert.assertEquals(expectedURL, url);
+        // Both variants(namely with triple and single slashes) are valid.
+        Assert.assertTrue(expectedURL.equals(url) || expectedURLAnotherValidVersion.equals(url));
     }
 
     private INode createSvgContainingImage() {
@@ -308,6 +313,16 @@ private INode createSvgContainingImage() {
         return root;
     }
 
+    private static String createAnotherValidUrlVersion(String url) {
+        if (url.startsWith("file:///")) {
+            return "file:/" + url.substring("file:///".length());
+        } else if (url.startsWith("file:/")) {
+            return "file:///" + url.substring("file:/".length());
+        } else {
+            return url;
+        }
+    }
+
     private static ISvgProcessor processor() {
         return new DefaultSvgProcessor();
     }