2002-01-25 Nick Drochak <ndrochak@gol.com>

	* AllTests.cs:
	* Empty.resources:
	* MyResources.resources: Added files
	* ResourceReaderTest.cs: Test the enumerator

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

diff --git a/mcs/class/corlib/Test/System.Resources/AllTests.cs b/mcs/class/corlib/Test/System.Resources/AllTests.cs
new file mode 100644 (file)
index 0000000..0ea192b
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Resources/AllTests.cs
@@ -0,0 +1,27 @@
+//\r
+// MonoTests.System.Resources.AllTests.cs\r
+//\r
+// Author:\r
+//   Nick Drochak (ndrochak@gol.com)\r
+//\r
+// (C) 2001 Nick Drochak II\r
+//\r
+\r
+using System;\r
+using NUnit.Framework;\r
+\r
+namespace MonoTests.System.Resources {\r
+        public class AllTests : TestCase {\r
+                public AllTests(string name) : base(name) {}\r
+                \r
+                public static ITest Suite \r
+                { \r
+                        get \r
+                        {\r
+                                TestSuite suite =  new TestSuite();\r
+                                suite.AddTest(ResourceReaderTest.Suite);\r
+                                return suite;\r
+                        }\r
+                }\r
+        }\r
+}\r

diff --git a/mcs/class/corlib/Test/System.Resources/ChangeLog b/mcs/class/corlib/Test/System.Resources/ChangeLog
index 629cccc1b75ea6e6bc5c4b4d56f568c3f21e08ce..32804153eb0509f96a37c220edffe31627535993 100644 (file)
--- a/mcs/class/corlib/Test/System.Resources/ChangeLog
+++ b/mcs/class/corlib/Test/System.Resources/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-25  Nick Drochak  <ndrochak@gol.com>\r
+\r
+       * AllTests.cs:\r
+       * Empty.resources:\r
+       * MyResources.resources: Added files\r
+       * ResourceReaderTest.cs: Test the enumerator\r
+\r
 2002-01-24  Nick Drochak  <ndrochak@gol.com>\r
 \r
        * ResourceReaderTest.cs: Add new file. This test is not done yet.\r

diff --git a/mcs/class/corlib/Test/System.Resources/Empty.resources b/mcs/class/corlib/Test/System.Resources/Empty.resources
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/mcs/class/corlib/Test/System.Resources/MyResources.resources b/mcs/class/corlib/Test/System.Resources/MyResources.resources
new file mode 100644 (file)
index 0000000..b486e9e
Binary files /dev/null and b/mcs/class/corlib/Test/System.Resources/MyResources.resources differ

diff --git a/mcs/class/corlib/Test/System.Resources/ResourceReaderTest.cs b/mcs/class/corlib/Test/System.Resources/ResourceReaderTest.cs
index 66b7828b4a871a255ebe2100764fb7f960a36757..c2b9ccceb74d4bb58f74f4f787a965d56662fc5d 100644 (file)
--- a/mcs/class/corlib/Test/System.Resources/ResourceReaderTest.cs
+++ b/mcs/class/corlib/Test/System.Resources/ResourceReaderTest.cs
@@ -19,7 +19,7 @@ namespace MonoTests.System.Resources {
 \r
        public class ResourceReaderTest : TestCase {\r
                private static string m_ResourceFile = "MyResources.resources";\r
-               private static string m_BadResourceFile = "Bad.resources";\r
+               private static string m_BadResourceFile = "Empty.resources";\r
                \r
                public ResourceReaderTest(String name) : base(name) {\r
                }\r
@@ -124,12 +124,14 @@ namespace MonoTests.System.Resources {
                        Stream stream = new FileStream (m_ResourceFile, FileMode.Open);\r
                        reader = new ResourceReader(stream);\r
                        IDictionaryEnumerator en = reader.GetEnumerator();\r
-      \r
                        // Goes through the enumerator, printing out the key and value pairs.\r
                        while (en.MoveNext()) {\r
-                               Console.WriteLine();\r
-                               Console.WriteLine("Name: {0}", en.Key);\r
-                               Console.WriteLine("Value: {0}", en.Value);\r
+                               DictionaryEntry de = (DictionaryEntry)en.Current;\r
+                               Assert("Current.Key should not be empty",String.Empty != de.Key);\r
+                               Assert("Current.Value should not be empty",String.Empty != de.Value);\r
+                               Assert("Current.Value should not be empty",String.Empty != de.Value);\r
+                               Assert("Entry.Key should not be empty",String.Empty != en.Key);\r
+                               Assert("Entry.Value should not be empty",String.Empty != en.Value);\r
                        }\r
                        reader.Close();\r
                }\r