Merge pull request #914 from angelcolmenares/master

Unit Tests: change port (82) to a registered port (1337), that can be used by ordinary users & use Environment.NewLine instead of \r\n
ServiceStack · May 6, 2014 · f3b9ef1 · f3b9ef1
2 parents 103a11f + 1202e67
commit f3b9ef1
Show file tree

Hide file tree

Showing 18 changed files with 48 additions and 43 deletions.
diff --git a/tests/ServiceStack.WebHost.Endpoints.Tests/AlwaysThrowsService.cs b/tests/ServiceStack.WebHost.Endpoints.Tests/AlwaysThrowsService.cs
@@ -162,7 +162,7 @@ public void Register(IAppHost appHost)
     public abstract class WebServicesTests
         //: TestBase
     {
-        public const string ListeningOn = "http://localhost:82/";
+        public const string ListeningOn = "http://localhost:1337/";
         private const string TestString = "ServiceStack";
 
         private ServiceStackHost appHost;
@@ -313,4 +313,4 @@ protected override IServiceClient CreateNewServiceClient()
             return new Soap12ServiceClient(ListeningOn);
         }
     }
-}
+}
diff --git a/tests/ServiceStack.WebHost.Endpoints.Tests/AttributeFiltersTest.cs b/tests/ServiceStack.WebHost.Endpoints.Tests/AttributeFiltersTest.cs
@@ -163,8 +163,8 @@ public object Any(AttributeFiltered request)
     [TestFixture]
     public class AttributeFiltersTest
     {
-        private const string ListeningOn = "http://localhost:82/";
-        private const string ServiceClientBaseUri = "http://localhost:82/";
+        private const string ListeningOn = "http://localhost:1337/";
+        private const string ServiceClientBaseUri = "http://localhost:1337/";
 
         public class AttributeFiltersAppHostHttpListener
             : AppHostHttpListenerBase

diff --git a/tests/ServiceStack.WebHost.Endpoints.Tests/CsvContentTypeFilterTests.cs b/tests/ServiceStack.WebHost.Endpoints.Tests/CsvContentTypeFilterTests.cs
@@ -129,11 +129,12 @@ public void Can_download_CSV_Hello_using_csv_reply_endpoint()
 			var req = (HttpWebRequest)WebRequest.Create(ListeningOn + "csv/reply/Hello?Name=World!");
 
 			var res = req.GetResponse();
-            Assert.That(res.ContentType, Is.EqualTo(MimeTypes.Csv));
+			Assert.That(res.ContentType, Is.EqualTo(MimeTypes.Csv));
 			Assert.That(res.Headers[HttpHeaders.ContentDisposition], Is.EqualTo("attachment;filename=Hello.csv"));
-
-            var csv = res.ReadToEnd();
-			Assert.That(csv, Is.EqualTo("Result\r\n\"Hello, World!\"\r\n"));
+
+			var csv = res.ReadToEnd();
+			var lf = Environment.NewLine;
+			Assert.That(csv, Is.EqualTo("Result{0}\"Hello, World!\"{0}".Fmt(lf)));
 
 			Console.WriteLine(csv);
 		}
@@ -142,14 +143,15 @@ public void Can_download_CSV_Hello_using_csv_reply_endpoint()
 		public void Can_download_CSV_Hello_using_csv_Accept_and_RestPath()
 		{
 			var req = (HttpWebRequest)WebRequest.Create(ListeningOn + "hello/World!");
-            req.Accept = MimeTypes.Csv;
+			req.Accept = MimeTypes.Csv;
 
 			var res = req.GetResponse();
-            Assert.That(res.ContentType, Is.EqualTo(MimeTypes.Csv));
+			Assert.That(res.ContentType, Is.EqualTo(MimeTypes.Csv));
 			Assert.That(res.Headers[HttpHeaders.ContentDisposition], Is.EqualTo("attachment;filename=Hello.csv"));
-
-            var csv = res.ReadToEnd();
-            Assert.That(csv, Is.EqualTo("Result\r\n\"Hello, World!\"\r\n"));
+
+			var csv = res.ReadToEnd();
+			var lf = Environment.NewLine;
+			Assert.That(csv, Is.EqualTo("Result{0}\"Hello, World!\"{0}".Fmt(lf)));
 
 			Console.WriteLine(csv);
 		}
