starred/WireMock.Net-wiremock
1
0
Fork 0
mirror of https://github.com/wiremock/WireMock.Net.git synced 2026-04-25 09:48:28 +02:00
Code Issues 32 Packages Projects Releases 10 Wiki Activity

Post multiple Mappings (#242)

Browse Source 
* Post multiple Mappings

* 1.0.6
This commit is contained in:
Stef Heyenrath
2018-12-15 09:28:14 +01:00
committed by GitHub
parent d654ef97dc
commit 98097a033e
5 changed files with 98 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Build.props
View File

@@ -4,7 +4,7 @@
</PropertyGroup>
<PropertyGroup>
<VersionPrefix>1.0.5</VersionPrefix>
<VersionPrefix>1.0.6</VersionPrefix>
</PropertyGroup>
<Choose>

2
GitHubReleaseNotes.txt
View File

@@ -1,3 +1,3 @@
https://github.com/StefH/GitHubReleaseNotes
GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --version 1.0.5
GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --version 1.0.6

8
src/WireMock.Net/Client/IFluentMockServerAdmin.cs
View File

@@ -58,6 +58,14 @@ namespace WireMock.Client
[Header("Content-Type", "application/json")]
Task<StatusModel> PostMappingAsync([Body] MappingModel mapping);
/// <summary>
/// Add new mappings.
/// </summary>
/// <param name="mappings">MappingModels</param>
[Post("__admin/mappings")]
[Header("Content-Type", "application/json")]
Task<StatusModel> PostMappingsAsync([Body] IList<MappingModel> mappings);
/// <summary>
/// Delete all mappings.
/// </summary>

42
src/WireMock.Net/Server/FluentMockServer.Admin.cs
View File

@@ -1,3 +1,6 @@
using JetBrains.Annotations;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.IO;
@@ -5,9 +8,6 @@ using System.Linq;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using JetBrains.Annotations;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using WireMock.Admin.Mappings;
using WireMock.Admin.Scenarios;
using WireMock.Admin.Settings;
@@ -412,11 +412,21 @@ namespace WireMock.Server
private ResponseMessage MappingsPost(RequestMessage requestMessage)
{
Guid? guid;
try
{
var mappingModel = DeserializeObject<MappingModel>(requestMessage);
guid = DeserializeAndAddOrUpdateMapping(mappingModel);
var mappingModels = DeserializeObjectArray<MappingModel>(requestMessage);
if (mappingModels.Length == 1)
{
Guid? guid = DeserializeAndAddOrUpdateMapping(mappingModels[0]);
return ResponseMessageBuilder.Create("Mapping added", 201, guid);
}
foreach (var mappingModel in mappingModels)
{
DeserializeAndAddOrUpdateMapping(mappingModel);
}
return ResponseMessageBuilder.Create("Mappings added", 201);
}
catch (ArgumentException a)
{
@@ -428,8 +438,6 @@ namespace WireMock.Server
_logger.Error("HttpStatusCode set to 500 {0}", e);
return ResponseMessageBuilder.Create(e.ToString(), 500);
}
return ResponseMessageBuilder.Create("Mapping added", 201, guid);
}
private Guid? DeserializeAndAddOrUpdateMapping(MappingModel mappingModel, Guid? guid = null, string path = null)
@@ -793,5 +801,23 @@ namespace WireMock.Server
return default(T);
}
private T[] DeserializeObjectArray<T>(RequestMessage requestMessage)
{
if (requestMessage?.BodyData?.DetectedBodyType == BodyType.Json)
{
var bodyAsJson = requestMessage.BodyData.BodyAsJson;
if (bodyAsJson is JArray jArray)
{
return jArray.ToObject<T[]>();
}
var value = ((JObject)requestMessage.BodyData.BodyAsJson).ToObject<T>();
return new[] { value };
}
return default(T[]);
}
}
}

82
test/WireMock.Net.Tests/FluentMockServerAdminRestClientTests.cs
View File

