vs2017 (#25)

2026-03-20 16:23:42 +01:00 · 2017-04-14 11:52:38 +02:00
parent b547993415
commit b9373c29d3
100 changed files with 45670 additions and 269 deletions
--- a/test/WireMock.Net.Tests/FluentMockServerTests.cs
+++ b/test/WireMock.Net.Tests/FluentMockServerTests.cs
@@ -6,7 +6,7 @@ using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using NFluent;
-using NUnit.Framework;
+using Xunit;
 using WireMock.Matchers;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
@@ -14,9 +14,9 @@ using WireMock.Server;

 namespace WireMock.Net.Tests
 {
-    [TestFixture]
-    [Timeout(5000)]
-    public class FluentMockServerTests
+    //[TestFixture]
+    //[Timeout(5000)]
+    public class FluentMockServerTests : IDisposable
    {
        private FluentMockServer _server;

@@ -24,13 +24,13 @@ namespace WireMock.Net.Tests
        private string GetCurrentFolder()
        {
            string current = Directory.GetCurrentDirectory();
-            if (!current.EndsWith("WireMock.Net.Tests"))
-                return Path.Combine(current, "test", "WireMock.Net.Tests");
+            //if (!current.EndsWith("WireMock.Net.Tests"))
+            //    return Path.Combine(current, "test", "WireMock.Net.Tests");

            return current;
        }

-        [Test]
+        [Fact]
        public void FluentMockServer_StartStop()
        {
            var server1 = FluentMockServer.Start("http://localhost:9090/");
@@ -40,7 +40,7 @@ namespace WireMock.Net.Tests
            server2.Stop();
        }

-        [Test]
+        [Fact]
        public void FluentMockServer_ReadStaticMapping_WithNonGuidFilename()
        {
            var guid = Guid.Parse("04ee4872-9efd-4770-90d3-88d445265d0d");
@@ -60,7 +60,7 @@ namespace WireMock.Net.Tests
            Check.That(mappings.First().Title).Equals(title);
        }

-        [Test]
+        [Fact]
        public void FluentMockServer_ReadStaticMapping_WithGuidFilename()
        {
            string guid = "00000002-ee28-4f29-ae63-1ac9b0802d86";
@@ -78,7 +78,7 @@ namespace WireMock.Net.Tests
            Check.That(mappings.First().Title).IsNullOrEmpty();
        }

-        [Test]
+        [Fact]
        public void FluentMockServer_ReadStaticMappings()
        {
            _server = FluentMockServer.Start();
@@ -90,7 +90,7 @@ namespace WireMock.Net.Tests
            Check.That(mappings).HasSize(2);
        }

-        [Test]
+        [Fact]
        public void FluentMockServer_Admin_Mappings_Get()
        {
            var guid = Guid.Parse("90356dba-b36c-469a-a17e-669cd84f1f05");
@@ -113,7 +113,7 @@ namespace WireMock.Net.Tests
            Check.That(mappings[1].Guid).Not.Equals(guid);
        }

-        [Test]
+        [Fact]
        public void FluentMockServer_Admin_Mappings_Add_SameGuid()
        {
            var guid = Guid.Parse("90356dba-b36c-469a-a17e-669cd84f1f05");
@@ -135,7 +135,7 @@ namespace WireMock.Net.Tests
            Check.That(mappings.First().Guid).Equals(guid);
        }

-        [Test]
+        [Fact]
        public async Task FluentMockServer_Admin_Mappings_AtPriority()
        {
            _server = FluentMockServer.Start();
@@ -161,7 +161,7 @@ namespace WireMock.Net.Tests
            Check.That((int)response.StatusCode).IsEqualTo(400);
        }

-        [Test]
+        [Fact]
        public async Task FluentMockServer_Admin_Requests_Get()
        {
            // given
@@ -177,7 +177,7 @@ namespace WireMock.Net.Tests
            Check.That(requestLogged.RequestMessage.BodyAsBytes).IsNull();
        }

-        [Test]
+        [Fact]
        public async Task Should_respond_to_request()
        {
            // given
@@ -198,7 +198,7 @@ namespace WireMock.Net.Tests
            Check.That(response).IsEqualTo(@"{ msg: ""Hello world!""}");
        }

-        [Test]
+        [Fact]
        public async Task Should_respond_to_request_bodyAsBase64()
        {
            // given
@@ -213,7 +213,7 @@ namespace WireMock.Net.Tests
            Check.That(response).IsEqualTo("Hello World?");
        }

-        [Test]
+        [Fact]
        public async Task Should_respond_404_for_unexpected_request()
        {
            // given
@@ -227,7 +227,7 @@ namespace WireMock.Net.Tests
            Check.That((int)response.StatusCode).IsEqualTo(404);
        }

-        [Test]
+        [Fact]
        public async Task Should_find_a_request_satisfying_a_request_spec()
        {
            // given
@@ -246,7 +246,7 @@ namespace WireMock.Net.Tests
            Check.That(requestLogged.RequestMessage.Url).IsEqualTo("http://localhost:" + _server.Ports[0] + "/bar");
        }

-        [Test]
+        [Fact]
        public async Task Should_reset_requestlogs()
        {
            // given
@@ -260,7 +260,7 @@ namespace WireMock.Net.Tests
            Check.That(_server.LogEntries).IsEmpty();
        }

-        [Test]
+        [Fact]
        public void Should_reset_mappings()
        {
            // given
@@ -282,7 +282,7 @@ namespace WireMock.Net.Tests
                .ThrowsAny();
        }

-        [Test]
+        [Fact]
        public async Task Should_respond_a_redirect_without_body()
        {
            // given
@@ -310,7 +310,7 @@ namespace WireMock.Net.Tests
            Check.That(response).IsEqualTo("REDIRECT SUCCESSFUL");
        }

-        [Test]
+        [Fact]
        public async Task Should_delay_responses_for_a_given_route()
        {
            // given
@@ -333,7 +333,7 @@ namespace WireMock.Net.Tests
            Check.That(watch.ElapsedMilliseconds).IsStrictlyGreaterThan(200);
        }

-        [Test]
+        [Fact]
        public async Task Should_delay_responses()
        {
            // given
@@ -353,8 +353,8 @@ namespace WireMock.Net.Tests
            Check.That(watch.ElapsedMilliseconds).IsStrictlyGreaterThan(200);
        }

-        [TearDown]
-        public void ShutdownServer()
+        //[TearDown]
+        public void Dispose()
        {
            _server?.Stop();
        }
--- a/test/WireMock.Net.Tests/Http/TinyHttpServerTests.cs
+++ b/test/WireMock.Net.Tests/Http/TinyHttpServerTests.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Net.Http;
 using NFluent;
-using NUnit.Framework;
+using Xunit;
 using WireMock.Http;

 [module:
@@ -15,10 +15,10 @@ using WireMock.Http;

 namespace WireMock.Net.Tests.Http
 {
-    [TestFixture]
+    //[TestFixture]
    public class TinyHttpServerTests
    {
-        [Test]
+        [Fact]
        public void Should_call_handler_on_request()
        {
            // given
--- a/test/WireMock.Net.Tests/HttpListenerRequestMapperTests.cs
+++ b/test/WireMock.Net.Tests/HttpListenerRequestMapperTests.cs
@@ -5,23 +5,23 @@ using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using NFluent;
-using NUnit.Framework;
+using Xunit;
 using WireMock.Http;

 namespace WireMock.Net.Tests
 {
-    [TestFixture]
-    public class HttpListenerRequestMapperTests
+    //[TestFixture]
+    public class HttpListenerRequestMapperTests : IDisposable
    {
        private MapperServer _server;

-        [SetUp]
-        public void StartListenerServer()
+        //[SetUp]
+        public HttpListenerRequestMapperTests()
        {
            _server = MapperServer.Start();
        }

-        [Test]
+        [Fact]
        public async Task Should_map_uri_from_listener_request()
        {
            // given
@@ -35,7 +35,7 @@ namespace WireMock.Net.Tests
            Check.That(MapperServer.LastRequestMessage.Path).IsEqualTo("/toto");
        }

-        [Test]
+        [Fact]
        public async Task Should_map_verb_from_listener_request()
        {
            // given
@@ -49,7 +49,7 @@ namespace WireMock.Net.Tests
            Check.That(MapperServer.LastRequestMessage.Method).IsEqualTo("put");
        }

-        [Test]
+        [Fact]
        public async Task Should_map_body_from_listener_request()
        {
            // given
@@ -63,7 +63,7 @@ namespace WireMock.Net.Tests
            Check.That(MapperServer.LastRequestMessage.Body).IsEqualTo("Hello!");
        }

-        [Test]
+        [Fact]
        public async Task Should_map_headers_from_listener_request()
        {
            // given
@@ -79,7 +79,7 @@ namespace WireMock.Net.Tests
            Check.That(MapperServer.LastRequestMessage.Headers.Contains(new KeyValuePair<string, string>("X-Alex", "1706"))).IsTrue();
        }

-        [Test]
+        [Fact]
        public async Task Should_map_params_from_listener_request()
        {
            // given
@@ -94,8 +94,8 @@ namespace WireMock.Net.Tests
            Check.That(MapperServer.LastRequestMessage.GetParameter("id")).HasSize(1);
        }

-        [TearDown]
-        public void StopListenerServer()
+        //[TearDown]
+        public void Dispose()
        {
            _server.Stop();
        }
--- a/test/WireMock.Net.Tests/HttpListenerResponseMapperTests.cs
+++ b/test/WireMock.Net.Tests/HttpListenerResponseMapperTests.cs
@@ -1,21 +1,22 @@
-using System.Net;
+using System;
+using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using NFluent;
-using NUnit.Framework;
+using Xunit;
 using WireMock.Http;

 namespace WireMock.Net.Tests
 {
-    [TestFixture]
-    public class HttpListenerResponseMapperTests
+    //[TestFixture]
+    public class HttpListenerResponseMapperTests : IDisposable
    {
        private TinyHttpServer _server;
        private Task<HttpResponseMessage> _responseMsgTask;

-        [Test]
+        [Fact]
        public void Should_map_status_code_from_original_response()
        {
            // given
@@ -29,7 +30,7 @@ namespace WireMock.Net.Tests
            Check.That(httpListenerResponse.StatusCode).IsEqualTo(404);
        }

-        [Test]
+        [Fact]
        public void Should_map_headers_from_original_response()
        {
            // given
@@ -46,7 +47,7 @@ namespace WireMock.Net.Tests
            Check.That(httpListenerResponse.Headers.Get("cache-control")).Contains("no-cache");
        }

-        [Test]
+        [Fact]
        public void Should_map_body_from_original_response()
        {
            // given
@@ -68,7 +69,7 @@ namespace WireMock.Net.Tests
            Check.That(contentTask.Result).IsEqualTo("Hello !!!");
        }

-        [Test]
+        [Fact]
        public void Should_map_encoded_body_from_original_response()
        {
            // given
@@ -93,8 +94,8 @@ namespace WireMock.Net.Tests
            Check.That(contentTask.Result).IsEqualTo("Hello !!!");
        }

-        [TearDown]
-        public void StopServer()
+        //[TearDown]
+        public void Dispose()
        {
            _server?.Stop();
        }
--- a/test/WireMock.Net.Tests/RequestMessageTests.cs
+++ b/test/WireMock.Net.Tests/RequestMessageTests.cs
@@ -1,14 +1,14 @@
 using System;
 using System.Text;
 using NFluent;
-using NUnit.Framework;
+using Xunit;

 namespace WireMock.Net.Tests
 {
-    [TestFixture]
+    //[TestFixture]
    public class RequestMessageTests
    {
-        [Test]
+        [Fact]
        public void Should_handle_empty_query()
        {
            // given
@@ -18,7 +18,7 @@ namespace WireMock.Net.Tests
            Check.That(request.GetParameter("not_there")).IsNull();
        }

-        [Test]
+        [Fact]
        public void Should_parse_query_params()
        {
            // given
--- a/test/WireMock.Net.Tests/RequestTests.cs
+++ b/test/WireMock.Net.Tests/RequestTests.cs
@@ -2,17 +2,17 @@
 using System.Collections.Generic;
 using System.Text;
 using NFluent;
-using NUnit.Framework;
+using Xunit;
 using WireMock.RequestBuilders;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;

 namespace WireMock.Net.Tests
 {
-    [TestFixture]
+    //[TestFixture]
    public class RequestTests
    {
-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_path()
        {
            // given
@@ -26,7 +26,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_paths()
        {
            var requestBuilder = Request.Create().WithPath("/x1", "/x2");
@@ -39,7 +39,7 @@ namespace WireMock.Net.Tests
            Check.That(requestBuilder.GetMatchingScore(request2, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_pathFuncs()
        {
            // given
@@ -53,7 +53,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_path_prefix()
        {
            // given
@@ -67,7 +67,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_exclude_requests_not_matching_given_path()
        {
            // given
@@ -81,7 +81,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_url()
        {
            // given
@@ -95,7 +95,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_path_and_method_put()
        {
            // given
@@ -109,7 +109,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_path_and_method_post()
        {
            // given
@@ -123,7 +123,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_path_and_method_get()
        {
            // given
@@ -137,7 +137,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_path_and_method_delete()
        {
            // given
@@ -153,7 +153,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_path_and_method_head()
        {
            // given
@@ -167,7 +167,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_exclude_requests_matching_given_path_but_not_http_method()
        {
            // given
@@ -181,7 +181,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_exclude_requests_matching_given_http_method_but_not_url()
        {
            // given
@@ -195,7 +195,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_path_and_headers()
        {
            // given
@@ -211,7 +211,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_exclude_requests_not_matching_given_headers()
        {
            // given
@@ -227,7 +227,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_exclude_requests_not_matching_given_headers_ignorecase()
        {
            // given
@@ -243,7 +243,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_header_prefix()
        {
            // given
@@ -259,7 +259,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_cookies()
        {
            // given
@@ -273,7 +273,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_body()
        {
            // given
@@ -289,7 +289,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_body_using_ExactMatcher_true()
        {
            // given
@@ -305,7 +305,7 @@ namespace WireMock.Net.Tests
            Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_body_using_ExactMatcher_multiplePatterns()
        {
            // given
@@ -321,7 +321,7 @@ namespace WireMock.Net.Tests
            Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(0.5);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_body_using_ExactMatcher_false()
        {
            // given
@@ -337,7 +337,7 @@ namespace WireMock.Net.Tests
            Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsStrictlyLessThan(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_body_using_SimMetricsMatcher1()
        {
            // given
@@ -353,7 +353,7 @@ namespace WireMock.Net.Tests
            Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsStrictlyLessThan(1.0).And.IsStrictlyGreaterThan(0.5);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_body_using_SimMetricsMatcher2()
        {
            // given
@@ -369,7 +369,7 @@ namespace WireMock.Net.Tests
            Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsStrictlyLessThan(0.1).And.IsStrictlyGreaterThan(0.05);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_body_using_WildcardMatcher()
        {
            // given
@@ -385,7 +385,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_body_using_RegexMatcher()
        {
            // given
@@ -401,7 +401,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_body_using_XPathMatcher_true()
        {
            // given
@@ -422,7 +422,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_body_using_XPathMatcher_false()
        {
            // given
@@ -443,7 +443,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_body_using_JsonPathMatcher_true()
        {
            // given
@@ -459,7 +459,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_body_using_JsonPathMatcher_false()
        {
            // given
@@ -475,7 +475,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_exclude_requests_not_matching_given_body()
        {
            // given
@@ -491,7 +491,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsNotEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_param()
        {
            // given
@@ -505,7 +505,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_paramNoValue()
        {
            // given
@@ -519,7 +519,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_specify_requests_matching_given_param_func()
        {
            // given
@@ -533,7 +533,7 @@ namespace WireMock.Net.Tests
            Check.That(spec.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
        }

-        [Test]
+        [Fact]
        public void Should_exclude_requests_not_matching_given_params()
        {
            // given
--- a/test/WireMock.Net.Tests/ResponseTests.cs
+++ b/test/WireMock.Net.Tests/ResponseTests.cs
@@ -3,15 +3,15 @@ using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
 using NFluent;
-using NUnit.Framework;
+using Xunit;
 using WireMock.ResponseBuilders;

 namespace WireMock.Net.Tests
 {
-    [TestFixture]
+    //[TestFixture]
    public class ResponseTests
    {
-        [Test]
+        [Fact]
        public async Task Response_ProvideResponse_Handlebars_UrlPathVerb()
        {
            // given
@@ -30,7 +30,7 @@ namespace WireMock.Net.Tests
            Check.That(responseMessage.Body).Equals("test http://localhost/foo /foo post");
        }

-        [Test]
+        [Fact]
        public async Task Response_ProvideResponse_Handlebars_Query()
        {
            // given
@@ -49,7 +49,7 @@ namespace WireMock.Net.Tests
            Check.That(responseMessage.Body).Equals("test keya=1 idx=1 idx=2 keyb=5");
        }

-        [Test]
+        [Fact]
        public async Task Response_ProvideResponse_Handlebars_Headers()
        {
            // given
@@ -67,7 +67,7 @@ namespace WireMock.Net.Tests
            Check.That(responseMessage.Headers).Contains(new KeyValuePair<string,string>("x", "text/plain"));
        }

-        [Test]
+        [Fact]
        public async Task Response_ProvideResponse_Encoding_Body()
        {
            // given
@@ -85,7 +85,7 @@ namespace WireMock.Net.Tests
            Check.That(responseMessage.BodyEncoding).Equals(Encoding.ASCII);
        }

-        [Test]
+        [Fact]
        public async Task Response_ProvideResponse_Encoding_JsonBody()
        {
            // given
--- a/test/WireMock.Net.Tests/WildcardMatcherTest.cs
+++ b/test/WireMock.Net.Tests/WildcardMatcherTest.cs
@@ -1,12 +1,13 @@
-using NUnit.Framework;
+using NFluent;
+using Xunit;
 using WireMock.Matchers;

 namespace WireMock.Net.Tests
 {
-    [TestFixture]
+    //[TestFixture]
    public class WildcardMatcherTest
    {
-        [Test]
+        [Fact]
        public void WildcardMatcher_patterns_positive()
        {
            var tests = new[]
@@ -25,14 +26,16 @@ namespace WireMock.Net.Tests
                new { p = "*a*bc*", i = "abc" },
                new { p = "*a*b?", i = "aXXXbc" }
            };
+
            foreach (var test in tests)
            {
                var matcher = new WildcardMatcher(test.p);
-                Assert.AreEqual(1.0, matcher.IsMatch(test.i), "p = " + test.p + ", i = " + test.i);
+                Check.That(matcher.IsMatch(test.i)).Equals(1.0);
+                //Assert.AreEqual(1.0, matcher.IsMatch(test.i), "p = " + test.p + ", i = " + test.i);
            }
        }

-        [Test]
+        [Fact]
        public void WildcardMatcher_patterns_negative()
        {
            var tests = new[]
@@ -49,10 +52,12 @@ namespace WireMock.Net.Tests
                new { p = "*abc*", i = "Xbc"},
                new { p = "*a*bc*", i = "ac"}
            };
+
            foreach (var test in tests)
            {
                var matcher = new WildcardMatcher(test.p);
-                Assert.AreEqual(0.0, matcher.IsMatch(test.i), "p = " + test.p + ", i = " + test.i);
+                //Assert.AreEqual(0.0, matcher.IsMatch(test.i), "p = " + test.p + ", i = " + test.i);
+                Check.That(matcher.IsMatch(test.i)).Equals(0.0);
            }
        }
    }
--- a/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj
+++ b/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj
@@ -0,0 +1,50 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Authors>Stef Heyenrath</Authors>
+    <TargetFramework>net452</TargetFramework>
+    <DebugType>full</DebugType>
+    <AssemblyName>WireMock.Net.Tests</AssemblyName>
+    <PackageId>WireMock.Net.Tests</PackageId>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <!--<PackageReference Include="Microsoft.Extensions.Testing.Abstractions" Version="1.0.0-preview2-1-003177" />-->
+    <PackageReference Include="Moq" Version="4.7.8" />
+    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <!--<PackageReference Include="NUnit" Version="3.6.1" />
+    <PackageReference Include="dotnet-test-nunit" Version="3.4.0-beta-3" />-->
+    <PackageReference Include="NFluent" Version="2.0.0-alpha" />
+    <PackageReference Include="OpenCover" Version="4.6.519" />
+    <PackageReference Include="ReportGenerator" Version="2.5.6" />
+    <PackageReference Include="SimMetrics.Net" Version="1.0.3" />
+    <PackageReference Include="xunit" Version="2.2.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="__admin\mappings\00000002-ee28-4f29-ae63-1ac9b0802d86.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="__admin\mappings\documentdb_root.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>
--- a/test/WireMock.Net.Tests/WireMock.Net.Tests.xproj
+++ b/test/WireMock.Net.Tests/WireMock.Net.Tests.xproj
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>31dc2ef8-c3fe-467d-84be-fb5d956e612e</ProjectGuid>
-    <RootNamespace>WireMock.Net.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
--- a/test/WireMock.Net.Tests/project.json
+++ b/test/WireMock.Net.Tests/project.json
@@ -1,28 +0,0 @@
-{
-    "version": "1.0.0-*",
-    "authors": [ "Stef Heyenrath" ],
-
-    "buildOptions": { "debugType": "portable" },
-
-    "dependencies": {
-        "Microsoft.Extensions.Testing.Abstractions": "1.0.0-preview2-003121",
-        "Moq": "4.7.1",
-        "NUnit": "3.6.1",
-        "dotnet-test-nunit": "3.4.0-beta-3",
-        "NFluent": "2.0.0-alpha",
-        "SimMetrics.Net": "1.0.1.0",
-        "WireMock.Net": { "target": "project" }
-    },
-
-    "frameworks": {
-        "net452": {
-            "frameworkAssemblies": {
-                "System.Net.Http": { "type": "build" }
-            },
-            "dependencies": {
-            }
-        }
-    },
-
-    "testRunner": "nunit"
-}