Author: gert
Date: 2006-04-26 06:29:49 -0400 (Wed, 26 Apr 2006)
New Revision: 59921
Modified:
trunk/mcs/class/System.XML/Test/System.Xml.Serialization/ChangeLog
trunk/mcs/class/System.XML/Test/System.Xml.Serialization/SoapSchemaExporterTests.cs
trunk/mcs/class/System.XML/Test/System.Xml.Serialization/XmlCodeExporterTests.cs
Log:
* SoapSchemaExporterTests.cs: Sync expected results with changes in test
classes.
* XmlCodeExporterTests.cs: Same.
Modified: trunk/mcs/class/System.XML/Test/System.Xml.Serialization/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/Test/System.Xml.Serialization/ChangeLog
2006-04-26 10:23:04 UTC (rev 59920)
+++ trunk/mcs/class/System.XML/Test/System.Xml.Serialization/ChangeLog
2006-04-26 10:29:49 UTC (rev 59921)
@@ -1,5 +1,11 @@
2006-04-26 Gert Driesen <[EMAIL PROTECTED]>
+ * SoapSchemaExporterTests.cs: Sync expected results with changes to
+ test classes.
+ * XmlCodeExporterTests.cs: Same.
+
+2006-04-26 Gert Driesen <[EMAIL PROTECTED]>
+
* DeserializeTests.cs: Improved TestDeserialize_Enum test for
bug #78204.
Modified:
trunk/mcs/class/System.XML/Test/System.Xml.Serialization/SoapSchemaExporterTests.cs
===================================================================
---
trunk/mcs/class/System.XML/Test/System.Xml.Serialization/SoapSchemaExporterTests.cs
2006-04-26 10:23:04 UTC (rev 59920)
+++
trunk/mcs/class/System.XML/Test/System.Xml.Serialization/SoapSchemaExporterTests.cs
2006-04-26 10:29:49 UTC (rev 59921)
@@ -336,22 +336,43 @@
" <xs:complexType name=\"Field\">{0}" +
" <xs:sequence>{0}" +
#if NET_2_0
+ " <xs:element minOccurs=\"1\"
maxOccurs=\"1\" form=\"unqualified\" name=\"Flags1\" type=\"tns:FlagEnum\"
/>{0}" +
+ " <xs:element minOccurs=\"1\"
maxOccurs=\"1\" form=\"unqualified\" name=\"Flags2\" type=\"tns:FlagEnum\"
/>{0}" +
+ " <xs:element minOccurs=\"1\"
maxOccurs=\"1\" form=\"unqualified\" name=\"Flags3\" type=\"tns:FlagEnum\"
/>{0}" +
+ " <xs:element minOccurs=\"1\"
maxOccurs=\"1\" form=\"unqualified\" name=\"Flags4\" type=\"tns:FlagEnum\"
/>{0}" +
" <xs:element minOccurs=\"1\"
maxOccurs=\"1\" form=\"unqualified\" name=\"Modifiers\"
type=\"tns:MapModifiers\" />{0}" +
" <xs:element minOccurs=\"1\"
maxOccurs=\"1\" form=\"unqualified\" name=\"Modifiers2\"
type=\"tns:MapModifiers\" />{0}" +
" <xs:element minOccurs=\"1\"
maxOccurs=\"1\" form=\"unqualified\" name=\"Modifiers3\"
type=\"tns:MapModifiers\" />{0}" +
" <xs:element minOccurs=\"1\"
maxOccurs=\"1\" form=\"unqualified\" name=\"Modifiers4\"
type=\"tns:MapModifiers\" />{0}" +
+ " <xs:element minOccurs=\"1\"
maxOccurs=\"1\" form=\"unqualified\" name=\"Modifiers5\"
type=\"tns:MapModifiers\" />{0}" +
" <xs:element minOccurs=\"0\"
maxOccurs=\"1\" form=\"unqualified\" name=\"Names\" type=\"tns:ArrayOfString\"
/>{0}" +
" <xs:element minOccurs=\"0\"
maxOccurs=\"1\" form=\"unqualified\" name=\"Street\" type=\"xs:string\" />{0}" +
#else
+ " <xs:element minOccurs=\"1\"
maxOccurs=\"1\" name=\"Flags1\" type=\"tns:FlagEnum\" />{0}" +
+ " <xs:element minOccurs=\"1\"
maxOccurs=\"1\" name=\"Flags2\" type=\"tns:FlagEnum\" />{0}" +
+ " <xs:element minOccurs=\"1\"
maxOccurs=\"1\" name=\"Flags3\" type=\"tns:FlagEnum\" />{0}" +
+ " <xs:element minOccurs=\"1\"
maxOccurs=\"1\" name=\"Flags4\" type=\"tns:FlagEnum\" />{0}" +
" <xs:element minOccurs=\"1\"
maxOccurs=\"1\" name=\"Modifiers\" type=\"tns:MapModifiers\" />{0}" +
" <xs:element minOccurs=\"1\"
maxOccurs=\"1\" name=\"Modifiers2\" type=\"tns:MapModifiers\" />{0}" +
" <xs:element minOccurs=\"1\"
maxOccurs=\"1\" name=\"Modifiers3\" type=\"tns:MapModifiers\" />{0}" +
" <xs:element minOccurs=\"1\"
maxOccurs=\"1\" name=\"Modifiers4\" type=\"tns:MapModifiers\" />{0}" +
+ " <xs:element minOccurs=\"1\"
maxOccurs=\"1\" name=\"Modifiers5\" type=\"tns:MapModifiers\" />{0}" +
" <xs:element minOccurs=\"1\"
maxOccurs=\"1\" name=\"Names\" type=\"tns:ArrayOfString\" />{0}" +
" <xs:element minOccurs=\"1\"
maxOccurs=\"1\" name=\"Street\" type=\"xs:string\" />{0}" +
#endif
" </xs:sequence>{0}" +
" </xs:complexType>{0}" +
+ " <xs:simpleType name=\"FlagEnum\">{0}" +
+ " <xs:list>{0}" +
+ " <xs:simpleType>{0}" +
+ " <xs:restriction
base=\"xs:string\">{0}" +
+ " <xs:enumeration value=\"e1\" />{0}" +
+ " <xs:enumeration value=\"e2\" />{0}" +
+ " <xs:enumeration value=\"e4\" />{0}" +
+ " </xs:restriction>{0}" +
+ " </xs:simpleType>{0}" +
+ " </xs:list>{0}" +
+ " </xs:simpleType>{0}" +
" <xs:simpleType name=\"MapModifiers\">{0}" +
" <xs:list>{0}" +
" <xs:simpleType>{0}" +
Modified:
trunk/mcs/class/System.XML/Test/System.Xml.Serialization/XmlCodeExporterTests.cs
===================================================================
---
trunk/mcs/class/System.XML/Test/System.Xml.Serialization/XmlCodeExporterTests.cs
2006-04-26 10:23:04 UTC (rev 59920)
+++
trunk/mcs/class/System.XML/Test/System.Xml.Serialization/XmlCodeExporterTests.cs
2006-04-26 10:29:49 UTC (rev 59921)
@@ -213,6 +213,8 @@
[Test]
#if NET_2_0
[Category ("NotDotNet")] // regression in MS.NET 2.0
+#else
+ [Category ("NotDotNet")] // // Mono outputs XmlRootAttribute
for member types too
#endif
[Category ("NotWorking")] // TODO: order of
DefaultValueAttribute, ...
public void ExportTypeMapping_Field ()
@@ -228,10 +230,186 @@
Assert.AreEqual (string.Format
(CultureInfo.InvariantCulture,
"{0}{0}" +
"/// <remarks/>{0}" +
+#if NET_2_0
+
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Xml\",
\"2.0.50727.42\")]{0}" +
+ "[System.SerializableAttribute()]{0}" +
+
"[System.Diagnostics.DebuggerStepThroughAttribute()]{0}" +
+
"[System.ComponentModel.DesignerCategoryAttribute(\"code\")]{0}" +
"[System.Xml.Serialization.XmlRootAttribute(\"field\", Namespace=\"\",
IsNullable=true)]{0}" +
+ "public partial class Field {{{0}" +
+ " {0}" +
+ " private
MonoTests.System.Xml.TestClasses.FlagEnum flags1Field =
MonoTests.System.Xml.TestClasses.FlagEnum.e1;{0}" +
+ " {0}" +
+ " private
MonoTests.System.Xml.TestClasses.FlagEnum flags2Field =
MonoTests.System.Xml.TestClasses.FlagEnum.e1;{0}" +
+ " {0}" +
+ " private
MonoTests.System.Xml.TestClasses.FlagEnum flags3Field =
(MonoTests.System.Xml.TestClasses.FlagEnum.e1 |
MonoTests.System.Xml.TestClasses.FlagEnum.e2);{0}" +
+ " {0}" +
+ " private
MonoTests.System.Xml.TestClasses.FlagEnum flags4Field;{0}" +
+ " {0}" +
+ " private
MonoTests.System.Xml.TestClasses.MapModifiers modifiersField;{0}" +
+ " {0}" +
+ " private
MonoTests.System.Xml.TestClasses.MapModifiers modifiers2Field;{0}" +
+ " {0}" +
+ " private
MonoTests.System.Xml.TestClasses.MapModifiers modifiers3Field =
MonoTests.System.Xml.TestClasses.MapModifiers.Public;{0}" +
+ " {0}" +
+ " private
MonoTests.System.Xml.TestClasses.MapModifiers modifiers4Field =
MonoTests.System.Xml.TestClasses.MapModifiers.Protected;{0}" +
+ " {0}" +
+ " private
MonoTests.System.Xml.TestClasses.MapModifiers modifiers5Field =
MonoTests.System.Xml.TestClasses.MapModifiers.Public;{0}" +
+ " {0}" +
+ " private string[] namesField;{0}" +
+ " {0}" +
+ " private string streetField;{0}" +
+ " {0}" +
+ " /// <remarks/>{0}" +
+ "
[System.Xml.Serialization.XmlAttributeAttribute(\"flag1\")]{0}" +
+ "
[System.ComponentModel.DefaultValueAttribute(MonoTests.System.Xml.TestClasses.FlagEnum.e1)]{0}"
+
+ " public
MonoTests.System.Xml.TestClasses.FlagEnum Flags1 {{{0}" +
+ " get {{{0}" +
+ " return this.flags1Field;{0}" +
+ " }}{0}" +
+ " set {{{0}" +
+ " this.flags1Field = value;{0}" +
+ " }}{0}" +
+ " }}{0}" +
+ " {0}" +
+ " /// <remarks/>{0}" +
+ "
[System.Xml.Serialization.XmlAttributeAttribute(\"flag2\")]{0}" +
+ "
[System.ComponentModel.DefaultValueAttribute(MonoTests.System.Xml.TestClasses.FlagEnum.e1)]{0}"
+
+ " public
MonoTests.System.Xml.TestClasses.FlagEnum Flags2 {{{0}" +
+ " get {{{0}" +
+ " return this.flags2Field;{0}" +
+ " }}{0}" +
+ " set {{{0}" +
+ " this.flags2Field = value;{0}" +
+ " }}{0}" +
+ " }}{0}" +
+ " {0}" +
+ " /// <remarks/>{0}" +
+ "
[System.Xml.Serialization.XmlAttributeAttribute(\"flag3\",
Form=System.Xml.Schema.XmlSchemaForm.Qualified)]{0}" +
+ "
[System.ComponentModel.DefaultValueAttribute((MonoTests.System.Xml.TestClasses.FlagEnum.e1
| MonoTests.System.Xml.TestClasses.FlagEnum.e2))]{0}" +
+ " public
MonoTests.System.Xml.TestClasses.FlagEnum Flags3 {{{0}" +
+ " get {{{0}" +
+ " return this.flags3Field;{0}" +
+ " }}{0}" +
+ " set {{{0}" +
+ " this.flags3Field = value;{0}" +
+ " }}{0}" +
+ " }}{0}" +
+ " {0}" +
+ " /// <remarks/>{0}" +
+ "
[System.Xml.Serialization.XmlAttributeAttribute(\"flag4\")]{0}" +
+ " public
MonoTests.System.Xml.TestClasses.FlagEnum Flags4 {{{0}" +
+ " get {{{0}" +
+ " return this.flags4Field;{0}" +
+ " }}{0}" +
+ " set {{{0}" +
+ " this.flags4Field = value;{0}" +
+ " }}{0}" +
+ " }}{0}" +
+ " {0}" +
+ " /// <remarks/>{0}" +
+ "
[System.Xml.Serialization.XmlAttributeAttribute(\"modifiers\")]{0}" +
+ " public
MonoTests.System.Xml.TestClasses.MapModifiers Modifiers {{{0}" +
+ " get {{{0}" +
+ " return this.modifiersField;{0}" +
+ " }}{0}" +
+ " set {{{0}" +
+ " this.modifiersField = value;{0}" +
+ " }}{0}" +
+ " }}{0}" +
+ " {0}" +
+ " /// <remarks/>{0}" +
+ "
[System.Xml.Serialization.XmlAttributeAttribute(\"modifiers2\")]{0}" +
+ " public
MonoTests.System.Xml.TestClasses.MapModifiers Modifiers2 {{{0}" +
+ " get {{{0}" +
+ " return this.modifiers2Field;{0}" +
+ " }}{0}" +
+ " set {{{0}" +
+ " this.modifiers2Field = value;{0}" +
+ " }}{0}" +
+ " }}{0}" +
+ " {0}" +
+ " /// <remarks/>{0}" +
+ "
[System.Xml.Serialization.XmlAttributeAttribute(\"modifiers3\")]{0}" +
+ "
[System.ComponentModel.DefaultValueAttribute(MonoTests.System.Xml.TestClasses.MapModifiers.Public)]{0}"
+
+ " public
MonoTests.System.Xml.TestClasses.MapModifiers Modifiers3 {{{0}" +
+ " get {{{0}" +
+ " return this.modifiers3Field;{0}" +
+ " }}{0}" +
+ " set {{{0}" +
+ " this.modifiers3Field = value;{0}" +
+ " }}{0}" +
+ " }}{0}" +
+ " {0}" +
+ " /// <remarks/>{0}" +
+ "
[System.Xml.Serialization.XmlAttributeAttribute(\"modifiers4\")]{0}" +
+ "
[System.ComponentModel.DefaultValueAttribute(MonoTests.System.Xml.TestClasses.MapModifiers.Protected)]{0}"
+
+ " public
MonoTests.System.Xml.TestClasses.MapModifiers Modifiers4 {{{0}" +
+ " get {{{0}" +
+ " return this.modifiers4Field;{0}" +
+ " }}{0}" +
+ " set {{{0}" +
+ " this.modifiers4Field = value;{0}" +
+ " }}{0}" +
+ " }}{0}" +
+ " {0}" +
+ " /// <remarks/>{0}" +
+ "
[System.Xml.Serialization.XmlAttributeAttribute(\"modifiers5\",
Form=System.Xml.Schema.XmlSchemaForm.Qualified)]{0}" +
+ "
[System.ComponentModel.DefaultValueAttribute(MonoTests.System.Xml.TestClasses.MapModifiers.Public)]{0}"
+
+ " public
MonoTests.System.Xml.TestClasses.MapModifiers Modifiers5 {{{0}" +
+ " get {{{0}" +
+ " return this.modifiers5Field;{0}" +
+ " }}{0}" +
+ " set {{{0}" +
+ " this.modifiers5Field = value;{0}" +
+ " }}{0}" +
+ " }}{0}" +
+ " {0}" +
+ " /// <remarks/>{0}" +
+ "
[System.Xml.Serialization.XmlAttributeAttribute(\"names\")]{0}" +
+ " public string[] Names {{{0}" +
+ " get {{{0}" +
+ " return this.namesField;{0}" +
+ " }}{0}" +
+ " set {{{0}" +
+ " this.namesField = value;{0}" +
+ " }}{0}" +
+ " }}{0}" +
+ " {0}" +
+ " /// <remarks/>{0}" +
+ "
[System.Xml.Serialization.XmlAttributeAttribute(\"street\")]{0}" +
+ " public string Street {{{0}" +
+ " get {{{0}" +
+ " return this.streetField;{0}" +
+ " }}{0}" +
+ " set {{{0}" +
+ " this.streetField = value;{0}" +
+ " }}{0}" +
+ " }}{0}" +
+#else
+
"[System.Xml.Serialization.XmlRootAttribute(\"field\", Namespace=\"\",
IsNullable=true)]{0}" +
"public class Field {{{0}" +
" {0}" +
" /// <remarks/>{0}" +
+ "
[System.Xml.Serialization.XmlAttributeAttribute(\"flag1\")]{0}" +
+ "
[System.ComponentModel.DefaultValueAttribute(MonoTests.System.Xml.TestClasses.FlagEnum.e1)]{0}"
+
+ " public
MonoTests.System.Xml.TestClasses.FlagEnum Flags1 =
MonoTests.System.Xml.TestClasses.FlagEnum.e1;{0}" +
+ " {0}" +
+ " /// <remarks/>{0}" +
+ "
[System.Xml.Serialization.XmlAttributeAttribute(\"flag2\")]{0}" +
+ "
[System.ComponentModel.DefaultValueAttribute(MonoTests.System.Xml.TestClasses.FlagEnum.e1)]{0}"
+
+ " public
MonoTests.System.Xml.TestClasses.FlagEnum Flags2 =
MonoTests.System.Xml.TestClasses.FlagEnum.e1;{0}" +
+ " {0}" +
+ " /// <remarks/>{0}" +
+ "
[System.Xml.Serialization.XmlAttributeAttribute(\"flag3\",
Form=System.Xml.Schema.XmlSchemaForm.Qualified)]{0}" +
+ "
[System.ComponentModel.DefaultValueAttribute((MonoTests.System.Xml.TestClasses.FlagEnum.e1
| MonoTests.System.Xml.TestClasses.FlagEnum.e2))]{0}" +
+ " public
MonoTests.System.Xml.TestClasses.FlagEnum Flags3 =
(MonoTests.System.Xml.TestClasses.FlagEnum.e1 |
MonoTests.System.Xml.TestClasses.FlagEnum.e2);{0}" +
+ " {0}" +
+ " /// <remarks/>{0}" +
+ "
[System.Xml.Serialization.XmlAttributeAttribute(\"flag4\")]{0}" +
+ " public
MonoTests.System.Xml.TestClasses.FlagEnum Flags4;{0}" +
+ " {0}" +
+ " /// <remarks/>{0}" +
"
[System.Xml.Serialization.XmlAttributeAttribute(\"modifiers\")]{0}" +
" public
MonoTests.System.Xml.TestClasses.MapModifiers Modifiers;{0}" +
" {0}" +
@@ -246,8 +424,13 @@
" {0}" +
" /// <remarks/>{0}" +
"
[System.Xml.Serialization.XmlAttributeAttribute(\"modifiers4\")]{0}" +
+ "
[System.ComponentModel.DefaultValueAttribute(MonoTests.System.Xml.TestClasses.MapModifiers.Protected)]{0}"
+
+ " public
MonoTests.System.Xml.TestClasses.MapModifiers Modifiers4 =
MonoTests.System.Xml.TestClasses.MapModifiers.Protected;{0}" +
+ " {0}" +
+ " /// <remarks/>{0}" +
+ "
[System.Xml.Serialization.XmlAttributeAttribute(\"modifiers5\",
Form=System.Xml.Schema.XmlSchemaForm.Qualified)]{0}" +
"
[System.ComponentModel.DefaultValueAttribute(MonoTests.System.Xml.TestClasses.MapModifiers.Public)]{0}"
+
- " public
MonoTests.System.Xml.TestClasses.MapModifiers Modifiers4 =
MonoTests.System.Xml.TestClasses.MapModifiers.Public;{0}" +
+ " public
MonoTests.System.Xml.TestClasses.MapModifiers Modifiers5 =
MonoTests.System.Xml.TestClasses.MapModifiers.Public;{0}" +
" {0}" +
" /// <remarks/>{0}" +
"
[System.Xml.Serialization.XmlAttributeAttribute(\"names\")]{0}" +
@@ -256,10 +439,38 @@
" /// <remarks/>{0}" +
"
[System.Xml.Serialization.XmlAttributeAttribute(\"street\")]{0}" +
" public string Street;{0}" +
+#endif
"}}{0}" +
"{0}" +
"/// <remarks/>{0}" +
"[System.FlagsAttribute()]{0}" +
+#if NET_2_0
+
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Xml\",
\"2.0.50727.42\")]{0}" +
+ "[System.SerializableAttribute()]{0}" +
+#endif
+
"[System.Xml.Serialization.XmlRootAttribute(Namespace=\"\",
IsNullable=false)]{0}" +
+ "public enum FlagEnum {{{0}" +
+ " {0}" +
+ " /// <remarks/>{0}" +
+ "
[System.Xml.Serialization.XmlEnumAttribute(\"one\")]{0}" +
+ " e1 = 1,{0}" +
+ " {0}" +
+ " /// <remarks/>{0}" +
+ "
[System.Xml.Serialization.XmlEnumAttribute(\"two\")]{0}" +
+ " e2 = 2,{0}" +
+ " {0}" +
+ " /// <remarks/>{0}" +
+ "
[System.Xml.Serialization.XmlEnumAttribute(\"four\")]{0}" +
+ " e4 = 4,{0}" +
+ "}}{0}" +
+ "{0}" +
+ "/// <remarks/>{0}" +
+ "[System.FlagsAttribute()]{0}" +
+#if NET_2_0
+
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Xml\",
\"2.0.50727.42\")]{0}" +
+ "[System.SerializableAttribute()]{0}" +
+#endif
+
"[System.Xml.Serialization.XmlRootAttribute(Namespace=\"\",
IsNullable=false)]{0}" +
"public enum MapModifiers {{{0}" +
" {0}" +
" /// <remarks/>{0}" +
@@ -307,7 +518,7 @@
}
[Test]
- [Category ("NotWorking")] // Mono outputs XmlRootAttribute for
SimpleClass too
+ [Category ("NotDotNet")] // // Mono outputs XmlRootAttribute
for member types too
public void ExportTypeMapping_ClassArrayContainer ()
{
CodeNamespace codeNamespace = ExportCode (typeof
(ClassArrayContainer));
@@ -347,6 +558,7 @@
"[System.SerializableAttribute()]{0}" +
"[System.Diagnostics.DebuggerStepThroughAttribute()]{0}" +
"[System.ComponentModel.DesignerCategoryAttribute(\"code\")]{0}" +
+
"[System.Xml.Serialization.XmlRootAttribute(Namespace=\"\",
IsNullable=true)]{0}" +
"public partial class SimpleClass {{{0}" +
" {0}" +
" private string somethingField;{0}" +
@@ -361,7 +573,7 @@
" }}{0}" +
" }}{0}" +
#else
-
"[System.Xml.Serialization.XmlRootAttribute(Namespace=\"\",
IsNullable=true)]{0}" +
+ "[System.Xml.Serialization.XmlRootAttribute(Namespace=\"\",
IsNullable=true)]{0}" +
"public class ClassArrayContainer {{{0}" +
" {0}" +
" /// <remarks/>{0}" +
@@ -369,6 +581,7 @@
"}}{0}" +
"{0}" +
"/// <remarks/>{0}" +
+
"[System.Xml.Serialization.XmlRootAttribute(Namespace=\"\",
IsNullable=true)]{0}" +
"public class SimpleClass {{{0}" +
" {0}" +
" /// <remarks/>{0}" +
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
