Re-add a removed test, and some whitespace cleanup.

Author: petejohanson

RestSharp.Tests/XmlTests.cs

@@ -464,7 +464,38 @@ 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 ()
+		{
+			var doc = CreateLowercaseUnderscoresXml ();
+			var response = new RestResponse { Content = doc };
+
+			var d = new XmlDeserializer ();
+			var p = d.Deserialize<PersonForXml> (response);
+
+			Assert.Equal ("John Sheehan", p.Name);
+			Assert.Equal (new DateTime (2009, 9, 25, 0, 6, 1), p.StartDate);
+			Assert.Equal (28, p.Age);
+			Assert.Equal (long.MaxValue, p.BigNumber);
+			Assert.Equal (99.9999m, p.Percent);
+			Assert.Equal (false, p.IsCool);
+			Assert.Equal (new Guid (GuidString), p.UniqueId);
+			Assert.Equal (new Uri ("http://example.com", UriKind.RelativeOrAbsolute), p.Url);
+			Assert.Equal (new Uri ("/foo/bar", UriKind.RelativeOrAbsolute), p.UrlPath);
+
+			Assert.NotNull (p.Friends);
+			Assert.Equal (10, p.Friends.Count);
+
+			Assert.NotNull (p.BestFriend);
+			Assert.Equal ("The Fonz", p.BestFriend.Name);
+			Assert.Equal (1952, p.BestFriend.Since);
+
+			Assert.NotNull (p.Foes);
+			Assert.Equal (5, p.Foes.Count);
+			Assert.Equal ("Yankees", p.Foes.Team);
+		}
 
         [Fact]
 		public void Can_Deserialize_Lower_Cased_Root_Elements_With_Dashes()
@@ -504,11 +535,11 @@ public void Can_Deserialize_Root_Elements_Without_Matching_Case_And_Dashes()
 			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);
+			var p = d.Deserialize<List<IncomingInvoice>>(response);
+
+			Assert.NotNull(p);
+			Assert.Equal(1, p.Count);
+			Assert.Equal(45, p[0].ConceptId);
 		}
 
 
@@ -744,11 +775,11 @@ private static string CreateDashesXml()
         private static string CreateLowerCasedRootElementWithDashesXml()
 		{
             var doc = new XDocument();
-			var root = new XElement("incoming-invoices", 
-                new XElement("incoming-invoice", 
-                    new XElement("concept-id", 45)
-                )
-            );
+			var root = new XElement("incoming-invoices",
+				new XElement("incoming-invoice",
+					new XElement("concept-id", 45)
+				)
+			);
 			doc.Add(root);
 			return doc.ToString();
 		}

RestSharp/Deserializers/XmlDeserializer.cs

@@ -268,13 +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);
-            } 
+			}
+
+			if (!elements.Any())
+			{
+				var lowerName = name.ToLower().AsNamespaced(Namespace);
+				elements = root.Descendants().Where(e => e.Name.LocalName.RemoveUnderscoresAndDashes() == lowerName);
+			}
 
 			PopulateListFromElements(t, elements, list);