starred/WireMock.Net-wiremock
1
0
Fork 0
mirror of https://github.com/wiremock/WireMock.Net.git synced 2026-03-18 15:23:47 +01:00
Code Issues 32 Packages Projects Releases 10 Wiki Activity

Rename classes

Browse Source
This commit is contained in:
Stef Heyenrath
2017-01-18 07:42:05 +01:00
parent c0872995b0
commit 8f02e99a00
23 changed files with 142 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/WireMock/CompositeRequestSpec.cs
View File

@@ -43,15 +43,15 @@ namespace WireMock
/// <summary>
/// The is satisfied by.
/// </summary>
/// <param name="request">
/// <param name="requestMessage">
/// The request.
/// </param>
/// <returns>
/// The <see cref="bool"/>.
/// </returns>
public bool IsSatisfiedBy(Request request)
public bool IsSatisfiedBy(RequestMessage requestMessage)
{
return _requestSpecs.All(spec => spec.IsSatisfiedBy(request));
return _requestSpecs.All(spec => spec.IsSatisfiedBy(requestMessage));
}
}
}

14
src/WireMock/FluentMockServer.cs
View File

@@ -43,7 +43,7 @@ namespace WireMock
/// <summary>
/// The _request logs.
/// </summary>
private readonly IList<Request> _requestLogs = new List<Request>();
private readonly IList<RequestMessage> _requestLogs = new List<RequestMessage>();
/// <summary>
/// The _request mapper.
@@ -104,13 +104,13 @@ namespace WireMock
/// <summary>
/// Gets the request logs.
/// </summary>
public IEnumerable<Request> RequestLogs
public IEnumerable<RequestMessage> RequestLogs
{
get
{
lock (((ICollection)_requestLogs).SyncRoot)
{
return new ReadOnlyCollection<Request>(_requestLogs);
return new ReadOnlyCollection<RequestMessage>(_requestLogs);
}
}
}
@@ -162,7 +162,7 @@ namespace WireMock
/// <returns>
/// The <see cref="IEnumerable"/>.
/// </returns>
public IEnumerable<Request> SearchLogsFor(ISpecifyRequests spec)
public IEnumerable<RequestMessage> SearchLogsFor(ISpecifyRequests spec)
{
lock (((ICollection)_requestLogs).SyncRoot)
{
@@ -223,14 +223,14 @@ namespace WireMock
/// <summary>
/// The log request.
/// </summary>
/// <param name="request">
/// <param name="requestMessage">
/// The request.
/// </param>
private void LogRequest(Request request)
private void LogRequest(RequestMessage requestMessage)
{
lock (((ICollection)_requestLogs).SyncRoot)
{
_requestLogs.Add(request);
_requestLogs.Add(requestMessage);
}
}

6
src/WireMock/HttpListenerRequestMapper.cs
View File

@@ -27,9 +27,9 @@ namespace WireMock
/// The listener request.
/// </param>
/// <returns>
/// The <see cref="RequestBuilder"/>.
/// The <see cref="Request"/>.
/// </returns>
public Request Map(HttpListenerRequest listenerRequest)
public RequestMessage Map(HttpListenerRequest listenerRequest)
{
var path = listenerRequest.Url.AbsolutePath;
var query = listenerRequest.Url.Query;
@@ -38,7 +38,7 @@ namespace WireMock
var listenerHeaders = listenerRequest.Headers;
var headers = listenerHeaders.AllKeys.ToDictionary(k => k, k => listenerHeaders[k]);
return new Request(path, query, verb, body, headers);
return new RequestMessage(path, query, verb, body, headers);
}
/// <summary>

12
src/WireMock/HttpListenerResponseMapper.cs
View File

@@ -18,19 +18,19 @@ namespace WireMock
/// <summary>
/// The map.
/// </summary>
/// <param name="response">
/// <param name="responseMessage">
/// The response.
/// </param>
/// <param name="result">
/// The result.
/// </param>
public void Map(Response response, HttpListenerResponse result)
public void Map(ResponseMessage responseMessage, HttpListenerResponse result)
{
result.StatusCode = response.StatusCode;
response.Headers.ToList().ForEach(pair => result.AddHeader(pair.Key, pair.Value));
if (response.Body != null)
result.StatusCode = responseMessage.StatusCode;
responseMessage.Headers.ToList().ForEach(pair => result.AddHeader(pair.Key, pair.Value));
if (responseMessage.Body != null)
{
var content = Encoding.UTF8.GetBytes(response.Body);
var content = Encoding.UTF8.GetBytes(responseMessage.Body);
result.OutputStream.Write(content, 0, content.Length);
}
}

4
src/WireMock/IProvideResponses.cs
View File

@@ -16,12 +16,12 @@ namespace WireMock
/// <summary>
/// The provide response.
/// </summary>
/// <param name="request">
/// <param name="requestMessage">
/// The request.
/// </param>
/// <returns>
/// The <see cref="Task"/>.
/// </returns>
Task<Response> ProvideResponse(Request request);
Task<ResponseMessage> ProvideResponse(RequestMessage requestMessage);
}
}

