From dfbb182a334e6e44c94cc6f2e71c56f339028f66 Mon Sep 17 00:00:00 2001 From: Hibri Marzook Date: Mon, 27 Mar 2017 11:02:43 +0100 Subject: [PATCH] Split out verifications into own lib, to remove NUnit dependency (#67) * slpit out verifications into own lib, to remove NUnit dependency from main package * Remove extensions path * remove mixed platforms * upgrade NUnit and remove Rhino from integration tests project * move nuspec to HttpMock dir * add nuspec * fix nunit refs * fix typo --- HttpMock.sln | 130 ++++++++++-------- .../HttpExpectationTests.cs | 1 + .../HttpMock.Integration.Tests.csproj | 11 +- .../packages.config | 2 +- .../HttpMock.Unit.Tests.csproj | 4 +- src/HttpMock.Unit.Tests/packages.config | 2 +- .../HttpMock.Verify.NUnit.csproj | 70 ++++++++++ .../HttpMock.Verify.NUnit.nuspec | Bin 0 -> 1858 bytes .../HttpServerExtensions.cs | 19 +++ .../Properties/AssemblyInfo.cs | 40 ++++++ .../RequestHandlerExpectExtensions.cs | 5 +- .../RequestWasCalled.cs | 2 +- .../RequestWasNotCalled.cs | 2 +- src/HttpMock/HttpMock.csproj | 10 +- .../HttpMock/HttpMock.nuspec | Bin 2332 -> 2306 bytes src/HttpMock/HttpServer.cs | 22 ++- src/HttpMock/IHttpServer.cs | 3 +- src/HttpMock/IRequestProcessor.cs | 12 ++ src/HttpMock/RequestProcessor.cs | 8 -- src/HttpMock/packages.config | 1 - 20 files changed, 238 insertions(+), 106 deletions(-) create mode 100644 src/HttpMock.Verify.NUnit/HttpMock.Verify.NUnit.csproj create mode 100644 src/HttpMock.Verify.NUnit/HttpMock.Verify.NUnit.nuspec create mode 100644 src/HttpMock.Verify.NUnit/HttpServerExtensions.cs create mode 100644 src/HttpMock.Verify.NUnit/Properties/AssemblyInfo.cs rename src/{HttpMock => HttpMock.Verify.NUnit}/RequestHandlerExpectExtensions.cs (90%) rename src/{HttpMock => HttpMock.Verify.NUnit}/RequestWasCalled.cs (93%) rename src/{HttpMock => HttpMock.Verify.NUnit}/RequestWasNotCalled.cs (93%) rename HttpMock.nuspec => src/HttpMock/HttpMock.nuspec (76%) create mode 100644 src/HttpMock/IRequestProcessor.cs diff --git a/HttpMock.sln b/HttpMock.sln index d34723d..3efecb4 100644 --- a/HttpMock.sln +++ b/HttpMock.sln @@ -1,61 +1,69 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HttpMock", "src\HttpMock\HttpMock.csproj", "{7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HttpMock.Integration.Tests", "src\HttpMock.Integration.Tests\HttpMock.Integration.Tests.csproj", "{3E61549A-1FAC-416B-BA50-7265E6FC1D03}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HttpMock.Unit.Tests", "src\HttpMock.Unit.Tests\HttpMock.Unit.Tests.csproj", "{92735A21-16E8-46BC-859D-AB96F137C457}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{BF7536BA-5DEE-48E0-BD16-45E3C36B1979}" - ProjectSection(SolutionItems) = preProject - .nuget\NuGet.Config = .nuget\NuGet.Config - .nuget\NuGet.exe = .nuget\NuGet.exe - .nuget\NuGet.targets = .nuget\NuGet.targets - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}.Debug|x86.ActiveCfg = Debug|Any CPU - {7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}.Release|Any CPU.Build.0 = Release|Any CPU - {7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}.Release|x86.ActiveCfg = Release|Any CPU - {3E61549A-1FAC-416B-BA50-7265E6FC1D03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E61549A-1FAC-416B-BA50-7265E6FC1D03}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E61549A-1FAC-416B-BA50-7265E6FC1D03}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {3E61549A-1FAC-416B-BA50-7265E6FC1D03}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {3E61549A-1FAC-416B-BA50-7265E6FC1D03}.Debug|x86.ActiveCfg = Debug|Any CPU - {3E61549A-1FAC-416B-BA50-7265E6FC1D03}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E61549A-1FAC-416B-BA50-7265E6FC1D03}.Release|Any CPU.Build.0 = Release|Any CPU - {3E61549A-1FAC-416B-BA50-7265E6FC1D03}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {3E61549A-1FAC-416B-BA50-7265E6FC1D03}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {3E61549A-1FAC-416B-BA50-7265E6FC1D03}.Release|x86.ActiveCfg = Release|Any CPU - {92735A21-16E8-46BC-859D-AB96F137C457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {92735A21-16E8-46BC-859D-AB96F137C457}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92735A21-16E8-46BC-859D-AB96F137C457}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {92735A21-16E8-46BC-859D-AB96F137C457}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {92735A21-16E8-46BC-859D-AB96F137C457}.Debug|x86.ActiveCfg = Debug|Any CPU - {92735A21-16E8-46BC-859D-AB96F137C457}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92735A21-16E8-46BC-859D-AB96F137C457}.Release|Any CPU.Build.0 = Release|Any CPU - {92735A21-16E8-46BC-859D-AB96F137C457}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {92735A21-16E8-46BC-859D-AB96F137C457}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {92735A21-16E8-46BC-859D-AB96F137C457}.Release|x86.ActiveCfg = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HttpMock", "src\HttpMock\HttpMock.csproj", "{7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HttpMock.Integration.Tests", "src\HttpMock.Integration.Tests\HttpMock.Integration.Tests.csproj", "{3E61549A-1FAC-416B-BA50-7265E6FC1D03}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HttpMock.Unit.Tests", "src\HttpMock.Unit.Tests\HttpMock.Unit.Tests.csproj", "{92735A21-16E8-46BC-859D-AB96F137C457}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{BF7536BA-5DEE-48E0-BD16-45E3C36B1979}" + ProjectSection(SolutionItems) = preProject + .nuget\NuGet.Config = .nuget\NuGet.Config + .nuget\NuGet.exe = .nuget\NuGet.exe + .nuget\NuGet.targets = .nuget\NuGet.targets + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HttpMock.Verify.NUnit", "src\HttpMock.Verify.NUnit\HttpMock.Verify.NUnit.csproj", "{1B61C8E3-7A43-479B-B7FE-D374DFEAA5E7}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}.Debug|x86.ActiveCfg = Debug|Any CPU + {7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}.Release|Any CPU.Build.0 = Release|Any CPU + {7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}.Release|x86.ActiveCfg = Release|Any CPU + {3E61549A-1FAC-416B-BA50-7265E6FC1D03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3E61549A-1FAC-416B-BA50-7265E6FC1D03}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3E61549A-1FAC-416B-BA50-7265E6FC1D03}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {3E61549A-1FAC-416B-BA50-7265E6FC1D03}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {3E61549A-1FAC-416B-BA50-7265E6FC1D03}.Debug|x86.ActiveCfg = Debug|Any CPU + {3E61549A-1FAC-416B-BA50-7265E6FC1D03}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3E61549A-1FAC-416B-BA50-7265E6FC1D03}.Release|Any CPU.Build.0 = Release|Any CPU + {3E61549A-1FAC-416B-BA50-7265E6FC1D03}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {3E61549A-1FAC-416B-BA50-7265E6FC1D03}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {3E61549A-1FAC-416B-BA50-7265E6FC1D03}.Release|x86.ActiveCfg = Release|Any CPU + {92735A21-16E8-46BC-859D-AB96F137C457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {92735A21-16E8-46BC-859D-AB96F137C457}.Debug|Any CPU.Build.0 = Debug|Any CPU + {92735A21-16E8-46BC-859D-AB96F137C457}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {92735A21-16E8-46BC-859D-AB96F137C457}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {92735A21-16E8-46BC-859D-AB96F137C457}.Debug|x86.ActiveCfg = Debug|Any CPU + {92735A21-16E8-46BC-859D-AB96F137C457}.Release|Any CPU.ActiveCfg = Release|Any CPU + {92735A21-16E8-46BC-859D-AB96F137C457}.Release|Any CPU.Build.0 = Release|Any CPU + {92735A21-16E8-46BC-859D-AB96F137C457}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {92735A21-16E8-46BC-859D-AB96F137C457}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {92735A21-16E8-46BC-859D-AB96F137C457}.Release|x86.ActiveCfg = Release|Any CPU + {1B61C8E3-7A43-479B-B7FE-D374DFEAA5E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1B61C8E3-7A43-479B-B7FE-D374DFEAA5E7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1B61C8E3-7A43-479B-B7FE-D374DFEAA5E7}.Debug|x86.ActiveCfg = Debug|x86 + {1B61C8E3-7A43-479B-B7FE-D374DFEAA5E7}.Debug|x86.Build.0 = Debug|x86 + {1B61C8E3-7A43-479B-B7FE-D374DFEAA5E7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1B61C8E3-7A43-479B-B7FE-D374DFEAA5E7}.Release|Any CPU.Build.0 = Release|Any CPU + {1B61C8E3-7A43-479B-B7FE-D374DFEAA5E7}.Release|x86.ActiveCfg = Release|x86 + {1B61C8E3-7A43-479B-B7FE-D374DFEAA5E7}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/src/HttpMock.Integration.Tests/HttpExpectationTests.cs b/src/HttpMock.Integration.Tests/HttpExpectationTests.cs index 046cead..eed05af 100644 --- a/src/HttpMock.Integration.Tests/HttpExpectationTests.cs +++ b/src/HttpMock.Integration.Tests/HttpExpectationTests.cs @@ -1,5 +1,6 @@ using System; using System.Net; +using HttpMock.Verify.NUnit; using NUnit.Framework; namespace HttpMock.Integration.Tests diff --git a/src/HttpMock.Integration.Tests/HttpMock.Integration.Tests.csproj b/src/HttpMock.Integration.Tests/HttpMock.Integration.Tests.csproj index 011e808..698df28 100644 --- a/src/HttpMock.Integration.Tests/HttpMock.Integration.Tests.csproj +++ b/src/HttpMock.Integration.Tests/HttpMock.Integration.Tests.csproj @@ -40,11 +40,8 @@ ..\..\packages\log4net.2.0.7\lib\net45-full\log4net.dll - - ..\..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll - - - ..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll + + ..\..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll @@ -81,6 +78,10 @@ + + {1B61C8E3-7A43-479B-B7FE-D374DFEAA5E7} + HttpMock.Verify.NUnit + {7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C} HttpMock diff --git a/src/HttpMock.Integration.Tests/packages.config b/src/HttpMock.Integration.Tests/packages.config index 835e595..27ccff4 100644 --- a/src/HttpMock.Integration.Tests/packages.config +++ b/src/HttpMock.Integration.Tests/packages.config @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/HttpMock.Unit.Tests/HttpMock.Unit.Tests.csproj b/src/HttpMock.Unit.Tests/HttpMock.Unit.Tests.csproj index f62f25f..84a031c 100644 --- a/src/HttpMock.Unit.Tests/HttpMock.Unit.Tests.csproj +++ b/src/HttpMock.Unit.Tests/HttpMock.Unit.Tests.csproj @@ -37,8 +37,8 @@ ..\..\packages\Kayak.0.7.2\lib\Kayak.dll - - ..\..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll + + ..\..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll diff --git a/src/HttpMock.Unit.Tests/packages.config b/src/HttpMock.Unit.Tests/packages.config index dab4e11..1dafe47 100644 --- a/src/HttpMock.Unit.Tests/packages.config +++ b/src/HttpMock.Unit.Tests/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/src/HttpMock.Verify.NUnit/HttpMock.Verify.NUnit.csproj b/src/HttpMock.Verify.NUnit/HttpMock.Verify.NUnit.csproj new file mode 100644 index 0000000..9bb7621 --- /dev/null +++ b/src/HttpMock.Verify.NUnit/HttpMock.Verify.NUnit.csproj @@ -0,0 +1,70 @@ + + + + Debug + AnyCPU + {1B61C8E3-7A43-479B-B7FE-D374DFEAA5E7} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + Properties + HttpMock.Verify.NUnit + HttpMock.Verify.NUnit + v4.5 + 512 + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\..\packages\Kayak.0.7.2\lib\Kayak.dll + + + ..\..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll + + + + + + + + + + + + + + + + {7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C} + HttpMock + + + + + + + + \ No newline at end of file diff --git a/src/HttpMock.Verify.NUnit/HttpMock.Verify.NUnit.nuspec b/src/HttpMock.Verify.NUnit/HttpMock.Verify.NUnit.nuspec new file mode 100644 index 0000000000000000000000000000000000000000..287837d32966e3cd82db8455e80e9a45457b2b12 GIT binary patch literal 1858 zcmchYO>fgc5QgX6U$Np0F-3exRdB_P10W8RQ!b9xX~QqC7hOIvyA&RSdA zGqhf#b8fMnfVZ^-&F}oKuyT9!5?mp!v1!pcvxuibbB$Jkc7v}1^b`&iy9(@z-Nxm6z{>N_tm3a&uqNUt8y#5W9b+|>%DC7eqUBY%Q57HoV8S; z^0gOwZgU@_BkqLNZ)6qGi|euW7-D6=$V%v?|KVNN9Yfo~pt5h^rSQC9w;=~zA2s_< zTKW8}iDf?Mne`!-=teCS%{cZLiyHqwK+o}?*$2KUUv+h6?^tWMg;odlM@rCCzTB&C#o=@2o*r?Al zy5CVnb@rOo@jXyPw{aQc-H^G0Cvdx)ucFJ)RCJm&y?5ucSs(6;gKddi95rc{ func) + { + return func.Invoke(new RequestWasCalled(httpServer.GetRequestProcessor())); + } + + public static IRequestVerify AssertWasNotCalled(this IHttpServer httpServer, Func func) + { + return func.Invoke(new RequestWasNotCalled(httpServer.GetRequestProcessor())); + } + } +} \ No newline at end of file diff --git a/src/HttpMock.Verify.NUnit/Properties/AssemblyInfo.cs b/src/HttpMock.Verify.NUnit/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..167e1af --- /dev/null +++ b/src/HttpMock.Verify.NUnit/Properties/AssemblyInfo.cs @@ -0,0 +1,40 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. + +[assembly: AssemblyTitle("HttpMock.Verify.NUnit")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("HttpMock.Verify.NUnit")] +[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. + +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM + +[assembly: Guid("1B61C8E3-7A43-479B-B7FE-D374DFEAA5E7")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] + +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/HttpMock/RequestHandlerExpectExtensions.cs b/src/HttpMock.Verify.NUnit/RequestHandlerExpectExtensions.cs similarity index 90% rename from src/HttpMock/RequestHandlerExpectExtensions.cs rename to src/HttpMock.Verify.NUnit/RequestHandlerExpectExtensions.cs index e791ff4..2ff40e3 100644 --- a/src/HttpMock/RequestHandlerExpectExtensions.cs +++ b/src/HttpMock.Verify.NUnit/RequestHandlerExpectExtensions.cs @@ -1,8 +1,7 @@ - -using NUnit.Framework; +using NUnit.Framework; using NUnit.Framework.Constraints; -namespace HttpMock +namespace HttpMock.Verify.NUnit { public static class RequestHandlerExpectExtensions { diff --git a/src/HttpMock/RequestWasCalled.cs b/src/HttpMock.Verify.NUnit/RequestWasCalled.cs similarity index 93% rename from src/HttpMock/RequestWasCalled.cs rename to src/HttpMock.Verify.NUnit/RequestWasCalled.cs index 6f2f29f..1d44e61 100644 --- a/src/HttpMock/RequestWasCalled.cs +++ b/src/HttpMock.Verify.NUnit/RequestWasCalled.cs @@ -1,6 +1,6 @@ using NUnit.Framework; -namespace HttpMock +namespace HttpMock.Verify.NUnit { public class RequestWasCalled { diff --git a/src/HttpMock/RequestWasNotCalled.cs b/src/HttpMock.Verify.NUnit/RequestWasNotCalled.cs similarity index 93% rename from src/HttpMock/RequestWasNotCalled.cs rename to src/HttpMock.Verify.NUnit/RequestWasNotCalled.cs index d18cfa8..b8ae9ea 100644 --- a/src/HttpMock/RequestWasNotCalled.cs +++ b/src/HttpMock.Verify.NUnit/RequestWasNotCalled.cs @@ -1,6 +1,6 @@ using NUnit.Framework; -namespace HttpMock +namespace HttpMock.Verify.NUnit { public class RequestWasNotCalled { diff --git a/src/HttpMock/HttpMock.csproj b/src/HttpMock/HttpMock.csproj index 4beda8d..cb7a15f 100644 --- a/src/HttpMock/HttpMock.csproj +++ b/src/HttpMock/HttpMock.csproj @@ -37,9 +37,6 @@ ..\..\packages\log4net.2.0.7\lib\net45-full\log4net.dll - - ..\..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll - @@ -53,6 +50,7 @@ + @@ -70,15 +68,12 @@ - - - @@ -88,6 +83,9 @@ Designer + + +