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
6 changes: 5 additions & 1 deletion RestSharp.Tests/NamespacedXmlTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,11 @@ private static string CreateElementsXml() {
new XElement(ns + "Since", DateTime.Now.Year - i)
));
}
root.Add(friends);
root.Add(friends);

root.Add(new XElement(ns + "FavoriteBand",
new XElement(ns + "Name", "Goldfinger")
));

doc.Add(root);
return doc.ToString();
Expand Down
5 changes: 5 additions & 0 deletions RestSharp.Tests/SampleClasses/misc.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ public class PersonForXml
public Order Order { get; set; }

public Disposition Disposition { get; set; }
public Band FavoriteBand { get; set; }
public class Band
{
public string Name { get; set; }
}

}

Expand Down
15 changes: 15 additions & 0 deletions RestSharp.Tests/XmlAttributeDeserializerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,18 @@ public void Can_Deserialize_Custom_Formatted_Date()

Assert.Equal(date, output.StartDate);
}
[Fact]
public void Can_Deserialize_Nested_Class()
{
var doc = CreateElementsXml();
var response = new RestResponse { Content = doc };

var d = new XmlAttributeDeserializer();
var p = d.Deserialize<PersonForXml>(response);

Assert.NotNull(p.FavoriteBand);
Assert.Equal("Goldfinger",p.FavoriteBand.Name);
}
[Fact]
public void Can_Deserialize_Elements_On_Default_Root()
{
Expand Down Expand Up @@ -839,6 +850,10 @@ private static string CreateElementsXml()
}
root.Add(friends);

root.Add(new XElement("FavoriteBand",
new XElement("Name", "Goldfinger")
));

doc.Add(root);
return doc.ToString();
}
Expand Down
4 changes: 2 additions & 2 deletions RestSharp/Deserializers/XmlDeserializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ protected virtual void Map(object x, XElement root)
foreach (var prop in props)
{
var type = prop.PropertyType;

if (!type.IsPublic || !prop.CanWrite)
var typeIsPublic = type.IsPublic || type.IsNestedPublic;
if (!typeIsPublic || !prop.CanWrite)
continue;

var name = prop.Name.AsNamespaced(Namespace);
Expand Down