Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed WithUnknownContent.Continue to account for complex content #522

Merged
merged 1 commit into from
May 25, 2021
Merged

Fixed WithUnknownContent.Continue to account for complex content #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions src/ExtendedXmlSerializer/ExtensionModel/Content/ContinueOnUnknownContent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using ExtendedXmlSerializer.ContentModel.Format;
using ExtendedXmlSerializer.Core;
using ExtendedXmlSerializer.ExtensionModel.Xml;

namespace ExtendedXmlSerializer.ExtensionModel.Content
{
Expand All @@ -11,7 +12,19 @@ sealed class ContinueOnUnknownContent : ICommand<IFormatReader>

public void Execute(IFormatReader parameter)
{
var reader = parameter.Get().To<System.Xml.XmlReader>();
var depth = XmlDepth.Default.Get(reader);

parameter.Content();

if (depth.HasValue)
{
while (XmlDepth.Default.Get(reader) > depth)
{
reader.Skip();
parameter.Set();
}
}
}
}
}
95 changes: 95 additions & 0 deletions test/ExtendedXmlSerializer.Tests.ReportedIssues/Issue521Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
using ExtendedXmlSerializer.Configuration;
using FluentAssertions;
using Xunit;

namespace ExtendedXmlSerializer.Tests.ReportedIssues
{
public sealed class Issue521Tests
{
[Fact]
public void Verify()
{
const string document =
@"<?xml version=""1.0"" encoding=""utf-8""?>
<Issue521Tests-Test>
<Value1>11</Value1>
<Item1>
<Value>1</Value>
</Item1>
<Value2>22</Value2>

</Issue521Tests-Test>";

var serializer = new ConfigurationContainer().EnableImplicitTyping(typeof(Test))
.WithUnknownContent()
.Continue()
//.Call(_ => Console.WriteLine("Unknown content: " + _.Name))
.Create();
var instance = serializer.Deserialize<Test>(document);
instance.Value2.Should().Be(22);
}

[Fact]
public void VerifyComprehensive()
{
const string document =
@"<?xml version=""1.0"" encoding=""utf-8""?>
<Issue521Tests-Test>
<Value1>11</Value1>
<Item1>
<Value>1</Value>
</Item1>
<Value2>22</Value2>
<Items2>
<Capacity>4</Capacity>
<int xmlns=""https://extendedxmlserializer.github.io/system"">1</int>
<int xmlns=""https://extendedxmlserializer.github.io/system"">2</int>
<int xmlns=""https://extendedxmlserializer.github.io/system"">3</int>
</Items2>
<Value3>33</Value3>
<Items3>
<Capacity>4</Capacity>
<Item>
<Value>1</Value>
</Item>
<Item>
<Value>2</Value>
</Item>
<Item>
<Value>3</Value>
</Item>
</Items3>
<Value4>44</Value4>
</Issue521Tests-Test>";

var serializer = new ConfigurationContainer().EnableImplicitTyping(typeof(Test), typeof(Item))
.WithUnknownContent()
.Continue()
//.Call(_ => Console.WriteLine("Unknown content: " + _.Name))
.Create();
var instance = serializer.Deserialize<Test>(document);
instance.Value2.Should().Be(22);
instance.Value3.Should().Be(33);
instance.Value4.Should().Be(44);
}

public class Test
{
public int Value1 { get; set; }

//public Item Item1 { get; set; }
public int Value2 { get; set; }

//public List<int> Items2 { get; set; }
public int Value3 { get; set; }

//public List<Item> Items3 { get; set; }
public int Value4 { get; set; }
}

public class Item
{
public int Value { get; set; }
}
}
}