4
src/WireMock/ISpecifyRequests.cs
View File

@@ -16,12 +16,12 @@ namespace WireMock
/// <summary>
/// The is satisfied by.
/// </summary>
/// <param name="request">
/// <param name="requestMessage">
/// The request.
/// </param>
/// <returns>
/// The <see cref="bool"/>.
/// </returns>
bool IsSatisfiedBy([NotNull] Request request);
bool IsSatisfiedBy([NotNull] RequestMessage requestMessage);
}
}

6
src/WireMock/RequestBodySpec.cs
View File

@@ -44,15 +44,15 @@ namespace WireMock
/// <summary>
/// The is satisfied by.
/// </summary>
/// <param name="request">
/// <param name="requestMessage">
/// The request.
/// </param>
/// <returns>
/// The <see cref="bool"/>.
/// </returns>
public bool IsSatisfiedBy(Request request)
public bool IsSatisfiedBy(RequestMessage requestMessage)
{
return bodyRegex.IsMatch(request.Body);
return bodyRegex.IsMatch(requestMessage.Body);
}
}
}

10
src/WireMock/RequestBuilders/RequestBuilder.cs → src/WireMock/RequestBuilders/Request.cs
View File

@@ -25,7 +25,7 @@ namespace WireMock.RequestBuilders
/// <summary>
/// The requests.
/// </summary>
public class RequestBuilder : CompositeRequestSpec, IVerbRequestBuilder, IHeadersRequestBuilder, IParamsRequestBuilder
public class Request : CompositeRequestSpec, IVerbRequestBuilder, IHeadersRequestBuilder, IParamsRequestBuilder
{
/// <summary>
/// The _request specs.
@@ -33,12 +33,12 @@ namespace WireMock.RequestBuilders
private readonly IList<ISpecifyRequests> _requestSpecs;
/// <summary>
/// Initializes a new instance of the <see cref="RequestBuilder"/> class.
/// Initializes a new instance of the <see cref="Request"/> class.
/// </summary>
/// <param name="requestSpecs">
/// The request specs.
/// </param>
private RequestBuilder(IList<ISpecifyRequests> requestSpecs) : base(requestSpecs)
private Request(IList<ISpecifyRequests> requestSpecs) : base(requestSpecs)
{
_requestSpecs = requestSpecs;
}
@@ -55,7 +55,7 @@ namespace WireMock.RequestBuilders
public static IVerbRequestBuilder WithUrl(string url)
{
var specs = new List<ISpecifyRequests>();
var requests = new RequestBuilder(specs);
var requests = new Request(specs);
specs.Add(new RequestUrlSpec(url));
return requests;
}
@@ -72,7 +72,7 @@ namespace WireMock.RequestBuilders
public static IVerbRequestBuilder WithPath(string path)
{
var specs = new List<ISpecifyRequests>();
var requests = new RequestBuilder(specs);
var requests = new Request(specs);
specs.Add(new RequestPathSpec(path));
return requests;
}

6
src/WireMock/RequestHeaderSpec.cs
View File

@@ -52,15 +52,15 @@ namespace WireMock
/// <summary>
/// The is satisfied by.
/// </summary>
/// <param name="request">
/// <param name="requestMessage">
/// The request.
/// </param>
/// <returns>
/// The <see cref="bool"/>.
/// </returns>
public bool IsSatisfiedBy([NotNull] Request request)
public bool IsSatisfiedBy([NotNull] RequestMessage requestMessage)
{
string headerValue = request.Headers[name];
string headerValue = requestMessage.Headers[name];
return patternRegex.IsMatch(headerValue);
}
}

