From 6d46829ce2214e15fa1c957acbc2934dc84ece4b Mon Sep 17 00:00:00 2001
From: Tom Pallister <Tom.Pallister@moonpig.com>
Date: Wed, 24 Aug 2016 17:51:55 +0100
Subject: [PATCH] Started adding BDDfy...

---
 test/Ocelot.AcceptanceTests/RouterTests.cs    |  6 ++--
 test/Ocelot.AcceptanceTests/project.json      |  5 +--
 .../HostUrlMapRepositoryTests.cs              | 32 +++++++++++--------
 test/Ocelot.UnitTests/project.json            |  5 +--
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/test/Ocelot.AcceptanceTests/RouterTests.cs b/test/Ocelot.AcceptanceTests/RouterTests.cs
index c3d5fafa..2d4d2c4e 100644
--- a/test/Ocelot.AcceptanceTests/RouterTests.cs
+++ b/test/Ocelot.AcceptanceTests/RouterTests.cs
@@ -9,6 +9,7 @@ using Shouldly;
 namespace Ocelot.AcceptanceTests
 {
     using System.Net;
+    using TestStack.BDDfy;
 
     public class RouterTests : IDisposable
     {
@@ -30,8 +31,9 @@ namespace Ocelot.AcceptanceTests
         [Fact]
         public void should_return_response_404()
         {
-            WhenIRequestTheUrl("/");
-            ThenTheStatusCodeShouldBe(HttpStatusCode.NotFound);
+            this.When(x => x.WhenIRequestTheUrl("/"))
+                .Then(x => x.ThenTheStatusCodeShouldBe(HttpStatusCode.NotFound))
+                .BDDfy();
         }
 
         private void WhenIRequestTheUrl(string url)
diff --git a/test/Ocelot.AcceptanceTests/project.json b/test/Ocelot.AcceptanceTests/project.json
index f59b9e22..c350a62b 100644
--- a/test/Ocelot.AcceptanceTests/project.json
+++ b/test/Ocelot.AcceptanceTests/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "1.0.0-*",
 
     "testRunner": "xunit",
@@ -24,7 +24,8 @@
         "dotnet-test-xunit": "2.2.0-preview2-build1029",
         "Shouldly": "2.8.0",
         "Ocelot": "1.0.0-*",
-        "Microsoft.AspNetCore.TestHost": "1.0.0"
+      "Microsoft.AspNetCore.TestHost": "1.0.0",
+      "TestStack.BDDfy": "4.3.1"
     },
 
     "frameworks": {
diff --git a/test/Ocelot.UnitTests/HostUrlMapRepositoryTests.cs b/test/Ocelot.UnitTests/HostUrlMapRepositoryTests.cs
index 2bcd998f..eb42e999 100644
--- a/test/Ocelot.UnitTests/HostUrlMapRepositoryTests.cs
+++ b/test/Ocelot.UnitTests/HostUrlMapRepositoryTests.cs
@@ -5,6 +5,8 @@ using Xunit;
 
 namespace Ocelot.UnitTests
 {
+    using TestStack.BDDfy;
+
     public class HostUrlMapRepositoryTests
     {
         private string _upstreamBaseUrl;
@@ -21,34 +23,38 @@ namespace Ocelot.UnitTests
         [Fact]
         public void can_add_route()
         {
-            GivenIHaveAnUpstreamBaseUrl("www.someapi.com");
-            GivenIWantToRouteRequestsFromMyDownstreamBaseUrl("api");
-            WhenIAddTheConfiguration();
-            ThenTheResponseIsSuccesful();
+            this.Given(x => x.GivenIHaveAnUpstreamBaseUrl("www.someapi.com"))
+                .And(x => x.GivenIWantToRouteRequestsFromMyDownstreamBaseUrl("api"))
+                .When(x => x.WhenIAddTheConfiguration())
+                .Then(x => x.ThenTheResponseIsSuccesful())
+                .BDDfy();
         }
 
         [Fact]
         public void can_get_route_by_key()
         {
-            GivenIHaveSetUpAnApiKeyAndUpstreamUrl("api2", "www.someapi.com");
-            WhenIRetrieveTheRouteByKey();
-            ThenTheRouteIsReturned();
+            this.Given(x => x.GivenIHaveSetUpAnApiKeyAndUpstreamUrl("api2", "www.someapi.com"))
+                .When(x => x.WhenIRetrieveTheRouteByKey())
+                .Then(x => x.ThenTheRouteIsReturned())
+                .BDDfy();
         }
  
         [Fact]
         public void should_return_error_response_when_key_already_used()
         {
-            GivenIHaveSetUpAnApiKeyAndUpstreamUrl("api2", "www.someapi.com");
-            WhenITryToUseTheSameKey();
-            ThenTheKeyHasAlreadyBeenUsed();
+            this.Given(x => x.GivenIHaveSetUpAnApiKeyAndUpstreamUrl("api2", "www.someapi.com"))
+                .When(x => x.WhenITryToUseTheSameKey())
+                .Then(x => x.ThenTheKeyHasAlreadyBeenUsed())
+                .BDDfy();
         }
 
         [Fact]
         public void should_return_error_response_if_key_doesnt_exist()
         {
-            GivenIWantToRouteRequestsFromMyDownstreamBaseUrl("api");
-            WhenIRetrieveTheRouteByKey();
-            ThenTheKeyDoesNotExist();
+            this.Given(x => x.GivenIWantToRouteRequestsFromMyDownstreamBaseUrl("api"))
+                .When(x => x.WhenIRetrieveTheRouteByKey())
+                .Then(x => x.ThenTheKeyDoesNotExist())
+                .BDDfy();
         }
 
         private void WhenITryToUseTheSameKey()
diff --git a/test/Ocelot.UnitTests/project.json b/test/Ocelot.UnitTests/project.json
index 926c8e73..f415f589 100644
--- a/test/Ocelot.UnitTests/project.json
+++ b/test/Ocelot.UnitTests/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "1.0.0-*",
 
     "testRunner": "xunit",
@@ -22,7 +22,8 @@
         "Ocelot.Library": "1.0.0-*",
         "xunit": "2.1.0",
         "dotnet-test-xunit": "2.2.0-preview2-build1029",
-        "Shouldly": "2.8.0"
+      "Shouldly": "2.8.0",
+      "TestStack.BDDfy": "4.3.1"
     },
 
     "frameworks": {