Fix unit tests

Author: lycilph

RestSharp/Deserializers/XmlDeserializer.cs

@@ -453,50 +453,27 @@ protected virtual XElement GetElementByName(XElement root, XName name)
             }
 
             // try looking for element that matches sanitized property name (Order by depth)
-            var element =
-                root.Descendants()
-                    .OrderBy(d => d.Ancestors().Count())
-                    .FirstOrDefault(d => d.Name.LocalName.RemoveUnderscoresAndDashes() == name.LocalName) ?? root.Descendants()
-                    .OrderBy(d => d.Ancestors().Count())
-                    .FirstOrDefault(d => d.Name.LocalName.RemoveUnderscoresAndDashes() == name.LocalName.ToLower());
-
-            if (element != null)
-            {
-                return element;
-            }
-
-            return null;
+            return root.Descendants()
+                       .OrderBy(d => d.Ancestors().Count())
+                       .FirstOrDefault(d => d.Name.LocalName.RemoveUnderscoresAndDashes() == name.LocalName) ?? 
+                   root.Descendants()
+                       .OrderBy(d => d.Ancestors().Count())
+                       .FirstOrDefault(d => d.Name.LocalName.RemoveUnderscoresAndDashes() == name.LocalName.ToLower());
         }
 
         protected virtual XAttribute GetAttributeByName(XElement root, XName name)
         {
-            var lower_name = name.LocalName.ToLower().AsNamespaced(name.NamespaceName);
-            var camel_name = name.LocalName.ToCamelCase(Culture).AsNamespaced(name.NamespaceName);
-
-            if (root.Attribute(name) != null)
+            var names = new List<XName>
             {
-                return root.Attribute(name);
-            }
+                name.LocalName,
+                name.LocalName.ToLower().AsNamespaced(name.NamespaceName),
+                name.LocalName.ToCamelCase(Culture).AsNamespaced(name.NamespaceName)
+            };
 
-            if (root.Attribute(lower_name) != null)
-            {
-                return root.Attribute(lower_name);
-            }
-
-            if (root.Attribute(camel_name) != null)
-            {
-                return root.Attribute(camel_name);
-            }
-
-            // try looking for element that matches sanitized property name
-            return root.Descendants()
+            return root.DescendantsAndSelf()
                        .OrderBy(d => d.Ancestors().Count())
                        .Attributes()
-                       .FirstOrDefault(d => d.Name.LocalName.RemoveUnderscoresAndDashes() == name.LocalName) ??
-                   root.Descendants()
-                       .OrderBy(d => d.Ancestors().Count())
-                       .Attributes()
-                       .FirstOrDefault(d => d.Name.LocalName.RemoveUnderscoresAndDashes() == name.LocalName.ToLower());
+                       .FirstOrDefault(d => names.Contains(d.Name.LocalName.RemoveUnderscoresAndDashes()));
         }
     }
 }