@@ -169,4 +171,4 @@ public void Can_download_CSV_movies_using_csv_reply_Path()
 			Assert.That(csvRows, Has.Count.EqualTo(HeaderRowCount + ResetMoviesService.Top5Movies.Count));
 		}
 	}
-}
+}
diff --git a/tests/ServiceStack.WebHost.Endpoints.Tests/CustomRequestDataTests.cs b/tests/ServiceStack.WebHost.Endpoints.Tests/CustomRequestDataTests.cs
@@ -14,7 +14,7 @@ namespace ServiceStack.WebHost.Endpoints.Tests
 	[TestFixture]
 	public class CustomRequestDataTests
 	{
-		private const string ListeningOn = "http://localhost:82/";
+		private const string ListeningOn = "http://localhost:1337/";
 
 		ExampleAppHostHttpListener appHost;
 		readonly JsonServiceClient client = new JsonServiceClient(ListeningOn);
@@ -41,7 +41,7 @@ public void OnTestFixtureTearDown()
 		[Test]
 		public void Can_parse_custom_form_data()
 		{
-			var webReq = (HttpWebRequest)WebRequest.Create("http://localhost:82/customformdata?format=json");
+			var webReq = (HttpWebRequest)WebRequest.Create("http://localhost:1337/customformdata?format=json");
 			webReq.Method = HttpMethods.Post;
             webReq.ContentType = MimeTypes.FormUrlEncoded;
 

diff --git a/tests/ServiceStack.WebHost.Endpoints.Tests/CustomerServiceValidationTests.cs b/tests/ServiceStack.WebHost.Endpoints.Tests/CustomerServiceValidationTests.cs
@@ -103,7 +103,7 @@ public object Delete(Customers request)
     [TestFixture]
     public class CustomerServiceValidationTests
     {
-        private const string ListeningOn = "http://localhost:82/";
+        private const string ListeningOn = "http://localhost:1337/";
 
         public class ValidationAppHostHttpListener
             : AppHostHttpListenerBase
@@ -348,4 +348,4 @@ public void Post_ValidRequest_succeeds(Func<IServiceClient> factory)
         }
 
     }
-}
+}
diff --git a/tests/ServiceStack.WebHost.Endpoints.Tests/ExceptionHandlingTests.cs b/tests/ServiceStack.WebHost.Endpoints.Tests/ExceptionHandlingTests.cs
@@ -105,7 +105,7 @@ public object Any(ExceptionWithRequestBinding request)
     [TestFixture]
     public class ExceptionHandlingTests
     {
-        private const string ListeningOn = "http://localhost:82/";
+        private const string ListeningOn = "http://localhost:1337/";
 
         public class ExceptionHandlingAppHostHttpListener
             : AppHostHttpListenerBase

diff --git a/tests/ServiceStack.WebHost.Endpoints.Tests/HttpErrorAsyncTests.cs b/tests/ServiceStack.WebHost.Endpoints.Tests/HttpErrorAsyncTests.cs
@@ -11,7 +11,7 @@ namespace ServiceStack.WebHost.Endpoints.Tests
     [TestFixture]
     public class HttpErrorAsyncTests
     {
-        private const string ListeningOn = "http://localhost:82/";
+        private const string ListeningOn = "http://localhost:1337/";
 
         ExampleAppHostHttpListener appHost;
 
@@ -115,4 +115,4 @@ public async Task PUT_returning_custom_403_Exception()
             }
         }
     }
