Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/ExtendedXmlSerializer/ExtensionModel/Defaults.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,8 @@ static class Defaults
= new CompositeTypeComparer(ImplementedTypeComparer.Default,
TypeIdentityComparer.Default,
InheritedTypeComparer.Default);

public static ITypeComparer SpecificTypeComparer { get; }
= new CompositeTypeComparer(TypeIdentityComparer.Default, InheritedTypeComparer.Default);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace ExtendedXmlSerializer.ExtensionModel.Xml
{
sealed class CustomSerializers : Metadata<TypeInfo, ContentModel.ISerializer>, ICustomSerializers
{
public CustomSerializers() : this(ExtensionModel.Defaults.TypeComparer) {}
public CustomSerializers() : this(ExtensionModel.Defaults.SpecificTypeComparer) {}

public CustomSerializers(IEqualityComparer<TypeInfo> comparer) : base(comparer) {}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ namespace ExtendedXmlSerializer.ExtensionModel.Xml
{
sealed class CustomXmlSerializers : Metadata<TypeInfo, IExtendedXmlCustomSerializer>, ICustomXmlSerializers
{
public CustomXmlSerializers() : base(ReflectionModel.Defaults.TypeComparer) {}
public CustomXmlSerializers() : base(ExtensionModel.Defaults.SpecificTypeComparer) {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ namespace ExtendedXmlSerializer.ExtensionModel.Xml
{
sealed class MemberCustomSerializers : Metadata<MemberInfo, ContentModel.ISerializer>, ICustomMemberSerializers
{
public MemberCustomSerializers() : base(MemberComparer.Default) {}
public MemberCustomSerializers() : base(new MemberComparer(ExtensionModel.Defaults.SpecificTypeComparer)) {}
}
}
58 changes: 58 additions & 0 deletions test/ExtendedXmlSerializer.Tests.ReportedIssues/Issue657Tests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
using ExtendedXmlSerializer.Configuration;
using ExtendedXmlSerializer.ContentModel;
using ExtendedXmlSerializer.ContentModel.Format;
using ExtendedXmlSerializer.Tests.ReportedIssues.Support;
using FluentAssertions;
using System.Collections.Generic;
using System.Xml.Serialization;
using Xunit;

namespace ExtendedXmlSerializer.Tests.ReportedIssues;

public sealed class Issue657Tests
{
[Fact]
public void Verify()
{
var subject = new ConfigurationContainer()
.EnableImplicitTyping(typeof(ClsItem), typeof(ClsArray))
.Type<ClsItem>().Register().Serializer().Using(new ClsItemSerializer()) //.CustomSerializer(new ClsItemSerializer())
.Create().ForTesting();
var content =
@"<?xml version=""1.0"" encoding=""utf-8""?><main xmlns=""clr-namespace:ExtendedXmlSerializer.Tests.ReportedIssues;assembly=ExtendedXmlSerializer.Tests.ReportedIssues""><Capacity>4</Capacity><array><Capacity>4</Capacity><item><Dataname>tank</Dataname></item></array></main>";
var instance = new ClsRoot() { new ClsArray() { new ClsItem(){ Dataname = "tank" } } };
subject.Deserialize<ClsRoot>(content).Should().BeEquivalentTo(instance);

}


public interface IDataElement
{
string Dataname { get; set; }
}

[XmlRoot("main")]
public class ClsRoot : List<IDataElement>
{

}
[XmlType("array")]
public class ClsArray : List<ClsItem>, IDataElement
{
public string Dataname { get ; set; }
}
[XmlType("item")]
public class ClsItem : IDataElement
{
public string Dataname { get; set; }
}


class ClsItemSerializer : ISerializer<ClsItem>
{
public ClsItem Get(IFormatReader parameter) => new();

public void Write(IFormatWriter writer, ClsItem instance) {}
}
}