Skip to content

Unit Tests: change port (82) to a registered port (1337), that can be used by ordinary users & use Environment.NewLine instead of \r\n #914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mythz merged 19 commits into from
May 6, 2014
Merged

Unit Tests: change port (82) to a registered port (1337), that can be used by ordinary users & use Environment.NewLine instead of \r\n #914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
2281551
Update NewApiTodos.cs
angelcolmenares May 5, 2014
5a109a3
Update CustomerServiceValidationTests.cs
angelcolmenares May 5, 2014
3d1e015
Update AttributeFiltersTest.cs
angelcolmenares May 5, 2014
bf03065
Update CustomRequestDataTests.cs
angelcolmenares May 5, 2014
6f5a22c
Update CustomRequestDataTests.cs
angelcolmenares May 6, 2014
c9b9abf
Update ExceptionHandlingTests.cs
angelcolmenares May 6, 2014
7d2fd94
Update HttpErrorAsyncTests.cs
angelcolmenares May 6, 2014
05602e2
Update HttpErrorSyncTests.cs
angelcolmenares May 6, 2014
9a22f33
Update HttpResultContentTypeTests.cs
angelcolmenares May 6, 2014
a168e8f
Update IntegrationTestBase.cs
angelcolmenares May 6, 2014
baff08d
Update AlwaysThrowsService.cs
angelcolmenares May 6, 2014
121835a
Update JsonpTests.cs
angelcolmenares May 6, 2014
3abec77
Update NestedServiceTests.cs
angelcolmenares May 6, 2014
79fe08c
Update ProtoBufServiceTests.cs
angelcolmenares May 6, 2014
ebdee13
Update RemoteEndDropsConnectionTests.cs
angelcolmenares May 6, 2014
2349ccb
Update RequestContextTests.cs
angelcolmenares May 6, 2014
d245f4b
Update UserServiceValidationTests.cs
angelcolmenares May 6, 2014
54d3fbb
Update RouteTests.cs
angelcolmenares May 6, 2014
1202e67
Update CsvContentTypeFilterTests.cs
angelcolmenares May 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/ServiceStack.WebHost.Endpoints.Tests/AlwaysThrowsService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -313,4 +313,4 @@ protected override IServiceClient CreateNewServiceClient()
return new Soap12ServiceClient(ListeningOn);
}
}
}
}
4 changes: 2 additions & 2 deletions tests/ServiceStack.WebHost.Endpoints.Tests/AttributeFiltersTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 12 additions & 10 deletions tests/ServiceStack.WebHost.Endpoints.Tests/CsvContentTypeFilterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -169,4 +171,4 @@ public void Can_download_CSV_movies_using_csv_reply_Path()
Assert.That(csvRows, Has.Count.EqualTo(HeaderRowCount + ResetMoviesService.Top5Movies.Count));
}
}
}
}
4 changes: 2 additions & 2 deletions tests/ServiceStack.WebHost.Endpoints.Tests/CustomRequestDataTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions tests/ServiceStack.WebHost.Endpoints.Tests/CustomerServiceValidationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -348,4 +348,4 @@ public void Post_ValidRequest_succeeds(Func<IServiceClient> factory)
}

}
}
}
2 changes: 1 addition & 1 deletion tests/ServiceStack.WebHost.Endpoints.Tests/ExceptionHandlingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/ServiceStack.WebHost.Endpoints.Tests/HttpErrorAsyncTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -115,4 +115,4 @@ public async Task PUT_returning_custom_403_Exception()
}
}
}
}
}
4 changes: 2 additions & 2 deletions tests/ServiceStack.WebHost.Endpoints.Tests/HttpErrorSyncTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -85,4 +85,4 @@ public void PUT_throwing_custom_403_Exception()
}
}
}
}
}
4 changes: 2 additions & 2 deletions tests/ServiceStack.WebHost.Endpoints.Tests/HttpResultContentTypeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -125,4 +125,4 @@ public void TestHttpRestulSettingContentType(bool setContentTypeBrutally) {
}
}
}
}
}
4 changes: 2 additions & 2 deletions tests/ServiceStack.WebHost.Endpoints.Tests/IntegrationTests/IntegrationTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -108,4 +108,4 @@ public void DeleteOnEachEndpoint<TRes>(string relativePathOrAbsoluteUri, Action<
}
}
}
}
}
4 changes: 2 additions & 2 deletions tests/ServiceStack.WebHost.Endpoints.Tests/JsonpTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -56,4 +56,4 @@ public void Can_GET_single_Movie_using_RestClient_with_JSONP()
Assert.That(response.Length, Is.GreaterThan(50));
}
}
}
}
4 changes: 2 additions & 2 deletions tests/ServiceStack.WebHost.Endpoints.Tests/NestedServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -70,4 +70,4 @@ public object Any(Root.Nested request)
}
}

}
}
4 changes: 2 additions & 2 deletions tests/ServiceStack.WebHost.Endpoints.Tests/NewApiTodos.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -140,4 +140,4 @@ public void Run()
}

}
}
}
4 changes: 2 additions & 2 deletions tests/ServiceStack.WebHost.Endpoints.Tests/ProtoBufServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -131,4 +131,4 @@ public void Can_Send_ProtoBuf_request()
}

}
}
}
4 changes: 2 additions & 2 deletions tests/ServiceStack.WebHost.Endpoints.Tests/RemoteEndDropsConnectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -127,4 +127,4 @@ public void TestClientDropsConnection(bool writeErrorsToResponse)
}
}

}
}
4 changes: 2 additions & 2 deletions tests/ServiceStack.WebHost.Endpoints.Tests/RequestContextTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -149,4 +149,4 @@ public void Does_return_bare_401_with_AuthRequired_header()


}
}
}
9 changes: 6 additions & 3 deletions tests/ServiceStack.WebHost.Endpoints.Tests/RouteTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)));
}
}

Expand Down Expand Up @@ -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"));
}
}

Expand Down
2 changes: 1 addition & 1 deletion tests/ServiceStack.WebHost.Endpoints.Tests/UserServiceValidationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down