@@ -1,9 +1,9 @@
using System.Linq;
using NFluent;
using RestEase;
using System.Linq;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Threading.Tasks;
using NFluent;
using RestEase;
using WireMock.Admin.Mappings;
using WireMock.Admin.Settings;
using WireMock.Client;
@@ -19,7 +19,7 @@ namespace WireMock.Net.Tests
[Fact]
public async Task IFluentMockServerAdmin_GetSettingsAsync()
{
// Assign
// Arrange
var server = FluentMockServer.StartWithAdminInterface();
var api = RestClient.For<IFluentMockServerAdmin>(server.Urls[0]);
@@ -31,7 +31,7 @@ namespace WireMock.Net.Tests
[Fact]
public async Task IFluentMockServerAdmin_PostSettingsAsync()
{
// Assign
// Arrange
var server = FluentMockServer.StartWithAdminInterface();
var api = RestClient.For<IFluentMockServerAdmin>(server.Urls[0]);
@@ -44,7 +44,7 @@ namespace WireMock.Net.Tests
[Fact]
public async Task IFluentMockServerAdmin_PutSettingsAsync()
{
// Assign
// Arrange
var server = FluentMockServer.StartWithAdminInterface();
var api = RestClient.For<IFluentMockServerAdmin>(server.Urls[0]);
@@ -57,22 +57,15 @@ namespace WireMock.Net.Tests
[Fact]
public async Task IFluentMockServerAdmin_PostMappingAsync()
{
// Assign
// Arrange
var server = FluentMockServer.StartWithAdminInterface();
var api = RestClient.For<IFluentMockServerAdmin>(server.Urls[0]);
// Act
var model = new MappingModel
{
Request = new RequestModel
{
Path = "/1"
},
Response = new ResponseModel
{
Body = "txt",
StatusCode = 200
},
Request = new RequestModel { Path = "/1" },
Response = new ResponseModel { Body = "txt", StatusCode = 200 },
Priority = 500,
Title = "test"
};
@@ -90,10 +83,41 @@ namespace WireMock.Net.Tests
server.Stop();
}
[Fact]
public async Task IFluentMockServerAdmin_PostMappingsAsync()
{
// Arrange
var server = FluentMockServer.StartWithAdminInterface();
var api = RestClient.For<IFluentMockServerAdmin>(server.Urls[0]);
// Act
var model1 = new MappingModel
{
Request = new RequestModel { Path = "/1" },
Response = new ResponseModel { Body = "txt 1" },
Title = "test 1"
};
var model2 = new MappingModel
{
Request = new RequestModel { Path = "/2" },
Response = new ResponseModel { Body = "txt 2" },
Title = "test 2"
};
var result = await api.PostMappingsAsync(new[] { model1, model2 });
// Assert
Check.That(result).IsNotNull();
Check.That(result.Status).IsNotNull();
Check.That(result.Guid).IsNull();
Check.That(server.Mappings.Where(m => !m.IsAdminInterface)).HasSize(2);
server.Stop();
}
[Fact]
public async Task IFluentMockServerAdmin_FindRequestsAsync()
{
// given
// Arrange
var server = FluentMockServer.Start(new FluentMockServerSettings
{
StartAdminInterface = true,
@@ -103,10 +127,10 @@ namespace WireMock.Net.Tests
await new HttpClient().GetAsync(serverUrl + "/foo");
var api = RestClient.For<IFluentMockServerAdmin>(serverUrl);
// when
// Act
var requests = await api.FindRequestsAsync(new RequestModel { Methods = new[] { "GET" } });
// then
// Assert
Check.That(requests).HasSize(1);
var requestLogged = requests.First();
Check.That(requestLogged.Request.Method).IsEqualTo("GET");
@@ -117,7 +141,7 @@ namespace WireMock.Net.Tests
[Fact]
public async Task IFluentMockServerAdmin_GetRequestsAsync()
{
// given
// Arrange
var server = FluentMockServer.Start(new FluentMockServerSettings
{
StartAdminInterface = true,
@@ -127,10 +151,10 @@ namespace WireMock.Net.Tests
await new HttpClient().GetAsync(serverUrl + "/foo");
var api = RestClient.For<IFluentMockServerAdmin>(serverUrl);
// when
// Act
var requests = await api.GetRequestsAsync();
// then
// Assert
Check.That(requests).HasSize(1);
var requestLogged = requests.First();
Check.That(requestLogged.Request.Method).IsEqualTo("GET");
@@ -141,7 +165,7 @@ namespace WireMock.Net.Tests
[Fact]
public async Task IFluentMockServerAdmin_GetRequestsAsync_JsonApi()
{
// given
// Arrange
var server = FluentMockServer.Start(new FluentMockServerSettings
{
StartAdminInterface = true,
@@ -159,13 +183,14 @@ namespace WireMock.Net.Tests
request.Content.Headers.ContentType = MediaTypeHeaderValue.Parse(jsonApiContentType);
var response = await new HttpClient().SendAsync(request);
Check.That(response).IsNotNull();
var api = RestClient.For<IFluentMockServerAdmin>(serverUrl);
// when
// Act
var requests = await api.GetRequestsAsync();
// then
// Assert
Check.That(requests).HasSize(1);
var requestLogged = requests.First();
Check.That(requestLogged.Request.Method).IsEqualTo("POST");
@@ -176,7 +201,7 @@ namespace WireMock.Net.Tests
[Fact]
public async Task IFluentMockServerAdmin_GetRequestsAsync_Json()
{
// given
// Arrange
var server = FluentMockServer.Start(new FluentMockServerSettings
{
StartAdminInterface = true,
@@ -193,13 +218,14 @@ namespace WireMock.Net.Tests
request.Content = new StringContent(data);
request.Content.Headers.ContentType = MediaTypeHeaderValue.Parse(jsonApiContentType);
var response = await new HttpClient().SendAsync(request);
Check.That(response).IsNotNull();
var api = RestClient.For<IFluentMockServerAdmin>(serverUrl);
// when
// Act
var requests = await api.GetRequestsAsync();
// then
// Assert
Check.That(requests).HasSize(1);
var requestLogged = requests.First();
Check.That(requestLogged.Request.Method).IsEqualTo("POST");