Skip to content

Commit

Permalink
Split out verifications into own lib, to remove NUnit dependency (#67)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
hibri authored Mar 27, 2017
1 parent 13a6661 commit dfbb182
Show file tree
Hide file tree
Showing 20 changed files with 238 additions and 106 deletions.
130 changes: 69 additions & 61 deletions HttpMock.sln
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions src/HttpMock.Integration.Tests/HttpExpectationTests.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Net;
using HttpMock.Verify.NUnit;
using NUnit.Framework;

namespace HttpMock.Integration.Tests
Expand Down
11 changes: 6 additions & 5 deletions src/HttpMock.Integration.Tests/HttpMock.Integration.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,8 @@
<Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a">
<HintPath>..\..\packages\log4net.2.0.7\lib\net45-full\log4net.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
<HintPath>..\..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Rhino.Mocks">
<HintPath>..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
<HintPath>..\..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -81,6 +78,10 @@
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\HttpMock.Verify.NUnit\HttpMock.Verify.NUnit.csproj">
<Project>{1B61C8E3-7A43-479B-B7FE-D374DFEAA5E7}</Project>
<Name>HttpMock.Verify.NUnit</Name>
</ProjectReference>
<ProjectReference Include="..\HttpMock\HttpMock.csproj">
<Project>{7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}</Project>
<Name>HttpMock</Name>
Expand Down
2 changes: 1 addition & 1 deletion src/HttpMock.Integration.Tests/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<packages>
<package id="Kayak" version="0.7.2" />
<package id="log4net" version="2.0.7" targetFramework="net45" />
<package id="NUnit" version="3.6.0" targetFramework="net45" />
<package id="NUnit" version="3.6.1" targetFramework="net45" />
<package id="RhinoMocks" version="3.6.1" requireReinstallation="True" />
</packages>
4 changes: 2 additions & 2 deletions src/HttpMock.Unit.Tests/HttpMock.Unit.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
<Reference Include="Kayak">
<HintPath>..\..\packages\Kayak.0.7.2\lib\Kayak.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
<HintPath>..\..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
<HintPath>..\..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion src/HttpMock.Unit.Tests/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Kayak" version="0.7.2" />
<package id="NUnit" version="3.6.0" targetFramework="net45" />
<package id="NUnit" version="3.6.1" targetFramework="net45" />
<package id="RhinoMocks" version="3.6.1" requireReinstallation="True" />
</packages>
70 changes: 70 additions & 0 deletions src/HttpMock.Verify.NUnit/HttpMock.Verify.NUnit.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{1B61C8E3-7A43-479B-B7FE-D374DFEAA5E7}</ProjectGuid>
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>HttpMock.Verify.NUnit</RootNamespace>
<AssemblyName>HttpMock.Verify.NUnit</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Kayak, Version=0.7.2.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\packages\Kayak.0.7.2\lib\Kayak.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
<HintPath>..\..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="HttpServerExtensions.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RequestHandlerExpectExtensions.cs" />
<Compile Include="RequestWasCalled.cs" />
<Compile Include="RequestWasNotCalled.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\HttpMock\HttpMock.csproj">
<Project>{7D7A1C68-6D1C-4AD5-BD2E-CA2D7B76AE1C}</Project>
<Name>HttpMock</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="HttpMock.Verify.NUnit.nuspec" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
Binary file not shown.
19 changes: 19 additions & 0 deletions src/HttpMock.Verify.NUnit/HttpServerExtensions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using System;

namespace HttpMock.Verify.NUnit
{
public static class HttpServerExtensions
{


public static IRequestVerify AssertWasCalled(this IHttpServer httpServer,Func<RequestWasCalled, IRequestVerify> func)
{
return func.Invoke(new RequestWasCalled(httpServer.GetRequestProcessor()));
}

public static IRequestVerify AssertWasNotCalled(this IHttpServer httpServer, Func<RequestWasNotCalled, IRequestVerify> func)
{
return func.Invoke(new RequestWasNotCalled(httpServer.GetRequestProcessor()));
}
}
}
40 changes: 40 additions & 0 deletions src/HttpMock.Verify.NUnit/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -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")]
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@

using NUnit.Framework;
using NUnit.Framework;
using NUnit.Framework.Constraints;

namespace HttpMock
namespace HttpMock.Verify.NUnit
{
public static class RequestHandlerExpectExtensions
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using NUnit.Framework;

namespace HttpMock
namespace HttpMock.Verify.NUnit
{
public class RequestWasCalled
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using NUnit.Framework;

namespace HttpMock
namespace HttpMock.Verify.NUnit
{
public class RequestWasNotCalled
{
Expand Down
10 changes: 4 additions & 6 deletions src/HttpMock/HttpMock.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@
<Reference Include="log4net, Version=2.0.7.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a">
<HintPath>..\..\packages\log4net.2.0.7\lib\net45-full\log4net.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
<HintPath>..\..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Net" />
Expand All @@ -53,6 +50,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="IRequestProcessor.cs" />
<Compile Include="IRequestVerify.cs" />
<Compile Include="RequestMatcher.cs" />
<Compile Include="ReceivedRequest.cs" />
Expand All @@ -70,15 +68,12 @@
<Compile Include="IRequestStub.cs" />
<Compile Include="IStubResponse.cs" />
<Compile Include="QueryParamMatch.cs" />
<Compile Include="RequestHandlerExpectExtensions.cs" />
<Compile Include="BufferedBody.cs" />
<Compile Include="HttpMockRepository.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RequestHandler.cs" />
<Compile Include="RequestHandlerList.cs" />
<Compile Include="RequestProcessor.cs" />
<Compile Include="RequestWasCalled.cs" />
<Compile Include="RequestWasNotCalled.cs" />
<Compile Include="SchedulerDelegate.cs" />
<Compile Include="ResponseBuilder.cs" />
<Compile Include="StubNotFoundResponse.cs" />
Expand All @@ -88,6 +83,9 @@
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<Content Include="HttpMock.nuspec" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
Binary file renamed HttpMock.nuspec → src/HttpMock/HttpMock.nuspec
Binary file not shown.
Loading

0 comments on commit dfbb182

Please sign in to comment.