13
src/WireMock/Request.cs → src/WireMock/RequestMessage.cs
View File

@@ -25,7 +25,7 @@ namespace WireMock
/// <summary>
/// The request.
/// </summary>
public class Request
public class RequestMessage
{
/// <summary>
/// The _params.
@@ -33,7 +33,7 @@ namespace WireMock
private readonly Dictionary<string, List<string>> _params = new Dictionary<string, List<string>>();
/// <summary>
/// Initializes a new instance of the <see cref="Request"/> class.
/// Initializes a new instance of the <see cref="RequestMessage"/> class.
/// </summary>
/// <param name="path">
/// The path.
@@ -50,7 +50,7 @@ namespace WireMock
/// <param name="headers">
/// The headers.
/// </param>
public Request(string path, string query, string verb, string body, IDictionary<string, string> headers)
public RequestMessage(string path, string query, string verb, string body, IDictionary<string, string> headers)
{
if (!string.IsNullOrEmpty(query))
{
@@ -127,12 +127,7 @@ namespace WireMock
/// </returns>
public List<string> GetParameter(string key)
{
if (_params.ContainsKey(key))
{
return _params[key];
}
return new List<string>();
return _params.ContainsKey(key) ? _params[key] : new List<string>();
}
}
}

6
src/WireMock/RequestParamSpec.cs
View File

@@ -52,15 +52,15 @@ namespace WireMock
/// <summary>
/// The is satisfied by.
/// </summary>
/// <param name="request">
/// <param name="requestMessage">
/// The request.
/// </param>
/// <returns>
/// The <see cref="bool"/>.
/// </returns>
public bool IsSatisfiedBy([NotNull] Request request)
public bool IsSatisfiedBy([NotNull] RequestMessage requestMessage)
{
return request.GetParameter(_key).Intersect(_values).Count() == _values.Count;
return requestMessage.GetParameter(_key).Intersect(_values).Count() == _values.Count;
}
}
}

6
src/WireMock/RequestPathSpec.cs
View File

@@ -44,15 +44,15 @@ namespace WireMock
/// <summary>
/// The is satisfied by.
/// </summary>
/// <param name="request">
/// <param name="requestMessage">
/// The request.
/// </param>
/// <returns>
/// The <see cref="bool"/>.
/// </returns>
public bool IsSatisfiedBy([NotNull] Request request)
public bool IsSatisfiedBy([NotNull] RequestMessage requestMessage)
{
return _path.IsMatch(request.Path);
return _path.IsMatch(requestMessage.Path);
}
}
}

6
src/WireMock/RequestUrlSpec.cs
View File

@@ -44,15 +44,15 @@ namespace WireMock
/// <summary>
/// The is satisfied by.
/// </summary>
/// <param name="request">
/// <param name="requestMessage">
/// The request.
/// </param>
/// <returns>
/// The <see cref="bool"/>.
/// </returns>
public bool IsSatisfiedBy(Request request)
public bool IsSatisfiedBy(RequestMessage requestMessage)
{
return urlRegex.IsMatch(request.Url);
return urlRegex.IsMatch(requestMessage.Url);
}
}
}

6
src/WireMock/RequestVerbSpec.cs
View File