-}
+}
diff --git a/tests/ServiceStack.WebHost.Endpoints.Tests/HttpErrorSyncTests.cs b/tests/ServiceStack.WebHost.Endpoints.Tests/HttpErrorSyncTests.cs
@@ -8,7 +8,7 @@ namespace ServiceStack.WebHost.Endpoints.Tests
     [TestFixture]
     public class HttpErrorSyncTests
     {
-        private const string ListeningOn = "http://localhost:82/";
+        private const string ListeningOn = "http://localhost:1337/";
 
         private ExampleAppHostHttpListener appHost;
 
@@ -85,4 +85,4 @@ public void PUT_throwing_custom_403_Exception()
             }
         }
     }
-}
+}
diff --git a/tests/ServiceStack.WebHost.Endpoints.Tests/HttpResultContentTypeTests.cs b/tests/ServiceStack.WebHost.Endpoints.Tests/HttpResultContentTypeTests.cs
@@ -60,7 +60,7 @@ public object Any(PlainText request)
 #endregion
 
 
-		private const string ListeningOn = "http://localhost:82/";
+		private const string ListeningOn = "http://localhost:1337/";
 		SimpleAppHostHttpListener appHost;
 
         public HttpResultContentTypeTests()
@@ -125,4 +125,4 @@ public void OnTestFixtureTearDown()
             }
         }
 	}
-}
+}
diff --git a/tests/ServiceStack.WebHost.Endpoints.Tests/IntegrationTests/IntegrationTestBase.cs b/tests/ServiceStack.WebHost.Endpoints.Tests/IntegrationTests/IntegrationTestBase.cs
@@ -12,7 +12,7 @@ namespace ServiceStack.WebHost.Endpoints.Tests.IntegrationTests
 {
 	public class IntegrationTestBase
 	{
-		protected const string BaseUrl = "http://localhost:82/";
+		protected const string BaseUrl = "http://localhost:1337/";
 
         private readonly IntegrationTestAppHost appHost;
 	    public IntegrationTestBase()
@@ -108,4 +108,4 @@ public void DeleteOnEachEndpoint<TRes>(string relativePathOrAbsoluteUri, Action<
 			}
 		}
 	}
-}
+}
diff --git a/tests/ServiceStack.WebHost.Endpoints.Tests/JsonpTests.cs b/tests/ServiceStack.WebHost.Endpoints.Tests/JsonpTests.cs
@@ -9,7 +9,7 @@ namespace ServiceStack.WebHost.Endpoints.Tests
 {
 	public class JsonpTests
 	{
-		protected const string ListeningOn = "http://localhost:82/";
+		protected const string ListeningOn = "http://localhost:1337/";
 
 		ExampleAppHostHttpListener appHost;
 
@@ -56,4 +56,4 @@ public void Can_GET_single_Movie_using_RestClient_with_JSONP()
 			Assert.That(response.Length, Is.GreaterThan(50));
 		} 
 	}
-}
+}
diff --git a/tests/ServiceStack.WebHost.Endpoints.Tests/NestedServiceTests.cs b/tests/ServiceStack.WebHost.Endpoints.Tests/NestedServiceTests.cs
@@ -7,7 +7,7 @@ namespace ServiceStack.WebHost.Endpoints.Tests
     [TestFixture]
     public class NestedServiceTests
     {
-        protected const string ListeningOn = "http://localhost:82/";
+        protected const string ListeningOn = "http://localhost:1337/";
 
         ExampleAppHostHttpListener appHost;
 
@@ -70,4 +70,4 @@ public object Any(Root.Nested request)
         }
     }
 
-}
+}
diff --git a/tests/ServiceStack.WebHost.Endpoints.Tests/NewApiTodos.cs b/tests/ServiceStack.WebHost.Endpoints.Tests/NewApiTodos.cs
@@ -100,7 +100,7 @@ public void DeleteByIds(params long[] ids)
     [TestFixture]
     public class NewApiTodosTests
     {
-        const string BaseUri = "http://localhost:82/";
+        const string BaseUri = "http://localhost:1337/";
 
         AppHost appHost;
 
@@ -140,4 +140,4 @@ public void Run()
         }
 
     }
