From e1c1db648041091eb2efbdeee1a4bfcbe1b2f7a1 Mon Sep 17 00:00:00 2001
From: Stef Heyenrath <stef.heyenrath@gmail.com>
Date: Mon, 20 Mar 2017 17:56:34 +0100
Subject: [PATCH] update tests (#21)

---
 appveyor.yml                                      | 4 ++--
 src/WireMock.Net/Server/FluentMockServer.Admin.cs | 6 +++---
 test/WireMock.Net.Tests/FluentMockServerTests.cs  | 7 +++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 8e339556..f44c57a5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,7 +3,6 @@ os: Visual Studio 2015
 version: 1.0.0.{build}
 
 configuration:
-- Debug
 - Release
 
 platform: Any CPU
@@ -39,7 +38,8 @@ build_script:
 
 test_script:
 # 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:
   - nuget.exe install OpenCover -ExcludeVersion
diff --git a/src/WireMock.Net/Server/FluentMockServer.Admin.cs b/src/WireMock.Net/Server/FluentMockServer.Admin.cs
index 36f50572..a47ef762 100644
--- a/src/WireMock.Net/Server/FluentMockServer.Admin.cs
+++ b/src/WireMock.Net/Server/FluentMockServer.Admin.cs
@@ -24,7 +24,7 @@ namespace WireMock.Server
     /// </summary>
     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 AdminRequests = "/__admin/requests";
         private const string AdminSettings = "/__admin/settings";
@@ -45,12 +45,12 @@ namespace WireMock.Server
         public void ReadStaticMappings([CanBeNull] string folder = null)
         {
             if (folder == null)
-                folder = Directory.GetCurrentDirectory() + AdminMappingsFolder;
+                folder = Path.Combine(Directory.GetCurrentDirectory(), AdminMappingsFolder);
 
             if (!Directory.Exists(folder))
                 return;
 
-            foreach (string filename in Directory.EnumerateFiles(Directory.GetCurrentDirectory() + AdminMappingsFolder))
+            foreach (string filename in Directory.EnumerateFiles(folder).OrderBy(f => f))
             {
                 ReadStaticMapping(filename);
             }
diff --git a/test/WireMock.Net.Tests/FluentMockServerTests.cs b/test/WireMock.Net.Tests/FluentMockServerTests.cs
index a20ca18b..f5d63c9b 100644
--- a/test/WireMock.Net.Tests/FluentMockServerTests.cs
+++ b/test/WireMock.Net.Tests/FluentMockServerTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
@@ -27,7 +28,8 @@ namespace WireMock.Net.Tests
 
             _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();
             Check.That(mappings).HasSize(1);
@@ -44,7 +46,8 @@ namespace WireMock.Net.Tests
             string guid = "00000002-ee28-4f29-ae63-1ac9b0802d86";
 
             _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();
             Check.That(mappings).HasSize(1);