Skip to content

Commit c52e647

Browse files
committed
Refactor CustomerServiceValidationTests to use NewApi
1 parent 7fbcbc4 commit c52e647

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

tests/ServiceStack.WebHost.IntegrationTests/Services/CustomerService.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace ServiceStack.WebHost.IntegrationTests.Services
1010
{
1111
[Route("/customers")]
1212
[Route("/customers/{Id}")]
13-
public class Customers
13+
public class Customers : IReturn<CustomersResponse>
1414
{
1515
public int Id { get; set; }
1616
public string FirstName { get; set; }
@@ -22,6 +22,13 @@ public class Customers
2222
public bool HasDiscount { get; set; }
2323
}
2424

25+
public class CustomersResponse
26+
{
27+
public Customers Result { get; set; }
28+
29+
public ResponseStatus ResponseStatus { get; set; }
30+
}
31+
2532
public class CustomersValidator : AbstractValidator<Customers>
2633
{
2734
public CustomersValidator()
@@ -46,31 +53,24 @@ private bool BeAValidPostcode(string postcode)
4653
}
4754
}
4855

49-
public class CustomersResponse
50-
{
51-
public Customers Result { get; set; }
52-
53-
public ResponseStatus ResponseStatus { get; set; }
54-
}
55-
56-
public class CustomerService : RestServiceBase<Customers>
56+
public class CustomerService : ServiceInterface.Service
5757
{
58-
public override object OnGet(Customers request)
58+
public object Get(Customers request)
5959
{
6060
return new CustomersResponse { Result = request };
6161
}
6262

63-
public override object OnPost(Customers request)
63+
public object Post(Customers request)
6464
{
6565
return new CustomersResponse { Result = request };
6666
}
6767

68-
public override object OnPut(Customers request)
68+
public object Put(Customers request)
6969
{
7070
return new CustomersResponse { Result = request };
7171
}
7272

73-
public override object OnDelete(Customers request)
73+
public object Delete(Customers request)
7474
{
7575
return new CustomersResponse { Result = request };
7676
}

tests/ServiceStack.WebHost.IntegrationTests/Tests/CustomerServiceValidationTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void Post_empty_request_throws_validation_exception(IServiceClient client
6767
{
6868
try
6969
{
70-
var response = client.Send<CustomersResponse>(new Customers());
70+
var response = client.Send(new Customers());
7171
response.PrintDump();
7272
Assert.Fail("Should throw Validation Exception");
7373
}
@@ -91,7 +91,7 @@ public void Get_empty_request_throws_validation_exception(IRestClient client)
9191
{
9292
try
9393
{
94-
var response = client.Get<CustomersResponse>("/Customers");
94+
var response = client.Get(new Customers());
9595
response.PrintDump();
9696
Assert.Fail("Should throw Validation Exception");
9797
}
@@ -110,7 +110,7 @@ public void Get_empty_request_throws_validation_exception(IRestClient client)
110110
[Test, TestCaseSource(typeof(CustomerServiceValidationTests), "ServiceClients")]
111111
public void Post_ValidRequest_succeeds(IServiceClient client)
112112
{
113-
var response = client.Send<CustomersResponse>(validRequest);
113+
var response = client.Send(validRequest);
114114
Assert.That(response.ResponseStatus, Is.Null);
115115
}
116116

0 commit comments

Comments
 (0)