@@ -41,15 +41,15 @@ namespace WireMock
/// <summary>
/// The is satisfied by.
/// </summary>
/// <param name="request">
/// <param name="requestMessage">
/// The request.
/// </param>
/// <returns>
/// The <see cref="bool"/>.
/// </returns>
public bool IsSatisfiedBy([NotNull] Request request)
public bool IsSatisfiedBy([NotNull] RequestMessage requestMessage)
{
return request.Verb == _verb;
return requestMessage.Verb == _verb;
}
}
}

28
src/WireMock/ResponseBuilders/ResponseBuilder.cs → src/WireMock/ResponseBuilders/Response.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Diagnostics.CodeAnalysis;
using System.Threading.Tasks;
@@ -21,12 +21,12 @@ namespace WireMock.ResponseBuilders
/// <summary>
/// The responses.
/// </summary>
public class ResponseBuilder : IHeadersResponseBuilder
public class Response : IHeadersResponseBuilder
{
/// <summary>
/// The _response.
/// </summary>
private readonly Response _response;
private readonly ResponseMessage _responseMessage;
/// <summary>
/// The _delay.
@@ -34,14 +34,14 @@ namespace WireMock.ResponseBuilders
private TimeSpan _delay = TimeSpan.Zero;
/// <summary>
/// Initializes a new instance of the <see cref="ResponseBuilder"/> class.
/// Initializes a new instance of the <see cref="Response"/> class.
/// </summary>
/// <param name="response">
/// <param name="responseMessage">
/// The response.
/// </param>
public ResponseBuilder(Response response)
public Response(ResponseMessage responseMessage)
{
_response = response;
_responseMessage = responseMessage;
}
/// <summary>
@@ -73,23 +73,23 @@ namespace WireMock.ResponseBuilders
/// </returns>
public static IHeadersResponseBuilder WithStatusCode(int code)
{
var response = new Response { StatusCode = code };
return new ResponseBuilder(response);
var response = new ResponseMessage { StatusCode = code };
return new Response(response);
}
/// <summary>
/// The provide response.
/// </summary>
/// <param name="request">
/// <param name="requestMessage">
/// The request.
/// </param>
/// <returns>
/// The <see cref="Task"/>.
/// </returns>
public async Task<Response> ProvideResponse(Request request)
public async Task<ResponseMessage> ProvideResponse(RequestMessage requestMessage)
{
await Task.Delay(_delay);
return _response;
return _responseMessage;
}
/// <summary>
@@ -106,7 +106,7 @@ namespace WireMock.ResponseBuilders
/// </returns>
public IHeadersResponseBuilder WithHeader(string name, string value)
{
_response.AddHeader(name, value);
_responseMessage.AddHeader(name, value);
return this;
}
@@ -121,7 +121,7 @@ namespace WireMock.ResponseBuilders
/// </returns>
public IDelayResponseBuilder WithBody(string body)
{
_response.Body = body;
_responseMessage.Body = body;
return this;
}

2
src/WireMock/Response.cs → src/WireMock/ResponseMessage.cs
View File

@@ -21,7 +21,7 @@ namespace WireMock
/// <summary>
/// The response.
/// </summary>
public class Response
public class ResponseMessage
{
/// <summary>
/// The _headers.

14
src/WireMock/Route.cs
View File

@@ -50,29 +50,29 @@ namespace WireMock
/// <summary>
/// The response to.
/// </summary>
/// <param name="request">
/// <param name="requestMessage">
/// The request.
/// </param>
/// <returns>
/// The <see cref="Task"/>.
/// </returns>
public Task<Response> ResponseTo(Request request)
public Task<ResponseMessage> ResponseTo(RequestMessage requestMessage)
{
return _provider.ProvideResponse(request);
return _provider.ProvideResponse(requestMessage);
}
/// <summary>
/// The is request handled.
/// </summary>
/// <param name="request">
/// <param name="requestMessage">
/// The request.
/// </param>
/// <returns>
/// The <see cref="bool"/>.
/// </returns>
public bool IsRequestHandled(Request request)
public bool IsRequestHandled(RequestMessage requestMessage)
{
return _requestSpec.IsSatisfiedBy(request);
return _requestSpec.IsSatisfiedBy(requestMessage);
}
}
}
}