starred/WireMock.Net
1
0
Fork 0
mirror of https://github.com/wiremock/WireMock.Net.git synced 2026-03-29 05:42:14 +02:00
Code Issues 32 Packages Projects Releases 10 Wiki Activity

update tests (#21)

Browse Source
This commit is contained in:
Stef Heyenrath
2017-03-20 17:56:34 +01:00
parent bd8e18b2c4
commit e1c1db6480
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
appveyor.yml
View File

@@ -3,7 +3,6 @@ os: Visual Studio 2015
version: 1.0.0.{build} version: 1.0.0.{build}
configuration: configuration:
- Debug
- Release - Release
platform: Any CPU platform: Any CPU
@@ -39,7 +38,8 @@ build_script:
test_script: test_script:
# test WireMock.Net.Tests # test WireMock.Net.Tests
- dotnet test -c %CONFIGURATION% --no-build .\test\WireMock.Net.Tests - cd .\test\WireMock.Net.Tests
- dotnet test -c %CONFIGURATION% --no-build
after_test: after_test:
- nuget.exe install OpenCover -ExcludeVersion - nuget.exe install OpenCover -ExcludeVersion

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

@@ -24,7 +24,7 @@ namespace WireMock.Server
/// </summary> /// </summary>
public partial class FluentMockServer public partial class FluentMockServer
{ {
private const string AdminMappingsFolder = @"\__admin\mappings\"; private static readonly string AdminMappingsFolder = Path.Combine("__admin", "mappings");
private const string AdminMappings = "/__admin/mappings"; private const string AdminMappings = "/__admin/mappings";
private const string AdminRequests = "/__admin/requests"; private const string AdminRequests = "/__admin/requests";
private const string AdminSettings = "/__admin/settings"; private const string AdminSettings = "/__admin/settings";
@@ -45,12 +45,12 @@ namespace WireMock.Server
public void ReadStaticMappings([CanBeNull] string folder = null) public void ReadStaticMappings([CanBeNull] string folder = null)
{ {
if (folder == null) if (folder == null)
folder = Directory.GetCurrentDirectory() + AdminMappingsFolder; folder = Path.Combine(Directory.GetCurrentDirectory(), AdminMappingsFolder);
if (!Directory.Exists(folder)) if (!Directory.Exists(folder))
return; return;
foreach (string filename in Directory.EnumerateFiles(Directory.GetCurrentDirectory() + AdminMappingsFolder)) foreach (string filename in Directory.EnumerateFiles(folder).OrderBy(f => f))
{ {
ReadStaticMapping(filename); ReadStaticMapping(filename);
} }

7
test/WireMock.Net.Tests/FluentMockServerTests.cs
View File

@@ -1,5 +1,6 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.IO;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;
@@ -27,7 +28,8 @@ namespace WireMock.Net.Tests
_server = FluentMockServer.Start(); _server = FluentMockServer.Start();
_server.ReadStaticMapping("./__admin/mappings/documentdb_root.json"); string folder = Path.Combine(Directory.GetCurrentDirectory(), "__admin", "mappings", "documentdb_root.json");
_server.ReadStaticMapping(folder);
var mappings = _server.Mappings.ToArray(); var mappings = _server.Mappings.ToArray();
Check.That(mappings).HasSize(1); Check.That(mappings).HasSize(1);
@@ -44,7 +46,8 @@ namespace WireMock.Net.Tests
string guid = "00000002-ee28-4f29-ae63-1ac9b0802d86"; string guid = "00000002-ee28-4f29-ae63-1ac9b0802d86";
_server = FluentMockServer.Start(); _server = FluentMockServer.Start();
_server.ReadStaticMapping("./__admin/mappings/" + guid + ".json"); string folder = Path.Combine(Directory.GetCurrentDirectory(), "__admin", "mappings", guid + ".json");
_server.ReadStaticMapping(folder);
var mappings = _server.Mappings.ToArray(); var mappings = _server.Mappings.ToArray();
Check.That(mappings).HasSize(1); Check.That(mappings).HasSize(1);