Author: jpobst
Date: 2007-12-05 09:57:32 -0500 (Wed, 05 Dec 2007)
New Revision: 90768

Modified:
   trunk/mcs/class/Managed.Windows.Forms/Test/System.Resources/ChangeLog
   
trunk/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXResourceReaderTest.cs
Log:
Revert r90735 so the MWF tests build again.  Will email the author with the 
corrections needed.

Modified: trunk/mcs/class/Managed.Windows.Forms/Test/System.Resources/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/Test/System.Resources/ChangeLog       
2007-12-05 14:47:20 UTC (rev 90767)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Resources/ChangeLog       
2007-12-05 14:57:32 UTC (rev 90768)
@@ -1,8 +1,3 @@
-2007-12-01  Olivier Dufour <[EMAIL PROTECTED]>
-
-       * ResXResourceReaderTest.cs: Add tests to check GetMetadataEnumerator 
-       and UseResXDataNode in the reader.
-
 2007-05-23  Andreia Gaita <[EMAIL PROTECTED]>
 
        * ResXResourceReaderTest.cs, CompatTest.cs: Fix tests so they can run 

Modified: 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXResourceReaderTest.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXResourceReaderTest.cs
       2007-12-05 14:47:20 UTC (rev 90767)
+++ 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXResourceReaderTest.cs
       2007-12-05 14:57:32 UTC (rev 90768)
@@ -1472,61 +1472,7 @@
                        }
                }
 
-
-               
                [Test]
-               public void useResXDataNodes ()
-               {
-                       string refFile = Path.Combine (_tempDirectory, 
"32x32.ico");
-                       WriteEmbeddedResource ("32x32.ico", refFile);
-
-                       string resxFile = Path.Combine (_tempDirectory, 
"resources.resx");
-                       using (StreamWriter sw = new StreamWriter (resxFile, 
false, Encoding.UTF8)) {
-                               sw.Write (string.Format 
(CultureInfo.InvariantCulture,
-                                       _resXFileRefTemplate, 
ResXResourceWriter.ResMimeType, "1.0",
-                                       Consts.AssemblySystem_Windows_Forms, 
refFile,
-                                       typeof (Bitmap).AssemblyQualifiedName, 
string.Empty));
-                       }
-
-                       using (ResXResourceReader r = new ResXResourceReader 
(resxFile)) {
-                               r.UseResXDataNodes = true;
-                               IDictionaryEnumerator enumerator = 
r.GetEnumerator ();
-                               enumerator.MoveNext ();
-                               Assert.IsNotNull (enumerator.Current, "#A1");
-                               Assert.AreEqual ("foo", enumerator.Key, "#A2");
-                               ResXDataNode node = enumerator.Value as 
ResXDataNode;
-                               Assert.IsNotNull (node, "#A3");
-                               Assert.AreEqual ("foo", node.Name, "#A4");
-                       }
-               }
-               //TODO assemblyNames
-
-               [Test]
-               public void GetMetadataEnumerator ()
-               {
-                       string refFile = Path.Combine (_tempDirectory, 
"32x32.ico");
-                       WriteEmbeddedResource ("32x32.ico", refFile);
-
-                       string resxFile = Path.Combine (_tempDirectory, 
"resources.resx");
-                       using (StreamWriter sw = new StreamWriter (resxFile, 
false, Encoding.UTF8)) {
-                               sw.Write (string.Format 
(CultureInfo.InvariantCulture,
-                                       _resXFileRefTemplate, 
ResXResourceWriter.ResMimeType, "1.0",
-                                       Consts.AssemblySystem_Windows_Forms, 
refFile,
-                                       typeof (Bitmap).AssemblyQualifiedName, 
string.Empty));
-                       }
-
-                       using (ResXResourceReader r = new ResXResourceReader 
(resxFile)) {
-                               IDictionaryEnumerator enumerator = 
r.GetMetadataEnumerator ();
-                               enumerator.MoveNext ();
-                               Assert.IsNotNull (enumerator.Current, "#A1");
-                               Assert.AreEqual ("panel_label.Locked", 
enumerator.Key, "#A2");
-                               bool flag = (bool)enumerator.Value;
-                               Assert.IsNotNull (flag, "#A3");
-                               Assert.AreEqual (true, flag, "#A4");
-                       }
-               }
-
-               [Test]
                public void TypeConversion ()
                {
                        string resXContent = string.Format 
(CultureInfo.CurrentCulture,
@@ -1715,13 +1661,9 @@
                        "       <resheader name=\"writer\">" +
                        "               
<value>System.Resources.ResXResourceWriter, {2}</value>" +
                        "       </resheader>" +
-                       "       <metadata name=\"panel_label.Locked\" 
type=\"System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, 
PublicKeyToken=b77a5c561934e089\">" +
-                       "               <value>True</value>" +
-                       "       </metadata>" +
                        "       <data name=\"foo\" 
type=\"System.Resources.ResXFileRef, {2}\">" +
                        "               <value>{3};{4}{5}</value>" +
                        "       </data>" +
                        "</root>";
        }
 }
-

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to