You've already forked linux-packaging-mono
Imported Upstream version 5.0.0.42
Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
parent
1190d13a04
commit
6bdd276d05
@@ -46,7 +46,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
Assert.AreEqual (string.Format(CultureInfo.InvariantCulture,
|
||||
"{0}{0}" +
|
||||
"/// <remarks/>{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Xml\", \"{1}\")]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"nunit-lite-console\", \"0.0.0.0\")]{0}" +
|
||||
"[System.SerializableAttribute()]{0}" +
|
||||
"[System.Diagnostics.DebuggerStepThroughAttribute()]{0}" +
|
||||
"[System.ComponentModel.DesignerCategoryAttribute(\"code\")]{0}" +
|
||||
@@ -64,7 +64,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
" this.namesField = value;{0}" +
|
||||
" }}{0}" +
|
||||
" }}{0}" +
|
||||
"}}{0}", Environment.NewLine, XmlFileVersion), sw.ToString (), "#2");
|
||||
"}}{0}", Environment.NewLine), sw.ToString (), "#2");
|
||||
|
||||
|
||||
codeNamespace = ExportCode (typeof (ArrayClass[]));
|
||||
@@ -76,7 +76,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
|
||||
"{0}{0}" +
|
||||
"/// <remarks/>{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Xml\", \"{1}\")]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"nunit-lite-console\", \"0.0.0.0\")]{0}" +
|
||||
"[System.SerializableAttribute()]{0}" +
|
||||
"[System.Diagnostics.DebuggerStepThroughAttribute()]{0}" +
|
||||
"[System.ComponentModel.DesignerCategoryAttribute(\"code\")]{0}" +
|
||||
@@ -93,7 +93,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
" this.namesField = value;{0}" +
|
||||
" }}{0}" +
|
||||
" }}{0}" +
|
||||
"}}{0}", Environment.NewLine, XmlFileVersion), sw.ToString (), "#4");
|
||||
"}}{0}", Environment.NewLine), sw.ToString (), "#4");
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -110,7 +110,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
|
||||
"{0}{0}" +
|
||||
"/// <remarks/>{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Xml\", \"{1}\")]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"nunit-lite-console\", \"0.0.0.0\")]{0}" +
|
||||
"[System.SerializableAttribute()]{0}" +
|
||||
"[System.Diagnostics.DebuggerStepThroughAttribute()]{0}" +
|
||||
"[System.ComponentModel.DesignerCategoryAttribute(\"code\")]{0}" +
|
||||
@@ -128,7 +128,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
" this.itemsField = value;{0}" +
|
||||
" }}{0}" +
|
||||
" }}{0}" +
|
||||
"}}{0}", Environment.NewLine, XmlFileVersion), sw.ToString (), "#2");
|
||||
"}}{0}", Environment.NewLine), sw.ToString (), "#2");
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -145,7 +145,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
|
||||
"{0}{0}" +
|
||||
"/// <remarks/>{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Xml\", \"{1}\")]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"nunit-lite-console\", \"0.0.0.0\")]{0}" +
|
||||
"[System.SerializableAttribute()]{0}" +
|
||||
"[System.Diagnostics.DebuggerStepThroughAttribute()]{0}" +
|
||||
"[System.ComponentModel.DesignerCategoryAttribute(\"code\")]{0}" +
|
||||
@@ -163,7 +163,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
" this.cdataField = value;{0}" +
|
||||
" }}{0}" +
|
||||
" }}{0}" +
|
||||
"}}{0}", Environment.NewLine, XmlFileVersion), sw.ToString (), "#2");
|
||||
"}}{0}", Environment.NewLine), sw.ToString (), "#2");
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -182,7 +182,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
|
||||
"{0}{0}" +
|
||||
"/// <remarks/>{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Xml\", \"{1}\")]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"nunit-lite-console\", \"0.0.0.0\")]{0}" +
|
||||
"[System.SerializableAttribute()]{0}" +
|
||||
"[System.Diagnostics.DebuggerStepThroughAttribute()]{0}" +
|
||||
"[System.ComponentModel.DesignerCategoryAttribute(\"code\")]{0}" +
|
||||
@@ -204,7 +204,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
" this.myChoiceField = value;{0}" +
|
||||
" }}{0}" +
|
||||
" }}{0}" +
|
||||
"}}{0}", Environment.NewLine, XmlFileVersion), sw.ToString (), "#2");
|
||||
"}}{0}", Environment.NewLine), sw.ToString (), "#2");
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -222,7 +222,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
|
||||
"{0}{0}" +
|
||||
"/// <remarks/>{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Xml\", \"{1}\")]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"nunit-lite-console\", \"0.0.0.0\")]{0}" +
|
||||
"[System.SerializableAttribute()]{0}" +
|
||||
"[System.Diagnostics.DebuggerStepThroughAttribute()]{0}" +
|
||||
"[System.ComponentModel.DesignerCategoryAttribute(\"code\")]{0}" +
|
||||
@@ -403,7 +403,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
"{0}" +
|
||||
"/// <remarks/>{0}" +
|
||||
"[System.FlagsAttribute()]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Xml\", \"{1}\")]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"nunit-lite-console\", \"0.0.0.0\")]{0}" +
|
||||
"[System.SerializableAttribute()]{0}" +
|
||||
"public enum MapModifiers {{{0}" +
|
||||
" {0}" +
|
||||
@@ -414,7 +414,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
" /// <remarks/>{0}" +
|
||||
" [System.Xml.Serialization.XmlEnumAttribute(\"protected\")]{0}" +
|
||||
" Protected = 2,{0}" +
|
||||
"}}{0}", Environment.NewLine, XmlFileVersion), sw.ToString (), "#2");
|
||||
"}}{0}", Environment.NewLine), sw.ToString (), "#2");
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -431,7 +431,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
|
||||
"{0}{0}" +
|
||||
"/// <remarks/>{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Xml\", \"{1}\")]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"nunit-lite-console\", \"0.0.0.0\")]{0}" +
|
||||
"[System.SerializableAttribute()]{0}" +
|
||||
"[System.Xml.Serialization.XmlTypeAttribute(IncludeInSchema=false)]{0}" +
|
||||
"[System.Xml.Serialization.XmlRootAttribute(Namespace=\"\", IsNullable=false)]{0}" +
|
||||
@@ -446,7 +446,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
" {0}" +
|
||||
" /// <remarks/>{0}" +
|
||||
" ChoiceTwo,{0}" +
|
||||
"}}{0}", Environment.NewLine, XmlFileVersion), sw.ToString (), "#2");
|
||||
"}}{0}", Environment.NewLine), sw.ToString (), "#2");
|
||||
|
||||
codeNamespace = ExportCode (typeof (ItemChoiceType[]));
|
||||
Assert.IsNotNull (codeNamespace, "#3");
|
||||
@@ -457,7 +457,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
|
||||
"{0}{0}" +
|
||||
"/// <remarks/>{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Xml\", \"{1}\")]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"nunit-lite-console\", \"0.0.0.0\")]{0}" +
|
||||
"[System.SerializableAttribute()]{0}" +
|
||||
"[System.Xml.Serialization.XmlTypeAttribute(IncludeInSchema=false)]{0}" +
|
||||
"public enum ItemChoiceType {{{0}" +
|
||||
@@ -471,7 +471,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
" {0}" +
|
||||
" /// <remarks/>{0}" +
|
||||
" ChoiceTwo,{0}" +
|
||||
"}}{0}", Environment.NewLine, XmlFileVersion), sw.ToString (), "#4");
|
||||
"}}{0}", Environment.NewLine), sw.ToString (), "#4");
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -488,7 +488,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
|
||||
"{0}{0}" +
|
||||
"/// <remarks/>{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Xml\", \"{1}\")]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"nunit-lite-console\", \"0.0.0.0\")]{0}" +
|
||||
"[System.SerializableAttribute()]{0}" +
|
||||
"[System.Diagnostics.DebuggerStepThroughAttribute()]{0}" +
|
||||
"[System.ComponentModel.DesignerCategoryAttribute(\"code\")]{0}" +
|
||||
@@ -509,7 +509,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
"}}{0}" +
|
||||
"{0}" +
|
||||
"/// <remarks/>{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Xml\", \"{1}\")]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"nunit-lite-console\", \"0.0.0.0\")]{0}" +
|
||||
"[System.SerializableAttribute()]{0}" +
|
||||
"[System.Diagnostics.DebuggerStepThroughAttribute()]{0}" +
|
||||
"[System.ComponentModel.DesignerCategoryAttribute(\"code\")]{0}" +
|
||||
@@ -526,7 +526,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
" this.somethingField = value;{0}" +
|
||||
" }}{0}" +
|
||||
" }}{0}" +
|
||||
"}}{0}", Environment.NewLine, XmlFileVersion), sw.ToString (), "#2");
|
||||
"}}{0}", Environment.NewLine), sw.ToString (), "#2");
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -544,7 +544,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
|
||||
"{0}{0}" +
|
||||
"/// <remarks/>{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Xml\", \"{1}\")]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"nunit-lite-console\", \"0.0.0.0\")]{0}" +
|
||||
"[System.SerializableAttribute()]{0}" +
|
||||
"[System.Diagnostics.DebuggerStepThroughAttribute()]{0}" +
|
||||
"[System.ComponentModel.DesignerCategoryAttribute(\"code\")]{0}" +
|
||||
@@ -578,7 +578,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
"}}{0}" +
|
||||
"{0}" +
|
||||
"/// <remarks/>{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Xml\", \"{1}\")]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"nunit-lite-console\", \"0.0.0.0\")]{0}" +
|
||||
"[System.SerializableAttribute()]{0}" +
|
||||
"[System.Diagnostics.DebuggerStepThroughAttribute()]{0}" +
|
||||
"[System.ComponentModel.DesignerCategoryAttribute(\"code\")]{0}" +
|
||||
@@ -667,7 +667,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
"{0}" +
|
||||
"/// <remarks/>{0}" +
|
||||
"[System.FlagsAttribute()]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Xml\", \"{1}\")]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"nunit-lite-console\", \"0.0.0.0\")]{0}" +
|
||||
"[System.SerializableAttribute()]{0}" +
|
||||
"[System.Xml.Serialization.XmlTypeAttribute(Namespace=\"some:urn\")]{0}" +
|
||||
"public enum FlagEnum {{{0}" +
|
||||
@@ -786,7 +786,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
"{0}" +
|
||||
"/// <remarks/>{0}" +
|
||||
"[System.FlagsAttribute()]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Xml\", \"{1}\")]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"nunit-lite-console\", \"0.0.0.0\")]{0}" +
|
||||
"[System.SerializableAttribute()]{0}" +
|
||||
"[System.Xml.Serialization.XmlTypeAttribute(Namespace=\"urn:myNS\")]{0}" +
|
||||
"public enum FlagEnum {{{0}" +
|
||||
@@ -806,7 +806,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
"{0}" +
|
||||
"/// <remarks/>{0}" +
|
||||
"[System.FlagsAttribute()]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Xml\", \"{1}\")]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"nunit-lite-console\", \"0.0.0.0\")]{0}" +
|
||||
"[System.SerializableAttribute()]{0}" +
|
||||
"[System.Xml.Serialization.XmlTypeAttribute(Namespace=\"urn:myNS\")]{0}" +
|
||||
"public enum FlagEnum_Encoded {{{0}" +
|
||||
@@ -819,7 +819,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
" {0}" +
|
||||
" /// <remarks/>{0}" +
|
||||
" e4 = 4,{0}" +
|
||||
"}}{0}", Environment.NewLine, XmlFileVersion), sw.ToString (), "#2");
|
||||
"}}{0}", Environment.NewLine), sw.ToString (), "#2");
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -836,7 +836,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
Assert.AreEqual (string.Format (CultureInfo.InvariantCulture,
|
||||
"{0}{0}" +
|
||||
"/// <remarks/>{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Xml\", \"{1}\")]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"nunit-lite-console\", \"0.0.0.0\")]{0}" +
|
||||
"[System.SerializableAttribute()]{0}" +
|
||||
"[System.Diagnostics.DebuggerStepThroughAttribute()]{0}" +
|
||||
"[System.ComponentModel.DesignerCategoryAttribute(\"code\")]{0}" +
|
||||
@@ -855,7 +855,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
" this.somethingField = value;{0}" +
|
||||
" }}{0}" +
|
||||
" }}{0}" +
|
||||
"}}{0}", Environment.NewLine, XmlFileVersion), sw.ToString (), "#2");
|
||||
"}}{0}", Environment.NewLine), sw.ToString (), "#2");
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -909,7 +909,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
"{0}{0}" +
|
||||
"/// <remarks/>{0}" +
|
||||
"[System.FlagsAttribute()]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"System.Xml\", \"{1}\")]{0}" +
|
||||
"[System.CodeDom.Compiler.GeneratedCodeAttribute(\"nunit-lite-console\", \"0.0.0.0\")]{0}" +
|
||||
"[System.SerializableAttribute()]{0}" +
|
||||
"[System.Xml.Serialization.XmlRootAttribute(Namespace=\"\", IsNullable=false)]{0}" +
|
||||
"public enum ZeroFlagEnum {{{0}" +
|
||||
@@ -925,7 +925,7 @@ namespace MonoTests.System.XmlSerialization
|
||||
" /// <remarks/>{0}" +
|
||||
" [System.Xml.Serialization.XmlEnumAttribute(\"tns:t<w>o\")]{0}" +
|
||||
" e2 = 4,{0}" +
|
||||
"}}{0}", Environment.NewLine, XmlFileVersion), sw.ToString (), "#2");
|
||||
"}}{0}", Environment.NewLine), sw.ToString (), "#2");
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -1005,15 +1005,6 @@ namespace MonoTests.System.XmlSerialization
|
||||
return codeNamespace;
|
||||
}
|
||||
|
||||
string XmlFileVersion {
|
||||
get {
|
||||
Assembly xmlAsm = typeof (XmlDocument).Assembly;
|
||||
AssemblyFileVersionAttribute afv = (AssemblyFileVersionAttribute)
|
||||
Attribute.GetCustomAttribute (xmlAsm, typeof (AssemblyFileVersionAttribute));
|
||||
return afv.Version;
|
||||
}
|
||||
}
|
||||
|
||||
[XmlRootAttribute ("root", Namespace="urn:aNS", IsNullable=false)]
|
||||
public class Root
|
||||
{
|
||||
|
4
mcs/class/System.XML/Test/System.Xml.Serialization/XmlReflectionImporterTests.cs
Normal file → Executable file
4
mcs/class/System.XML/Test/System.Xml.Serialization/XmlReflectionImporterTests.cs
Normal file → Executable file
@@ -2052,8 +2052,8 @@ namespace MonoTests.System.XmlSerialization
|
||||
serializer.Serialize (writer, obj);
|
||||
writer.Close ();
|
||||
|
||||
Assert.AreEqual (@"<?xml version=""1.0"" encoding=""utf-16""?>
|
||||
<Bug594490Class xmlns:xsd=""http://www.w3.org/2001/XMLSchema"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xml:lang=""hello world"" />",
|
||||
Assert.AreEqual (@"<?xml version=""1.0"" encoding=""utf-16""?>" + Environment.NewLine +
|
||||
@"<Bug594490Class xmlns:xsd=""http://www.w3.org/2001/XMLSchema"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xml:lang=""hello world"" />",
|
||||
writer.ToString (),
|
||||
"Novell bug #594490 (https://bugzilla.novell.com/show_bug.cgi?id=594490) not fixed.");
|
||||
}
|
||||
|
@@ -1 +1 @@
|
||||
bdd08aa7c69f5101ca4b85479f374d3da2f89b16
|
||||
61835e709a09541daa56c89b501efc256c0ba3c1
|
Reference in New Issue
Block a user