-}
+}
diff --git a/tests/ServiceStack.WebHost.Endpoints.Tests/ProtoBufServiceTests.cs b/tests/ServiceStack.WebHost.Endpoints.Tests/ProtoBufServiceTests.cs
@@ -76,7 +76,7 @@ public object Any(ProtoBufEmail request)
 	[TestFixture]
     public class ProtoBufServiceTests
 	{
-		protected const string ListeningOn = "http://localhost:85/";
+		protected const string ListeningOn = "http://localhost:1337/";
 
 		ExampleAppHostHttpListener appHost;
 
@@ -131,4 +131,4 @@ public void Can_Send_ProtoBuf_request()
 		}
 
 	}
-}
+}
diff --git a/tests/ServiceStack.WebHost.Endpoints.Tests/RemoteEndDropsConnectionTests.cs b/tests/ServiceStack.WebHost.Endpoints.Tests/RemoteEndDropsConnectionTests.cs
@@ -11,7 +11,7 @@ namespace ServiceStack.WebHost.Endpoints.Tests
 	[TestFixture]
 	public class RemoteEndDropsConnectionTests
 	{
-		private const string ListeningOn = "http://localhost:82/";
+		private const string ListeningOn = "http://localhost:1337/";
 		ExampleAppHostHttpListener appHost;
 
 		public RemoteEndDropsConnectionTests()
@@ -127,4 +127,4 @@ public void TestClientDropsConnection(bool writeErrorsToResponse)
 		}
 	}
 
-}
+}
diff --git a/tests/ServiceStack.WebHost.Endpoints.Tests/RequestContextTests.cs b/tests/ServiceStack.WebHost.Endpoints.Tests/RequestContextTests.cs
@@ -14,7 +14,7 @@ namespace ServiceStack.WebHost.Endpoints.Tests
 	[TestFixture]
 	public class RequestContextTests
 	{
-		private const string ListeningOn = "http://localhost:82/";
+		private const string ListeningOn = "http://localhost:1337/";
 
 		public class HeadersAppHostHttpListener
 			: AppHostHttpListenerBase
@@ -149,4 +149,4 @@ public void Does_return_bare_401_with_AuthRequired_header()
 
 
 	}
-}
+}
diff --git a/tests/ServiceStack.WebHost.Endpoints.Tests/RouteTests.cs b/tests/ServiceStack.WebHost.Endpoints.Tests/RouteTests.cs
@@ -86,8 +86,9 @@ public void Can_download_original_route_with_csv_extension()
                     httpRes.ContentType.Print();
                     Assert.That(httpRes.ContentType.MatchesContentType(MimeTypes.Csv));
                 });
-
-            Assert.That(response, Is.EqualTo("Data\r\nfoo\r\n"));
+
+            var lf = System.Environment.NewLine;
+			Assert.That(response, Is.EqualTo("Data{0}foo{0}".Fmt(lf)));
         }
     }
 
@@ -155,8 +156,10 @@ public void Can_download_modified_routes()
 
             var response = Config.AbsoluteBaseUri.CombineWith("/api/modified/foo.csv")
                 .GetStringFromUrl();
+
+            var lf = System.Environment.NewLine;
+			Assert.That(response, Is.EqualTo("Data{0}foo{0}".Fmt(lf)));
 
-            Assert.That(response, Is.EqualTo("Data\r\nfoo\r\n"));
         }
     }
 

diff --git a/tests/ServiceStack.WebHost.Endpoints.Tests/UserServiceValidationTests.cs b/tests/ServiceStack.WebHost.Endpoints.Tests/UserServiceValidationTests.cs
@@ -62,7 +62,7 @@ public object Get(UserValidation request)
     [TestFixture]
     public class UserServiceValidationTests
     {
-        private const string ListeningOn = "http://localhost:82/";
+        private const string ListeningOn = "http://localhost:1337/";
 
         public class UserAppHostHttpListener
             : AppHostHttpListenerBase