Unify test behaviour on java and android

DEVSIX-6330

Autoported commit.
Original commit hash: [32b7cef68]
Manual files:
styled-xml-parser/src/test/java/com/itextpdf/styledxmlparser/resolver/resource/UriResolverTest.java

Author: Egor Martsynkovsky

itext.tests/itext.styledxmlparser.tests/itext/styledxmlparser/resolver/resource/UriResolverTest.cs

@@ -253,12 +253,20 @@ public virtual void UriResolverTest14() {
             UriResolver resolver = new UriResolver("base/uri/index.html");
             String runFolder = new Uri(Path.GetFullPath(Directory.GetCurrentDirectory() )).ToExternalForm() + "/";
             NUnit.Framework.Assert.AreEqual(runFolder + "base/uri/index.html", resolver.GetBaseUri());
-            NUnit.Framework.Assert.AreEqual("file:///c:/test/folder/img.txt", resolver.ResolveAgainstBaseUri("file:/c:/test/folder/img.txt"
-                ).ToExternalForm());
+            
+            String firstUriResolvingResult = resolver.ResolveAgainstBaseUri("file:/c:/test/folder/img.txt")
+                .ToExternalForm();
+            String expectedUriWithSingleSlash = "file:/c:/test/folder/img.txt";
+            String expectedUriWithTripleSlash = "file:///c:/test/folder/img.txt";
+            NUnit.Framework.Assert.True(expectedUriWithSingleSlash.Equals(firstUriResolvingResult) 
+                                        || expectedUriWithTripleSlash.Equals(firstUriResolvingResult));
             NUnit.Framework.Assert.AreEqual("file:///c:/test/folder/img.txt", resolver.ResolveAgainstBaseUri("file://c:/test/folder/img.txt"
                 ).ToExternalForm());
-            NUnit.Framework.Assert.AreEqual("file:///c:/test/folder/data.jpg", resolver.ResolveAgainstBaseUri("file:///c:/test/folder/data.jpg"
-                ).ToExternalForm());
+            
+            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.
+            NUnit.Framework.Assert.AreEqual(firstUriResolvingResult, thirdUriResolvingResult);
         }
 
 

itext.tests/itext.svg.tests/itext/svg/css/SvgStyleResolverTest.cs

@@ -162,8 +162,22 @@ public virtual void SvgCssResolverXlinkTest() {
             SvgStyleResolver sr = new SvgStyleResolver(node, processorContext);
             IDictionary<String, String> attr = sr.ResolveStyles(node, new SvgCssContext());
             String fileName = baseUri + "itis.jpg";
-            String expectedURL = UrlUtil.ToNormalizedURI(fileName).ToString();
-            NUnit.Framework.Assert.AreEqual(expectedURL, attr.Get("xlink:href"));
+            String expectedUrl = UrlUtil.ToNormalizedURI(fileName).ToString();
+            String expectedUrlAnotherValidVersion;
+            if (expectedUrl.StartsWith("file:///")) {
+                expectedUrlAnotherValidVersion = "file:/" + expectedUrl.Substring("file:///".Length);
+            }
+            else {
+                if (expectedUrl.StartsWith("file:/")) {
+                    expectedUrlAnotherValidVersion = "file:///" + expectedUrl.Substring("file:/".Length);
+                }
+                else {
+                    expectedUrlAnotherValidVersion = expectedUrl;
+                }
+            }
+            String url = attr.Get("xlink:href");
+            // Both variants(namely with triple and single slashes) are valid.
+            NUnit.Framework.Assert.IsTrue(expectedUrl.Equals(url) || expectedUrlAnotherValidVersion.Equals(url));
         }
 
         [NUnit.Framework.Test]

itext.tests/itext.svg.tests/itext/svg/processors/impl/DefaultSvgProcessorUnitTest.cs

@@ -251,9 +251,11 @@ public virtual void XLinkAttributeBaseDirDoesNotExistTest() {
                 ();
             String fileName = resolvedBaseUrl + "/img.png";
             String expectedURL = UrlUtil.ToNormalizedURI(fileName).ToString();
+            String expectedURLAnotherValidVersion = CreateAnotherValidUrlVersion(expectedURL);
             ISvgNodeRenderer imageRendered = rootActual.GetChildren()[0];
             String url = imageRendered.GetAttribute(SvgConstants.Attributes.XLINK_HREF);
-            NUnit.Framework.Assert.AreEqual(expectedURL, url);
+            // Both variants(namely with triple and single slashes) are valid.
+            NUnit.Framework.Assert.IsTrue(expectedURL.Equals(url) || expectedURLAnotherValidVersion.Equals(url));
         }
 
         [NUnit.Framework.Test]
@@ -266,9 +268,11 @@ public virtual void XLinkAttributeResolveNonEmptyBaseUrlTest() {
                 ();
             String fileName = baseUrl + "/img.png";
             String expectedURL = UrlUtil.ToNormalizedURI(fileName).ToString();
+            String expectedURLAnotherValidVersion = CreateAnotherValidUrlVersion(expectedURL);
             ISvgNodeRenderer imageRendered = rootActual.GetChildren()[0];
             String url = imageRendered.GetAttribute(SvgConstants.Attributes.XLINK_HREF);
-            NUnit.Framework.Assert.AreEqual(expectedURL, url);
+            // Both variants(namely with triple and single slashes) are valid.
+            NUnit.Framework.Assert.IsTrue(expectedURL.Equals(url) || expectedURLAnotherValidVersion.Equals(url));
         }
 
         private INode CreateSvgContainingImage() {
@@ -283,6 +287,20 @@ 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();
         }

port-hash

@@ -1 +1 @@
-6a34fa41b7628954736c356949ff456b1b6c8f61
+32b7cef68810f31fbac4035995430d0d6025ce76