Skip to content

Fix for XmlDeserializer issue not handling lowercase + dash root elements in some cases #279

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

Merged
merged 5 commits into from
Jul 5, 2012
Merged

Fix for XmlDeserializer issue not handling lowercase + dash root elements in some cases #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b3e1a3d
XmlDeserializer.HandleListDerivative does not try the lowercased, "un…
zidad Jan 20, 2012
98aedaa
Merge branch 'master' of github.com:restsharp/RestSharp
zidad Feb 22, 2012
2e25324
Merge branch 'master' of https://github.com/restsharp/RestSharp
zidad May 9, 2012
320f481
Merge branch 'master' of https://github.com/restsharp/RestSharp
zidad May 16, 2012
322d37b
Added a fix and a unit test for the issue:
zidad May 16, 2012
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
5 changes: 5 additions & 0 deletions RestSharp.Tests/SampleClasses/misc.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ public class PersonForXml
public Disposition Disposition { get; set; }

}

public class IncomingInvoice
{
public int ConceptId { get; set; }
}

public class PersonForJson
{
Expand Down
36 changes: 31 additions & 5 deletions RestSharp.Tests/XmlTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,12 +464,12 @@ public void Can_Deserialize_Names_With_Dashes_On_Default_Root()
Assert.NotNull(p.Foes);
Assert.Equal(5, p.Foes.Count);
Assert.Equal("Yankees", p.Foes.Team);
}

[Fact]
public void Can_Deserialize_Names_With_Underscores_Without_Matching_Case_On_Default_Root()
}
[Fact]
public void Can_Deserialize_Lower_Cased_Root_Elements_With_Dashes()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of removing this existing test for LowercaseUnderscores, can we supplement the lowercase underscores test with an additional test for dashes? Doing so will help us ensure both deserialization approaches stay working after future changes.

{
var doc = CreateLowercaseUnderscoresXml();
var doc = CreateDashesXml();
var response = new RestResponse { Content = doc };

var d = new XmlDeserializer();
Expand Down Expand Up @@ -497,6 +497,20 @@ public void Can_Deserialize_Names_With_Underscores_Without_Matching_Case_On_Defa
Assert.Equal("Yankees", p.Foes.Team);
}

[Fact]
public void Can_Deserialize_Root_Elements_Without_Matching_Case_And_Dashes()
{
var doc = CreateLowerCasedRootElementWithDashesXml();
var response = new RestResponse { Content = doc };

var d = new XmlDeserializer();
var p = d.Deserialize<List<IncomingInvoice>>(response);

Assert.NotNull(p);
Assert.Equal(1, p.Count);
Assert.Equal(45, p[0].ConceptId);
}


[Fact]
public void Can_Deserialize_Eventful_Xml()
Expand Down Expand Up @@ -726,6 +740,18 @@ private static string CreateDashesXml()
doc.Add(root);
return doc.ToString();
}

private static string CreateLowerCasedRootElementWithDashesXml()
{
var doc = new XDocument();
var root = new XElement("incoming-invoices",
new XElement("incoming-invoice",
new XElement("concept-id", 45)
)
);
doc.Add(root);
return doc.ToString();
}

private static string CreateElementsXml()
{
Expand Down
9 changes: 8 additions & 1 deletion RestSharp/Deserializers/XmlDeserializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ private object HandleListDerivative(object x, XElement root, string propName, Ty
var elements = root.Descendants(t.Name.AsNamespaced(Namespace));

var name = t.Name;

if (!elements.Any())
{
var lowerName = name.ToLower().AsNamespaced(Namespace);
Expand All @@ -267,7 +268,13 @@ private object HandleListDerivative(object x, XElement root, string propName, Ty
if (!elements.Any())
{
elements = root.Descendants().Where(e => e.Name.LocalName.RemoveUnderscoresAndDashes() == name);
}
}

if (!elements.Any())
{
var lowerName = name.ToLower().AsNamespaced(Namespace);
elements = root.Descendants().Where(e => e.Name.LocalName.RemoveUnderscoresAndDashes() == lowerName);
}

PopulateListFromElements(t, elements, list);

Expand Down