Merge pull request #495 from nicolas-raoul/fix-for-issue2907-with-no-formatting-changes

[mono.git] / mcs / class / System.ServiceModel.Web / Test / System / UriTemplateTest.cs

diff --git a/mcs/class/System.ServiceModel.Web/Test/System/UriTemplateTest.cs b/mcs/class/System.ServiceModel.Web/Test/System/UriTemplateTest.cs
index 8455ce59340f4bfe89e540b7f17811b9a3331203..a41802469eb092bff030f7b736004a7c361e0978 100644 (file)
--- a/mcs/class/System.ServiceModel.Web/Test/System/UriTemplateTest.cs
+++ b/mcs/class/System.ServiceModel.Web/Test/System/UriTemplateTest.cs
@@ -411,6 +411,16 @@ namespace MonoTests.System
                        Assert.AreEqual ("vv", m.QueryParameters ["p1"], "#5");
                }
 
+               [Test]
+               public void Match3 ()
+               {
+                       var template = new UriTemplate ("test");
+                       var match1 = template.Match (new Uri ("http://something"), new Uri ("http://something/test"));
+                       var match2 = template.Match (new Uri ("http://something/something2"), new Uri ("http://something/something2/test"));
+                       Assert.IsNotNull (match1, "#1");
+                       Assert.IsNotNull (match2, "#2");
+               }
+               
                [Test]
                public void MatchWildcard ()
                {
@@ -464,6 +474,7 @@ namespace MonoTests.System
                }
 
                [Test]
+               [Category ("NotWorking")]
                public void SimpleWebGet () {
                        UriTemplate t = new UriTemplate ("GetBlog");
                        Assert.IsNotNull(t.Match(new Uri("http://localhost:8000/BlogService"),
@@ -502,5 +513,20 @@ namespace MonoTests.System
                        Assert.IsNotNull (match, "#1");
                        Assert.AreEqual ("something", match.BoundVariables ["path"], "#2");
                }
+
+        [Test]
+       [Category ("NotWorking")]
+        public void EscapedUriCandidate ()
+        {
+            var candidateUri = new Uri (@"https://somehost:12345/path1/path2/path3/endprefix/tpath1/guid1/tpath2/~|~~|~%3F~|~Path{guid2}~|~/tpath3");
+            var matchUri = new Uri (candidateUri.Scheme + "://" + candidateUri.Host + ":" + candidateUri.Port + @"/path1/path2/path3/endprefix");
+            
+            var template = new UriTemplate (@"tpath1/{guid}/tpath2/{encodedGuidString}/tpath3");
+            var match = template.Match (matchUri, candidateUri);
+
+            Assert.IsNotNull (match);
+            Assert.That (match.BoundVariables ["GUID"] == "guid1");
+            Assert.That (match.BoundVariables ["ENCODEDGUIDSTRING"] == "~|~~|~?~|~Path{guid2}~|~");
+        }
        }
 }