merging upstream

Author: johnsheehan

RestSharp.IntegrationTests/oAuth1Tests.cs

@@ -1,5 +1,7 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Xml.Serialization;
+using RestSharp.Authenticators.OAuth;
 using Xunit;
 using System.Net;
 using RestSharp.Contrib;
@@ -160,5 +162,14 @@ public void Can_Authenticate_Netflix_With_OAuth()
 			Assert.NotNull(queueResponse.Data);
 			Assert.Equal(2, queueResponse.Data.Items.Count);
 		}
+
+        [Fact]
+        public void Properly_Encodes_Parameter_Names()
+        {
+            var postData = new WebParameterCollection { { "name[first]", "Chuck" }, { "name[last]", "Testa" }};
+            var sortedParams = OAuthTools.SortParametersExcludingSignature(postData);
+
+            Assert.Equal("name%5Bfirst%5D", sortedParams[0].Name);
+        }
 	}
 }

RestSharp.Tests/SampleClasses/ListSamples.cs

@@ -18,6 +18,12 @@ public class NestedListSample
 		public List<Image> Images { get; set; }
 	}
 
+	public class EmptyListSample
+	{
+		public List<image> images { get; set; }
+		public List<Image> Images { get; set; }
+	}
+
 	public class Image
 	{
 		public string Src { get; set; }

RestSharp.Tests/XmlTests.cs

@@ -180,6 +180,34 @@ public void Can_Deserialize_Nested_List_Items_With_Matching_Class_Name()
 			Assert.Equal(4, output.images.Count);
 		}
 
+		[Fact]
+		public void Can_Deserialize_Nested_List_Without_Elements_To_Empty_List()
+		{
+			var doc = CreateXmlWithEmptyNestedList();
+
+			var xml = new XmlDeserializer();
+			var output = xml.Deserialize<EmptyListSample>(new RestResponse { Content = doc });
+
+			Assert.NotNull(output.images);
+			Assert.NotNull(output.Images);
+			Assert.Empty(output.images);
+			Assert.Empty(output.Images);
+		}
+
+		[Fact]
+		public void Can_Deserialize_Inline_List_Without_Elements_To_Empty_List()
+		{
+			var doc = CreateXmlWithEmptyInlineList();
+
+			var xml = new XmlDeserializer();
+			var output = xml.Deserialize<EmptyListSample>(new RestResponse { Content = doc });
+
+			Assert.NotNull(output.images);
+			Assert.NotNull(output.Images);
+			Assert.Empty(output.images);
+			Assert.Empty(output.Images);
+		}
+
 		[Fact]
 		public void Can_Deserialize_Empty_Elements_to_Nullable_Values()
 		{
@@ -447,38 +475,38 @@ public void Can_Deserialize_Google_Weather_Xml()
 			var response = new RestResponse { Content = doc.ToString() };
 
 			var d = new XmlDeserializer();
-            var output = d.Deserialize<SampleClasses.xml_api_reply>(response);
+			var output = d.Deserialize<SampleClasses.xml_api_reply>(response);
 
 			Assert.NotEmpty(output.weather);
 			Assert.Equal(4, output.weather.Count);
 			Assert.Equal("Sunny", output.weather[0].condition.data);
 		}
 
-        [Fact]
-        public void Can_Deserialize_Boolean_From_Number()
-        {
-            var xmlpath = PathFor("boolean_from_number.xml");
-            var doc = XDocument.Load(xmlpath);
-            var response = new RestResponse { Content = doc.ToString() };
+		[Fact]
+		public void Can_Deserialize_Boolean_From_Number()
+		{
+				var xmlpath = PathFor("boolean_from_number.xml");
+				var doc = XDocument.Load(xmlpath);
+				var response = new RestResponse { Content = doc.ToString() };
 
-            var d = new XmlDeserializer();
-            var output = d.Deserialize<SampleClasses.BooleanTest>(response);
+				var d = new XmlDeserializer();
+				var output = d.Deserialize<SampleClasses.BooleanTest>(response);
 
-            Assert.True(output.Value);
-        }
+				Assert.True(output.Value);
+		}
 
-        [Fact]
-        public void Can_Deserialize_Boolean_From_String()
-        {
-            var xmlpath = PathFor("boolean_from_string.xml");
-            var doc = XDocument.Load(xmlpath);
-            var response = new RestResponse { Content = doc.ToString() };
+		[Fact]
+		public void Can_Deserialize_Boolean_From_String()
+		{
+				var xmlpath = PathFor("boolean_from_string.xml");
+				var doc = XDocument.Load(xmlpath);
+				var response = new RestResponse { Content = doc.ToString() };
 
-            var d = new XmlDeserializer();
-            var output = d.Deserialize<SampleClasses.BooleanTest>(response);
+				var d = new XmlDeserializer();
+				var output = d.Deserialize<SampleClasses.BooleanTest>(response);
 
-            Assert.True(output.Value);
-        }
+				Assert.True(output.Value);
+		}
 
 		private static string CreateUnderscoresXml()
 		{
@@ -703,5 +731,27 @@ private static string CreateXmlWithoutEmptyValues()
 
 			return doc.ToString();
 		}
+
+		private static string CreateXmlWithEmptyNestedList()
+		{
+			var doc = new XDocument();
+			var root = new XElement("EmptyListSample");
+
+			root.Add(new XElement("Images"));
+
+			doc.Add(root);
+
+			return doc.ToString();
+		}
+
+		private static string CreateXmlWithEmptyInlineList()
+		{
+			var doc = new XDocument();
+			var root = new XElement("EmptyListSample");
+
+			doc.Add(root);
+
+			return doc.ToString();
+		}
 	}
 }