mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 6.6.0.97

Browse Source 
Former-commit-id: 36b6262d38adef7275aee46c9258ae34f9e3fb39
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-09-25 09:31:28 +00:00
parent 95fdb59ea6
commit 15bdb7a527
66 changed files with 244 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReaderInterpreter.cs
View File

@@ -204,9 +204,11 @@ namespace System.Xml.Serialization
{
if (isNullable && ReadNull()) return null;
if (checkType) {
System.Xml.XmlQualifiedName t = GetXsiType();
if (t != null) {
if (checkType)
{
System.Xml.XmlQualifiedName t = GetXsiType();
if (t != null)
{
XmlTypeMapping realMap = typeMap.GetRealElementMap (t.Name, t.Namespace);
if (realMap == null) {
if (typeMap.TypeData.Type == typeof(object))
@@ -219,12 +221,7 @@ namespace System.Xml.Serialization
}
else if (typeMap.TypeData.Type == typeof(object))
return ReadTypedPrimitive (AnyType);
else {
XmlTypeMapping realMap = typeMap.GetRealElementMap (Reader.LocalName, Reader.NamespaceURI);
if (realMap != null && realMap != typeMap)
return ReadObject(realMap, false, false);
}
}
}
object ob = CreateInstance (typeMap.TypeData.Type, true);

24
mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapping.cs
View File

@@ -389,7 +389,7 @@ namespace System.Xml.Serialization
return (XmlTypeMapMemberAttribute)_attributeMembers [BuildKey (name,ns, -1)];
}
public XmlTypeMapElementInfo GetElement (string name, string ns, int minimalOrder)
public XmlTypeMapElementInfo GetElement(string name, string ns, int minimalOrder)
{
if (_elements == null)
return null;
@@ -404,38 +404,22 @@ namespace System.Xml.Serialization
selected = info;
}
}
else if (info.MappedType != null && info.MappedType.DerivedTypes.Count > 0) {
foreach (XmlTypeMapping derrivedInfo in info.MappedType.DerivedTypes) {
if (derrivedInfo.ElementName == name && derrivedInfo.Namespace == ns) {
if (info.ExplicitOrder < minimalOrder)
continue;
if (selected == null || selected.ExplicitOrder > info.ExplicitOrder) {
selected = info;
}
}
}
}
}
return selected;
}
public XmlTypeMapElementInfo GetElement (string name, string ns)
public XmlTypeMapElementInfo GetElement(string name, string ns)
{
if (_elements == null) return null;
foreach (XmlTypeMapElementInfo info in _elements.Values)
if (info.ElementName == name && info.Namespace == ns)
return info;
else if (info.MappedType != null && info.MappedType.DerivedTypes.Count > 0) {
foreach (XmlTypeMapping derrivedInfo in info.MappedType.DerivedTypes)
if (derrivedInfo.ElementName == name && derrivedInfo.Namespace == ns)
return info;
}
return null;
}
public XmlTypeMapElementInfo GetElement (int index)
{
if (_elements == null) return null;

49
mcs/class/System.XML/Test/System.Xml.Serialization/DeserializeTests.cs
View File

@@ -14,6 +14,7 @@
using System;
using System.Globalization;
using System.IO;
using System.Text;
using System.Xml;
using System.Xml.Serialization;
using NUnit.Framework;
@@ -1686,28 +1687,40 @@ namespace MonoTests.System.XmlSerialization
Assert.AreEqual ("b", d.Extra[1]);
}
[Test] // PR #11194
public void TestDerrivedClassProperty ()
// https://github.com/mono/mono/issues/16918
[Test]
public void Bug16918 ()
{
var data = "<layout width=\".25\" height =\".25\" x=\"0\" y=\"0\" id=\"portrait\" class=\"render\"><background color=\"white\"><div x=\".03\" y=\".05\" width=\".94\" height =\".9\" layout=\"proportional_rows\" paddingX=\".01\" paddingY=\".02\"><background color=\"black\"></background><background color=\"gray\" padding=\".1\"><label color=\"white\" font=\"emulogic.ttf\" fontSize=\"15\">Test UI</label></background><br brSize=\"1\" /><background class=\"back,Lab\" color=\"green\"><label class=\"Lab\" color=\"white\" font=\"emulogic.ttf\" fontSize=\"15\">GREEN</label></background><background color=\"red\"><label class=\"Lab\" color=\"white\" font=\"emulogic.ttf\" fontSize=\"15\">RED</label></background><background color=\"blue\"><label class=\"Lab\" color=\"white\" font=\"emulogic.ttf\" fontSize=\"15\">TLUE</label></background><background color=\"blue\"><label class=\"Lab\" color=\"white\" font=\"emulogic.ttf\" fontSize=\"15\">BLUE</label></background></div></background></layout>";
PropertiesWithSameNameAsTheirType testObject = new PropertiesWithSameNameAsTheirType ()
{
E1 = E1.Two,
E2 = E2.Two,
E3 = E3.Two,
E4 = E4.Two,
E5 = E5.Two
};
XmlAttributeOverrides overrides = PR11194.GenerateLayoutOverrides<PR11194ChildLo>();
XmlSerializer serializer = new XmlSerializer (typeof (PropertiesWithSameNameAsTheirType));
var result = Deserialize(typeof(PR11194ChildLo), data, overrides) as PR11194ChildLo;
// serialize
string serializedObject;
using (MemoryStream memoryStream = new MemoryStream ())
{
serializer.Serialize (memoryStream, testObject);
serializedObject = Encoding.UTF8.GetString (memoryStream.ToArray ());
}
PR11194Parent2 child;
Assert.IsNotNull(result, "#11194_1");
Assert.AreEqual(1, result.children.Count, "#11194_2");
child = result.children[0] as PR11194Parent2;
Assert.IsNotNull(child, "#11194_3");
Assert.AreEqual(1, child.children.Count, "#11194_4");
child = child.children[0] as PR11194Parent2;
Assert.IsNotNull(child, "#11194_5");
Assert.AreEqual(7, child.children.Count, "#11194_6");
child = child.children[1] as PR11194Parent2;
Assert.IsNotNull(child, "#11194_7");
Assert.AreEqual(1, child.children.Count, "#11194_8");
Assert.AreEqual("PR11194ChildL", child.children[0].GetType().Name, "#11194_9");
PropertiesWithSameNameAsTheirType deserializedObject;
using (MemoryStream memoryStream = new MemoryStream (Encoding.UTF8.GetBytes (serializedObject)))
{
deserializedObject = (PropertiesWithSameNameAsTheirType)serializer.Deserialize (memoryStream);
}
Assert.AreEqual (testObject.E1, deserializedObject.E1, "#1");
Assert.AreEqual (testObject.E2, deserializedObject.E2, "#2");
Assert.AreEqual (testObject.E3, deserializedObject.E3, "#3");
Assert.AreEqual (testObject.E4, deserializedObject.E4, "#4");
Assert.AreEqual (testObject.E5, deserializedObject.E5, "#5");
}
}
}

