Skip to content

Commit

Permalink
Tabs
Browse files Browse the repository at this point in the history
  • Loading branch information
rocknet committed Dec 15, 2011
1 parent 84cc01d commit a1dacbd
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 30 deletions.
10 changes: 5 additions & 5 deletions RestSharp.Tests/SampleClasses/ListSamples.cs
Expand Up @@ -5,11 +5,11 @@

namespace RestSharp.Tests.SampleClasses
{
public class SimpleTypesListSample
{
public List<string> Names { get; set; }
public List<int> Numbers { get; set; }
}
public class SimpleTypesListSample
{
public List<string> Names { get; set; }
public List<int> Numbers { get; set; }
}

public class InlineListSample
{
Expand Down
24 changes: 12 additions & 12 deletions RestSharp.Tests/XmlTests.cs
Expand Up @@ -36,18 +36,18 @@ private string PathFor(string sampleFile)
return Path.Combine(SampleDataPath, sampleFile);
}

[Fact]
public void Can_Deserialize_Lists_of_Simple_Types()
{
var xmlpath = PathFor("xmllists.xml");
var doc = XDocument.Load(xmlpath);

var xml = new XmlDeserializer();
var output = xml.Deserialize<SimpleTypesListSample>(new RestResponse() { Content = doc.ToString() });

Assert.NotEmpty(output.Names);
Assert.NotEmpty(output.Numbers);
}
[Fact]
public void Can_Deserialize_Lists_of_Simple_Types()
{
var xmlpath = PathFor("xmllists.xml");
var doc = XDocument.Load(xmlpath);

var xml = new XmlDeserializer();
var output = xml.Deserialize<SimpleTypesListSample>(new RestResponse() { Content = doc.ToString() });

Assert.NotEmpty(output.Names);
Assert.NotEmpty(output.Numbers);
}

[Fact]
public void Can_Deserialize_To_List_Inheritor_From_Custom_Root_With_Attributes()
Expand Down
26 changes: 13 additions & 13 deletions RestSharp/Deserializers/XmlDeserializer.cs
Expand Up @@ -278,19 +278,19 @@ private object HandleListDerivative(object x, XElement root, string propName, Ty

private object CreateAndMap(Type t, XElement element)
{
object item;
if (t == typeof(String))
{
item = element.Value;
}
else
{
item = Activator.CreateInstance(t);
Map(item, element);
}

return item;
}
object item;
if (t == typeof(String))
{
item = element.Value;
}
else
{
item = Activator.CreateInstance(t);
Map(item, element);
}

return item;
}

private object GetValueFromXml(XElement root, XName name)
{
Expand Down

0 comments on commit a1dacbd

Please sign in to comment.