2005-01-28 Nick Drochak <ndrochak@ieee.org>

	* ResourceReaderTest.cs: Not sure about a zero-byte length file.

svn path=/trunk/mcs/; revision=39702

diff --git a/mcs/class/corlib/Test/System.Resources/ChangeLog b/mcs/class/corlib/Test/System.Resources/ChangeLog
index d540956e7153f5d2f050a63e07f5ba5d8dd130c8..e0553bfc0effdc667ef67cf637f9d89b4c615636 100644 (file)
--- a/mcs/class/corlib/Test/System.Resources/ChangeLog
+++ b/mcs/class/corlib/Test/System.Resources/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-28  Nick Drochak <ndrochak@ieee.org>\r
+\r
+       * ResourceReaderTest.cs: Not sure about a zero-byte length file.\r
+\r
 2004-08-29  Nick Drochak <ndrochak@ieee.org>\r
 \r
        * ResourceReaderTest.cs: Make tests pass (correct path to resources)\r

diff --git a/mcs/class/corlib/Test/System.Resources/ResourceReaderTest.cs b/mcs/class/corlib/Test/System.Resources/ResourceReaderTest.cs
index 33a16dccccbf19a1172cbe854bf8071eadb9aae8..c263730b071c0785fb48d4a38235c8bee173289c 100644 (file)
--- a/mcs/class/corlib/Test/System.Resources/ResourceReaderTest.cs
+++ b/mcs/class/corlib/Test/System.Resources/ResourceReaderTest.cs
@@ -28,9 +28,9 @@ namespace MonoTests.System.Resources {
                        char ds = Path.DirectorySeparatorChar;\r
                        if (ds == '/') {\r
                                FileInfo code_base = new FileInfo (Assembly.GetExecutingAssembly ().Location);\r
-                               string base_path = code_base.Directory.FullName + ds + "Test" + ds + "resources" + ds;\r
-                               m_ResourceFile = base_path + "MyResources.resources";\r
-                               m_BadResourceFile = base_path + "Empty.resources";\r
+                               string base_path = Path.Combine (code_base.Directory.FullName, Path.Combine ("Test", "resources"));\r
+                               m_ResourceFile = Path.Combine (base_path, "MyResources.resources");\r
+                               m_BadResourceFile = Path.Combine (base_path, "Empty.resources");\r
                        } else {\r
                                m_ResourceFile = Path.Combine ("Test", Path.Combine ("resources","MyResources.resources"));\r
                                m_BadResourceFile = "resources" + ds + "Empty.resources";\r
@@ -62,9 +62,11 @@ namespace MonoTests.System.Resources {
                }\r
 \r
                [Test]\r
+               [Ignore("Not covered in the docs, not sure what the correct behavior should be for this")]\r
                [ExpectedException (typeof (DirectoryNotFoundException))]\r
                public void ConstructorString_Bad () \r
                {\r
+                       Assert (File.Exists (m_BadResourceFile));\r
                        ResourceReader r = new ResourceReader(m_BadResourceFile);\r
                }\r
 \r