Fix Url.Hash and Url.Search

kzrnm · Dec 6, 2021 · bc2e97e · bc2e97e
1 parent a5283d5
commit bc2e97e
Show file tree

Hide file tree

Showing 2 changed files with 105 additions and 2 deletions.
diff --git a/src/AngleSharp.Core.Tests/Urls/UrlApi.cs b/src/AngleSharp.Core.Tests/Urls/UrlApi.cs
@@ -38,6 +38,39 @@ public void UrlHashhWithFragmentIsNotEmpty()
             Assert.AreEqual("baz", url.Fragment);
         }
 
+        [Test]
+        public void UrlHashAssigningStringWithHash()
+        {
+            var url = new Url("https://florian-rappl.de/foo/bar#baz");
+            Assert.AreEqual("#baz", url.Hash);
+            Assert.AreEqual("baz", url.Fragment);
+            url.Hash = "#foobar";
+            Assert.AreEqual("#foobar", url.Hash);
+            Assert.AreEqual("foobar", url.Fragment);
+        }
+
+        [Test]
+        public void UrlHashAssigningStringWithoutHash()
+        {
+            var url = new Url("https://florian-rappl.de/foo/bar#baz");
+            Assert.AreEqual("#baz", url.Hash);
+            Assert.AreEqual("baz", url.Fragment);
+            url.Hash = "foobar";
+            Assert.AreEqual("#foobar", url.Hash);
+            Assert.AreEqual("foobar", url.Fragment);
+        }
+
+        [Test]
+        public void UrlHashAssigningEmpty()
+        {
+            var url = new Url("https://florian-rappl.de/foo/bar#baz");
+            Assert.AreEqual("#baz", url.Hash);
+            Assert.AreEqual("baz", url.Fragment);
+            url.Hash = "";
+            Assert.AreEqual("", url.Hash);
+            Assert.AreEqual(null, url.Fragment);
+        }
+
         [Test]
         public void UrlPathnameIncludesSlash()
         {
@@ -76,6 +109,48 @@ public void UrlParamsAreLive()
             Assert.AreEqual("foo=bar", url.Query);
         }
 
+        [Test]
+        public void UrlSearchAssigningStringWithoutQuestion()
+        {
+            var url = new Url("https://florian-rappl.de?qxz=bar");
+            Assert.AreEqual("bar", url.SearchParams.Get("qxz"));
+            Assert.AreEqual(true, url.SearchParams.Has("qxz"));
+            Assert.AreEqual(null, url.SearchParams.Get("foo"));
+            url.Search = "foo=bar";
+            Assert.AreEqual(null, url.SearchParams.Get("qxz"));
+            Assert.AreEqual(false, url.SearchParams.Has("qxz"));
+            Assert.AreEqual("bar", url.SearchParams.Get("foo"));
+            Assert.AreEqual("foo=bar", url.Query);
+        }
+
+        [Test]
+        public void UrlSearchAssigningStringWithQuestion()
+        {
+            var url = new Url("https://florian-rappl.de?qxz=bar");
+            Assert.AreEqual("bar", url.SearchParams.Get("qxz"));
+            Assert.AreEqual(true, url.SearchParams.Has("qxz"));
+            Assert.AreEqual(null, url.SearchParams.Get("foo"));
+            url.Search = "?foo=bar";
+            Assert.AreEqual(null, url.SearchParams.Get("qxz"));
+            Assert.AreEqual(false, url.SearchParams.Has("qxz"));
+            Assert.AreEqual("bar", url.SearchParams.Get("foo"));
+            Assert.AreEqual("foo=bar", url.Query);
+        }
+
+        [Test]
+        public void UrlSearchAssigningEmpty()
+        {
+            var url = new Url("https://florian-rappl.de?qxz=bar");
+            Assert.AreEqual("bar", url.SearchParams.Get("qxz"));
+            Assert.AreEqual(true, url.SearchParams.Has("qxz"));
+            Assert.AreEqual(null, url.SearchParams.Get("foo"));
+            url.Search = "";
+            Assert.AreEqual(null, url.SearchParams.Get("qxz"));
+            Assert.AreEqual(false, url.SearchParams.Has("qxz"));
+            Assert.AreEqual(null, url.SearchParams.Get("foo"));
+            Assert.AreEqual(null, url.Query);
+        }
+
         [Test]
         public void UrlParamsAreConnectedWhenAppend()
         {

diff --git a/src/AngleSharp/Dom/Url.cs b/src/AngleSharp/Dom/Url.cs
@@ -263,7 +263,21 @@ public static Url Convert(Uri uri)
         public String Hash
         {
             get => String.IsNullOrEmpty(_fragment) ? String.Empty : $"#{_fragment}";
-            set => Fragment = value;
+            set
+            {
+                if (String.IsNullOrEmpty(value))
+                {
+                    Fragment = null;
+                }
+                else if (value[0] is '#')
+                {
+                    Fragment = value.Substring(1);
+                }
+                else
+                {
+                    Fragment = value;
+                }
+            }
         }
 
         /// <summary>
@@ -384,7 +398,21 @@ public String Protocol
         public String Search
         {
             get => String.IsNullOrEmpty(_query) ? String.Empty : $"?{_query}";
-            set => Query = value;
+            set
+            {
+                if (String.IsNullOrEmpty(value))
+                {
+                    Query = null;
+                }
+                else if (value[0] is '?')
+                {
+                    Query = value.Substring(1);
+                }
+                else
+                {
+                    Query = value;
+                }
+            }
         }
 
         /// <summary>