161
mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTestClasses.cs
View File

@@ -12,8 +12,6 @@
//
using System;
using System.Linq;
using System.Reflection;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
@@ -1207,157 +1205,54 @@ namespace MonoTests.System.Xml.TestClasses
}
}
#region PR_11194
#region PR_11194_GenerateOverrides
public static class PR11194
[Serializable]
public class PropertiesWithSameNameAsTheirType
{
public static XmlAttributeOverrides GenerateLayoutOverrides<T>()
public PropertiesWithSameNameAsTheirType ()
{
Type tType = typeof(T);
TypeInfo tTypeInfo = tType.GetTypeInfo();
IEnumerable<PropertyInfo> props = tType.GetRuntimeProperties();
XmlAttributeOverrides overrides = new XmlAttributeOverrides();
foreach (PropertyInfo prop in props) {
XmlDerrivedAttribute attr = prop.GetCustomAttribute<XmlDerrivedAttribute>();
if (attr == null) {
continue;
}
Type dType = prop.DeclaringType;
Type pType = prop.PropertyType;
TypeInfo pTypeInfo = pType.GetTypeInfo();
Type enumType = typeof(IEnumerable<>);
if (pTypeInfo.IsGenericType
&& pTypeInfo.ImplementedInterfaces.Any(t =>
(t.GetTypeInfo().IsGenericType && t.GetGenericTypeDefinition() == enumType))) {
pType = pType.GenericTypeArguments[0];
}
XmlAttributes overrideAttributes = GenerateOverrideAttributes(dType, pType, attr);
overrides.Add(dType, prop.Name, overrideAttributes);
}
return overrides;
}
private static XmlAttributes GenerateOverrideAttributes (Type declaringType, Type propertyType, XmlDerrivedAttribute attr)
{
XmlAttributes xAttrs = new XmlAttributes();
public object obj1 { get; set; }
public object obj2 { get; set; }
public object obj3 { get; set; }
public object obj4 { get; set; }
public object obj5 { get; set; }
Assembly a = declaringType.GetTypeInfo().Assembly;
TypeInfo interfaceType = propertyType.GetTypeInfo();
IEnumerable<Type> types = a.ExportedTypes.Where(t => interfaceType.IsAssignableFrom(t.GetTypeInfo()) && !t.GetTypeInfo().IsAbstract);
foreach (Type t in types) {
string name = NameBySourceType(t, attr.SrcType);// t.GetTypeInfo().GetCustomAttribute<XmlTypeAttribute>().TypeName;
XmlElementAttribute xAttr = new XmlElementAttribute();
xAttr.ElementName = name;
xAttr.Type = t;
xAttrs.XmlElements.Add(xAttr);
}
return xAttrs;
}
private static string NameBySourceType (Type derrivedType, XmlDerrivedSourceType srcType)
{
string name = null;
switch (srcType)
{
case XmlDerrivedSourceType.ByXmlType:
name = derrivedType.GetTypeInfo().GetCustomAttribute<XmlTypeAttribute>().TypeName;
break;
}
return name;
}
public E1 E1 { get; set; }
public E2 E2 { get; set; }
public E3 E3 { get; set; }
public E4 E4 { get; set; }
public E5 E5 { get; set; }
}
#endregion
#region helperAttribute
public enum XmlDerrivedSourceType
public enum E1
{
ByXmlType
One,
Two,
}
public class XmlDerrivedAttribute : Attribute
public enum E2
{
public XmlDerrivedSourceType SrcType { get; set; }
public XmlDerrivedAttribute(XmlDerrivedSourceType srcType)
{
SrcType = srcType;
}
One,
Two,
}
#endregion
public abstract class PR11194Parent
public enum E5
{
[XmlIgnore]
public PR11194Parent Parent { get; set; }
One,
Two,
}
public abstract class PR11194Parent2 : PR11194Parent
public enum E3
{
[XmlAttribute]
public float width { get; set; }
[XmlAttribute]
public float height { get; set; }
[XmlAttribute]
public float x { get; set; }
[XmlAttribute]
public float y { get; set; }
[XmlAttribute]
public string id { get; set; }
[XmlElement]
[XmlDerrived(XmlDerrivedSourceType.ByXmlType)]
public List<PR11194Parent> children { get; set; }
One,
Two,
}
[XmlType("background")]
public class PR11194ChildB : PR11194Parent2
public enum E4
{
[XmlAttribute]
public string image { get; set; }
One,
Two,
}
[XmlType("br")]
public class PR11194ChildBr : PR11194Parent
{
[XmlAttribute("brSize")]
public int breaks { get; set; }
}
[XmlType("div")]
public class PR11194ChildD : PR11194ChildLo
{
}
[XmlType("label")]
public class PR11194ChildL : PR11194Parent2
{
[XmlAttribute]
public string font { get; set; }
[XmlAttribute]
public int fontSize { get; set; }
[XmlText]
public string Text { get; set; }
}
[XmlType("layout")]
public class PR11194ChildLo : PR11194Parent2
{
}
#endregion
}