From: Robert Jordan Date: Fri, 2 Nov 2007 12:51:45 +0000 (-0000) Subject: 2007-11-02 Robert Jordan X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=0783c77051dd69187ba1a2ff3a253b98786ac5ac;p=mono.git 2007-11-02 Robert Jordan * PathTest.cs (TestGetDirectoryName): Fix syntax errors. svn path=/trunk/mcs/; revision=88718 --- diff --git a/mcs/class/corlib/Test/System.IO/ChangeLog b/mcs/class/corlib/Test/System.IO/ChangeLog index f933548cc00..1cf7530960b 100644 --- a/mcs/class/corlib/Test/System.IO/ChangeLog +++ b/mcs/class/corlib/Test/System.IO/ChangeLog @@ -1,3 +1,7 @@ +2007-11-02 Robert Jordan + + * PathTest.cs (TestGetDirectoryName): Fix syntax errors. + 2007-09-27 Gert Driesen * DirectoryTest.cs: Added RunningOnUnix property to use for enabling diff --git a/mcs/class/corlib/Test/System.IO/PathTest.cs b/mcs/class/corlib/Test/System.IO/PathTest.cs index 6cc5d9496c8..2e33c031544 100644 --- a/mcs/class/corlib/Test/System.IO/PathTest.cs +++ b/mcs/class/corlib/Test/System.IO/PathTest.cs @@ -874,16 +874,16 @@ namespace MonoTests.System.IO public void TestGetDirectoryName () { if (Unix){ - Assert.Equals ("GetDirectoryName#1", Path.GetDirectoryName ("/foo//bar/dingus"), "/foo/bar"); - Assert.Equals ("GDN#3", Path.GetDirectoryName ("foo/bar/", "foo/bar")); - Assert.Equals ("GDN#6", Path.GetDirectoryName ("/tmp", "/")); - Assert.Equals ("GDN#6", Path.GetDirectoryName ("/", "")); + AssertEquals ("GetDirectoryName#1", Path.GetDirectoryName ("/foo//bar/dingus"), "/foo/bar"); + AssertEquals ("GDN#3", Path.GetDirectoryName ("foo/bar/"), "foo/bar"); + AssertEquals ("GDN#6", Path.GetDirectoryName ("/tmp"), "/"); + AssertEquals ("GDN#6", Path.GetDirectoryName ("/"), ""); } else { - Assert.Equals ("GetDirectoryName#1", Path.GetDirectoryName ("/foo//bar/dingus"), "\\foo\\bar"); - Assert.Equals ("GDN#4", Path.GetDirectoryName ("foo/bar/", "foo\\bar"); - Assert.Equals ("GDN#5", Path.GetDirectoryName ("foo/bar\\xxx", "foo\\bar"); + AssertEquals ("GetDirectoryName#1", Path.GetDirectoryName ("/foo//bar/dingus"), "\\foo\\bar"); + AssertEquals ("GDN#4", Path.GetDirectoryName ("foo/bar/"), "foo\\bar"); + AssertEquals ("GDN#5", Path.GetDirectoryName ("foo/bar\\xxx"), "foo\\bar"); + AssertEquals ("GDN#2", Path.GetDirectoryName ("\\\\host\\dir\\\\dir2\\path"), "\\\\host\\dir\\dir2"); } - Assert.Equals ("GDN#2", Path.GetDirectoryName ("\\\\host\\dir\\\\dir2\path"), "\\\\host\\dir\\dir2"); } #endif }