added fix and test for null StatusDescription in HttpResult when constructing HttpResponse- null StatusDescription throws ArgumentNullException when set in System.Net.HttpListenerResponse

derfsplat · derfsplat · commit 2ee2f9a9aafa · 2011-07-27T16:45:27.000-04:00
diff --git a/src/ServiceStack/WebHost.EndPoints/Extensions/IHttpResponseExtensions.cs b/src/ServiceStack/WebHost.EndPoints/Extensions/IHttpResponseExtensions.cs
@@ -96,7 +96,7 @@ public static bool WriteToResponse(this IHttpResponse response, object result, R
 				if (httpResult != null)
 				{
 					response.StatusCode = (int)httpResult.StatusCode;
-                    response.StatusDescription = httpResult.StatusDescription;
+					response.StatusDescription = httpResult.StatusDescription ?? httpResult.StatusCode.ToString();
 					if (string.IsNullOrEmpty(httpResult.ContentType))
 					{
 						httpResult.ContentType = defaultContentType;
diff --git a/src/ServiceStack/WebHost.EndPoints/Support/Mocks/HttpResponseMock.cs b/src/ServiceStack/WebHost.EndPoints/Support/Mocks/HttpResponseMock.cs
@@ -40,7 +40,18 @@ public StringBuilder TextWritten
 
 		public int StatusCode { get; set; }
 
-        public string StatusDescription { get; set; }
+		private string statusDescription = string.Empty;
+		public string StatusDescription
+		{
+			get
+			{
+				return statusDescription;
+			}
+			set
+			{
+				statusDescription = value;
+			}
+		}
 
 		public string ContentType
 		{
diff --git a/tests/ServiceStack.WebHost.Endpoints.Tests/HttpResultTests.cs b/tests/ServiceStack.WebHost.Endpoints.Tests/HttpResultTests.cs
@@ -85,6 +85,18 @@ public void Can_send_ResponseText_test_with_StatusDescription()
             Assert.That(statusDesc, Is.EqualTo(customStatus));
         }
 
+		[Test]
+		public void Can_handle_null_HttpResult_StatusDescription()
+		{
+			var mockResponse = new HttpResponseMock();
+
+			var httpResult = new HttpResult();
+			httpResult.StatusDescription = null;
+
+			mockResponse.WriteToResponse(httpResult, ContentType.Html);
+
+			Assert.IsNotNull(mockResponse.StatusDescription);
+		}
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public static bool WriteToResponse(this IHttpResponse response, object result, R`
`96`	`96`	`if (httpResult != null)`
`97`	`97`	`{`
`98`	`98`	`response.StatusCode = (int)httpResult.StatusCode;`
`99`		`- response.StatusDescription = httpResult.StatusDescription;`
	`99`	`+ response.StatusDescription = httpResult.StatusDescription ?? httpResult.StatusCode.ToString();`
`100`	`100`	`if (string.IsNullOrEmpty(httpResult.ContentType))`
`101`	`101`	`{`
`102`	`102`	`httpResult.ContentType = defaultContentType;`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,18 @@ public void Can_send_ResponseText_test_with_StatusDescription()`
`85`	`85`	`Assert.That(statusDesc, Is.EqualTo(customStatus));`
`86`	`86`	`}`
`87`	`87`
	`88`	`+ [Test]`
	`89`	`+ public void Can_handle_null_HttpResult_StatusDescription()`
	`90`	`+ {`
	`91`	`+ var mockResponse = new HttpResponseMock();`
	`92`	`+`
	`93`	`+ var httpResult = new HttpResult();`
	`94`	`+ httpResult.StatusDescription = null;`
	`95`	`+`
	`96`	`+ mockResponse.WriteToResponse(httpResult, ContentType.Html);`
	`97`	`+`
	`98`	`+ Assert.IsNotNull(mockResponse.StatusDescription);`
	`99`	`+ }`
`88`	`100`	`}`
`89`	`101`
`90`	`102`	`}`