diff options
| author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2010-06-23 01:19:55 +0400 |
|---|---|---|
| committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2010-06-23 01:19:55 +0400 |
| commit | 8db1deb79dd41be716b79d86418fd086c647eda1 (patch) | |
| tree | c8e29a7bda222fbc0516a33d52d80f35ca9ce787 /mcs/class | |
| parent | d0ab906b4369c3d09be49baf5e25f8129e8e6057 (diff) | |
2010-06-22 Gonzalo Paniagua Javier <gonzalo@novell.com>
* UriTest.cs: exclude 2 tests in 4.0.
svn path=/branches/mono-2-6/mcs/; revision=159380
Diffstat (limited to 'mcs/class')
| -rw-r--r-- | mcs/class/System/Test/System/ChangeLog | 4 | ||||
| -rw-r--r-- | mcs/class/System/Test/System/UriTest.cs | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/mcs/class/System/Test/System/ChangeLog b/mcs/class/System/Test/System/ChangeLog index 4be95761fcb..ab05361a1ad 100644 --- a/mcs/class/System/Test/System/ChangeLog +++ b/mcs/class/System/Test/System/ChangeLog @@ -1,3 +1,7 @@ +2010-06-22 Gonzalo Paniagua Javier <gonzalo@novell.com> + + * UriTest.cs: exclude 2 tests in 4.0. + 2010-04-17 Raja R Harinath <harinath@hurrynot.org> * UriTest.cs (FtpRootPath): New. Check that ftp root paths are diff --git a/mcs/class/System/Test/System/UriTest.cs b/mcs/class/System/Test/System/UriTest.cs index f46d87a4175..27c7f666dbb 100644 --- a/mcs/class/System/Test/System/UriTest.cs +++ b/mcs/class/System/Test/System/UriTest.cs @@ -167,8 +167,10 @@ namespace MonoTests.System uri = new Uri (new Uri("http://www.xxx.com"), "?x=0"); Assert.AreEqual ("http://www.xxx.com/?x=0", uri.ToString(), "#rel30"); +#if !NET_4_0 uri = new Uri (new Uri("http://www.xxx.com/index.htm"), "?x=0"); Assert.AreEqual ("http://www.xxx.com/?x=0", uri.ToString(), "#rel31"); +#endif uri = new Uri (new Uri("http://www.xxx.com/index.htm"), "#here"); Assert.AreEqual ("http://www.xxx.com/index.htm#here", uri.ToString(), "#rel32"); #if NET_2_0 @@ -243,7 +245,9 @@ namespace MonoTests.System Uri b = new Uri ("http://a/b/c/d;p?q"); Assert.AreEqual ("http://a/g", new Uri (b, "/g").ToString (), "#1"); Assert.AreEqual ("http://g/", new Uri (b, "//g").ToString (), "#2"); +#if !NET_4_0 Assert.AreEqual ("http://a/b/c/?y", new Uri (b, "?y").ToString (), "#3"); +#endif Assert.IsTrue (new Uri (b, "#s").ToString ().EndsWith ("#s"), "#4"); Uri u = new Uri (b, "/g?q=r"); |