Author: olivier
Date: 2007-12-07 03:04:51 -0500 (Fri, 07 Dec 2007)
New Revision: 90894
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Resources/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXResourceReaderTest.cs
Log:
2007-12-01 Olivier Dufour <[EMAIL PROTECTED]>
* ResXResourceReaderTest.cs: Add tests to check GetMetadataEnumerator
and UseResXDataNode in the reader.
Modified: trunk/mcs/class/Managed.Windows.Forms/Test/System.Resources/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/Test/System.Resources/ChangeLog
2007-12-07 04:40:30 UTC (rev 90893)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Resources/ChangeLog
2007-12-07 08:04:51 UTC (rev 90894)
@@ -1,3 +1,8 @@
+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-07 04:40:30 UTC (rev 90893)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Resources/ResXResourceReaderTest.cs
2007-12-07 08:04:51 UTC (rev 90894)
@@ -1472,7 +1472,60 @@
}
}
+#if NET_2_0
[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");
+ }
+ }
+#endif
+ [Test]
public void TypeConversion ()
{
string resXContent = string.Format
(CultureInfo.CurrentCulture,
@@ -1661,6 +1714,11 @@
" <resheader name=\"writer\">" +
"
<value>System.Resources.ResXResourceWriter, {2}</value>" +
" </resheader>" +
+#if NET_2_0
+ " <metadata name=\"panel_label.Locked\"
type=\"System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089\">" +
+ " <value>True</value>" +
+ " </metadata>" +
+#endif
" <data name=\"foo\"
type=\"System.Resources.ResXFileRef, {2}\">" +
" <value>{3};{4}{5}</value>" +
" </data>" +
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
