From 644bca726573d2a6d89c920ed3c79b76eb88a2e1 Mon Sep 17 00:00:00 2001 From: Max Kagamine Date: Sat, 13 Apr 2019 08:10:58 -0400 Subject: [PATCH] Renamed package Per moq/moq4#807 --- .travis.yml | 2 +- ...ttpClient.sln => Moq.Contrib.HttpClient.sln | 4 ++-- README.ja.md | 18 +++++++++--------- README.md | 18 +++++++++--------- .../IHttpMessageHandler.cs | 2 +- .../MockHttpMessageHandlerExtensions.cs | 2 +- .../Moq.Contrib.HttpClient.csproj} | 6 +++--- .../RequestExtensions.cs | 2 +- .../RequestExtensions.tt | 2 +- .../RequestMatcher.cs | 2 +- .../ResponseExtensions.cs | 2 +- .../CreateClientFactoryExtensionTests.cs | 2 +- .../Moq.Contrib.HttpClient.Test.csproj} | 2 +- .../RequestExtensionsTests.cs | 2 +- .../ResponseExtensionsTests.cs | 2 +- .../SequenceExtensionsTests.cs | 2 +- 16 files changed, 35 insertions(+), 35 deletions(-) rename MaxKagamine.Moq.HttpClient.sln => Moq.Contrib.HttpClient.sln (81%) rename src/{MaxKagamine.Moq.HttpClient => Moq.Contrib.HttpClient}/IHttpMessageHandler.cs (96%) rename src/{MaxKagamine.Moq.HttpClient => Moq.Contrib.HttpClient}/MockHttpMessageHandlerExtensions.cs (99%) rename src/{MaxKagamine.Moq.HttpClient/MaxKagamine.Moq.HttpClient.csproj => Moq.Contrib.HttpClient/Moq.Contrib.HttpClient.csproj} (80%) rename src/{MaxKagamine.Moq.HttpClient => Moq.Contrib.HttpClient}/RequestExtensions.cs (99%) rename src/{MaxKagamine.Moq.HttpClient => Moq.Contrib.HttpClient}/RequestExtensions.tt (99%) rename src/{MaxKagamine.Moq.HttpClient => Moq.Contrib.HttpClient}/RequestMatcher.cs (99%) rename src/{MaxKagamine.Moq.HttpClient => Moq.Contrib.HttpClient}/ResponseExtensions.cs (99%) rename test/{MaxKagamine.Moq.HttpClient.Test => Moq.Contrib.HttpClient.Test}/CreateClientFactoryExtensionTests.cs (97%) rename test/{MaxKagamine.Moq.HttpClient.Test/MaxKagamine.Moq.HttpClient.Test.csproj => Moq.Contrib.HttpClient.Test/Moq.Contrib.HttpClient.Test.csproj} (88%) rename test/{MaxKagamine.Moq.HttpClient.Test => Moq.Contrib.HttpClient.Test}/RequestExtensionsTests.cs (99%) rename test/{MaxKagamine.Moq.HttpClient.Test => Moq.Contrib.HttpClient.Test}/ResponseExtensionsTests.cs (99%) rename test/{MaxKagamine.Moq.HttpClient.Test => Moq.Contrib.HttpClient.Test}/SequenceExtensionsTests.cs (99%) diff --git a/.travis.yml b/.travis.yml index 444ef0c..c840f7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,4 @@ language: csharp mono: none dotnet: 2.1.500 script: - - dotnet test test/MaxKagamine.Moq.HttpClient.Test + - dotnet test test/Moq.Contrib.HttpClient.Test diff --git a/MaxKagamine.Moq.HttpClient.sln b/Moq.Contrib.HttpClient.sln similarity index 81% rename from MaxKagamine.Moq.HttpClient.sln rename to Moq.Contrib.HttpClient.sln index 8cd3da5..9690667 100644 --- a/MaxKagamine.Moq.HttpClient.sln +++ b/Moq.Contrib.HttpClient.sln @@ -7,9 +7,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C40CC895-DEA EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8AD2CDD5-EF40-4EA0-BD3A-98A074EF09B3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaxKagamine.Moq.HttpClient", "src\MaxKagamine.Moq.HttpClient\MaxKagamine.Moq.HttpClient.csproj", "{12F6B27E-0A30-4105-80FF-B5C9B5D69C6B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq.Contrib.HttpClient", "src\Moq.Contrib.HttpClient\Moq.Contrib.HttpClient.csproj", "{12F6B27E-0A30-4105-80FF-B5C9B5D69C6B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaxKagamine.Moq.HttpClient.Test", "test\MaxKagamine.Moq.HttpClient.Test\MaxKagamine.Moq.HttpClient.Test.csproj", "{68DA515D-A6F6-4C6B-A750-8456498868A0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq.Contrib.HttpClient.Test", "test\Moq.Contrib.HttpClient.Test\Moq.Contrib.HttpClient.Test.csproj", "{68DA515D-A6F6-4C6B-A750-8456498868A0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/README.ja.md b/README.ja.md index 192605a..f823e6d 100644 --- a/README.ja.md +++ b/README.ja.md @@ -1,6 +1,6 @@ -# Moq.HttpClient +# Moq.Contrib.HttpClient -[![NuGet](https://img.shields.io/nuget/v/MaxKagamine.Moq.HttpClient.svg)](https://www.nuget.org/packages/MaxKagamine.Moq.HttpClient/) [![Travis](https://img.shields.io/travis/com/maxkagamine/Moq.HttpClient.svg)](https://travis-ci.com/maxkagamine/Moq.HttpClient) +[![NuGet](https://img.shields.io/nuget/v/Moq.Contrib.HttpClient.svg)](https://www.nuget.org/packages/Moq.Contrib.HttpClient/) [![Travis](https://img.shields.io/travis/com/maxkagamine/Moq.Contrib.HttpClient.svg)](https://travis-ci.com/maxkagamine/Moq.Contrib.HttpClient) [ブログ投稿](https://maxkagamine.jp/blog/moq-de-httpclient-to-ihttpclientfactory-o-mokkusuru-kantanna-houhou)  ·  [English](README.md) @@ -23,9 +23,9 @@ HttpClientを直にモックすることが難しいのは[よく知られてい ## インストール -`Install-Package MaxKagamine.Moq.HttpClient` +`Install-Package Moq.Contrib.HttpClient` -または `dotnet add package MaxKagamine.Moq.HttpClient` +または `dotnet add package Moq.Contrib.HttpClient` ## API @@ -113,7 +113,7 @@ handler.SetupRequest(r => ((Url) r.RequestUri).QueryParams["hoge"].Equals("piyo" .ReturnsResponse("stuff"); ``` -最後の例えはクエリ文字列をチェックするのを手伝うために[Flurl](https://flurl.io/docs/fluent-url/)というフルーエントURLビルダーを使います。これはURLを作るも簡単にすることができます、例えば精密なURLとクエリ文字列をマッチしたかった。用例は[リクエスト拡張のテスト](test/MaxKagamine.Moq.HttpClient.Test/RequestExtensionsTests.cs)を見てください +最後の例えはクエリ文字列をチェックするのを手伝うために[Flurl](https://flurl.io/docs/fluent-url/)というフルーエントURLビルダーを使います。これはURLを作るも簡単にすることができます、例えば精密なURLとクエリ文字列をマッチしたかった。用例は[リクエスト拡張のテスト](test/Moq.Contrib.HttpClient.Test/RequestExtensionsTests.cs)を見てください ### リクエストのシークエンスをセットアップする @@ -124,7 +124,7 @@ Moqは2つシークエンスのタイプがあります： 互いに独立しているリクエストが特定の順序にマッチするの必要がある場合は後者が便利です。セットアップは一方が他方の前に必ずマッチするためにシークエンスで定義される。これはレスポンスをキューに入れることによって動作する他のライブラリと似ています -両方の用例は[シークエンス拡張のテスト](test/MaxKagamine.Moq.HttpClient.Test/SequenceExtensionsTests.cs)を見てください +両方の用例は[シークエンス拡張のテスト](test/Moq.Contrib.HttpClient.Test/SequenceExtensionsTests.cs)を見てください ### リクエストの本体に基づいてレスポンスを書く @@ -170,9 +170,9 @@ Mock.Get(factory).Setup(x => x.CreateClient("api")) 文書化としてユニットテストに向けるのが過ちかもしれないけど、この場合はこのライブラリがテストのためだしテストがこれを念頭に置いて書かれたから、もっと完全な用例（コメントと）は、こちら見てください： -- **[リクエスト拡張のテスト](test/MaxKagamine.Moq.HttpClient.Test/RequestExtensionsTests.cs)** — これらはSetupとVerifyのヘルパーのみを使います -- **[レスポンス拡張のテスト](test/MaxKagamine.Moq.HttpClient.Test/ResponseExtensionsTests.cs)** — これらはReturnsResponseヘルパーに焦点をあてます -- **[シークエンス拡張のテスト](test/MaxKagamine.Moq.HttpClient.Test/SequenceExtensionsTests.cs)** — これらはシークエンスをモックすることを実証します +- **[リクエスト拡張のテスト](test/Moq.Contrib.HttpClient.Test/RequestExtensionsTests.cs)** — これらはSetupとVerifyのヘルパーのみを使います +- **[レスポンス拡張のテスト](test/Moq.Contrib.HttpClient.Test/ResponseExtensionsTests.cs)** — これらはReturnsResponseヘルパーに焦点をあてます +- **[シークエンス拡張のテスト](test/Moq.Contrib.HttpClient.Test/SequenceExtensionsTests.cs)** — これらはシークエンスをモックすることを実証します ## ライセンス / 寄付 diff --git a/README.md b/README.md index 4e8c883..1e802ca 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Moq.HttpClient +# Moq.Contrib.HttpClient -[![NuGet](https://img.shields.io/nuget/v/MaxKagamine.Moq.HttpClient.svg)](https://www.nuget.org/packages/MaxKagamine.Moq.HttpClient/) [![Travis](https://img.shields.io/travis/com/maxkagamine/Moq.HttpClient.svg)](https://travis-ci.com/maxkagamine/Moq.HttpClient) +[![NuGet](https://img.shields.io/nuget/v/Moq.Contrib.HttpClient.svg)](https://www.nuget.org/packages/Moq.Contrib.HttpClient/) [![Travis](https://img.shields.io/travis/com/maxkagamine/Moq.Contrib.HttpClient.svg)](https://travis-ci.com/maxkagamine/Moq.Contrib.HttpClient) [Blog post](https://maxkagamine.com/blog/mocking-httpclient-ihttpclientfactory-with-moq-the-easy-way)  ·  [日本語](README.ja.md) @@ -23,9 +23,9 @@ Mocking HttpClient directly is [notoriously difficult](https://github.com/dotnet ## Install -`Install-Package MaxKagamine.Moq.HttpClient` +`Install-Package Moq.Contrib.HttpClient` -or `dotnet add package MaxKagamine.Moq.HttpClient` +or `dotnet add package Moq.Contrib.HttpClient` ## API @@ -113,7 +113,7 @@ handler.SetupRequest(r => ((Url) r.RequestUri).QueryParams["foo"].Equals("bar")) .ReturnsResponse("stuff"); ``` -The last example uses [Flurl](https://flurl.io/docs/fluent-url/), a fluent URL builder, to assist in checking the query string. This can also make constructing a URL easier, for instance if we wanted to match an exact URL and query string. See the [request extensions tests](test/MaxKagamine.Moq.HttpClient.Test/RequestExtensionsTests.cs) for an example. +The last example uses [Flurl](https://flurl.io/docs/fluent-url/), a fluent URL builder, to assist in checking the query string. This can also make constructing a URL easier, for instance if we wanted to match an exact URL and query string. See the [request extensions tests](test/Moq.Contrib.HttpClient.Test/RequestExtensionsTests.cs) for an example. ### Setting up a sequence of requests @@ -124,7 +124,7 @@ Moq has two types of sequences: The latter can be useful for cases where separate requests independent of each other must be made in a certain order; their setups can be defined in a sequence such that one must match before the other. This is similar to other testing libraries that work by queueing responses. -See the [sequence extensions tests](test/MaxKagamine.Moq.HttpClient.Test/SequenceExtensionsTests.cs) for examples of each. +See the [sequence extensions tests](test/Moq.Contrib.HttpClient.Test/SequenceExtensionsTests.cs) for examples of each. ### Composing responses based on the request body @@ -170,9 +170,9 @@ The factory can then be passed into the class or [injected via AutoMocker](https Though it may be a faux pas to point to the unit tests as documentation, in this case the library is specifically for testing, and so they were written with this in mind. Thus, for some more complete working examples (with comments), please see here: -- **[Request extensions tests](test/MaxKagamine.Moq.HttpClient.Test/RequestExtensionsTests.cs)** — these strictly cover the Setup & Verify helpers -- **[Response extensions tests](test/MaxKagamine.Moq.HttpClient.Test/ResponseExtensionsTests.cs)** — these focus on the ReturnsResponse helpers -- **[Sequence extensions tests](test/MaxKagamine.Moq.HttpClient.Test/SequenceExtensionsTests.cs)** — these demonstrate mocking sequences, as mentioned above +- **[Request extensions tests](test/Moq.Contrib.HttpClient.Test/RequestExtensionsTests.cs)** — these strictly cover the Setup & Verify helpers +- **[Response extensions tests](test/Moq.Contrib.HttpClient.Test/ResponseExtensionsTests.cs)** — these focus on the ReturnsResponse helpers +- **[Sequence extensions tests](test/Moq.Contrib.HttpClient.Test/SequenceExtensionsTests.cs)** — these demonstrate mocking sequences, as mentioned above ## License / Donate diff --git a/src/MaxKagamine.Moq.HttpClient/IHttpMessageHandler.cs b/src/Moq.Contrib.HttpClient/IHttpMessageHandler.cs similarity index 96% rename from src/MaxKagamine.Moq.HttpClient/IHttpMessageHandler.cs rename to src/Moq.Contrib.HttpClient/IHttpMessageHandler.cs index 72d2bc5..e9a71ce 100644 --- a/src/MaxKagamine.Moq.HttpClient/IHttpMessageHandler.cs +++ b/src/Moq.Contrib.HttpClient/IHttpMessageHandler.cs @@ -3,7 +3,7 @@ using System.Threading; using System.Threading.Tasks; -namespace MaxKagamine.Moq.HttpClient +namespace Moq.Contrib.HttpClient { /// /// An interface to facilitate mocking the protected method. diff --git a/src/MaxKagamine.Moq.HttpClient/MockHttpMessageHandlerExtensions.cs b/src/Moq.Contrib.HttpClient/MockHttpMessageHandlerExtensions.cs similarity index 99% rename from src/MaxKagamine.Moq.HttpClient/MockHttpMessageHandlerExtensions.cs rename to src/Moq.Contrib.HttpClient/MockHttpMessageHandlerExtensions.cs index ba5bd8a..c7ddbd9 100644 --- a/src/MaxKagamine.Moq.HttpClient/MockHttpMessageHandlerExtensions.cs +++ b/src/Moq.Contrib.HttpClient/MockHttpMessageHandlerExtensions.cs @@ -9,7 +9,7 @@ using Moq.Language.Flow; using Moq.Protected; -namespace MaxKagamine.Moq.HttpClient +namespace Moq.Contrib.HttpClient { using System.Net.Http; diff --git a/src/MaxKagamine.Moq.HttpClient/MaxKagamine.Moq.HttpClient.csproj b/src/Moq.Contrib.HttpClient/Moq.Contrib.HttpClient.csproj similarity index 80% rename from src/MaxKagamine.Moq.HttpClient/MaxKagamine.Moq.HttpClient.csproj rename to src/Moq.Contrib.HttpClient/Moq.Contrib.HttpClient.csproj index 82f0da0..ed71192 100644 --- a/src/MaxKagamine.Moq.HttpClient/MaxKagamine.Moq.HttpClient.csproj +++ b/src/Moq.Contrib.HttpClient/Moq.Contrib.HttpClient.csproj @@ -7,11 +7,11 @@ Max Kagamine Copyright © 2018 Max Kagamine A set of extension methods for mocking HttpClient and IHttpClientFactory with Moq. - https://github.com/maxkagamine/Moq.HttpClient/blob/master/LICENSE.txt - https://github.com/maxkagamine/Moq.HttpClient + https://github.com/maxkagamine/Moq.Contrib.HttpClient/blob/master/LICENSE.txt + https://github.com/maxkagamine/Moq.Contrib.HttpClient moq http httpclient mock mocking test testing git - https://github.com/maxkagamine/Moq.HttpClient + https://github.com/maxkagamine/Moq.Contrib.HttpClient 1.1.0 diff --git a/src/MaxKagamine.Moq.HttpClient/RequestExtensions.cs b/src/Moq.Contrib.HttpClient/RequestExtensions.cs similarity index 99% rename from src/MaxKagamine.Moq.HttpClient/RequestExtensions.cs rename to src/Moq.Contrib.HttpClient/RequestExtensions.cs index 44b6450..d8f0523 100644 --- a/src/MaxKagamine.Moq.HttpClient/RequestExtensions.cs +++ b/src/Moq.Contrib.HttpClient/RequestExtensions.cs @@ -12,7 +12,7 @@ using Moq.Language; using Moq.Language.Flow; -namespace MaxKagamine.Moq.HttpClient +namespace Moq.Contrib.HttpClient { public static partial class MockHttpMessageHandlerExtensions { diff --git a/src/MaxKagamine.Moq.HttpClient/RequestExtensions.tt b/src/Moq.Contrib.HttpClient/RequestExtensions.tt similarity index 99% rename from src/MaxKagamine.Moq.HttpClient/RequestExtensions.tt rename to src/Moq.Contrib.HttpClient/RequestExtensions.tt index 9d1c5c8..e39e60b 100644 --- a/src/MaxKagamine.Moq.HttpClient/RequestExtensions.tt +++ b/src/Moq.Contrib.HttpClient/RequestExtensions.tt @@ -24,7 +24,7 @@ using Moq; using Moq.Language; using Moq.Language.Flow; -namespace MaxKagamine.Moq.HttpClient +namespace Moq.Contrib.HttpClient { public static partial class MockHttpMessageHandlerExtensions { diff --git a/src/MaxKagamine.Moq.HttpClient/RequestMatcher.cs b/src/Moq.Contrib.HttpClient/RequestMatcher.cs similarity index 99% rename from src/MaxKagamine.Moq.HttpClient/RequestMatcher.cs rename to src/Moq.Contrib.HttpClient/RequestMatcher.cs index 29db0f4..00734d7 100644 --- a/src/MaxKagamine.Moq.HttpClient/RequestMatcher.cs +++ b/src/Moq.Contrib.HttpClient/RequestMatcher.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using Moq; -namespace MaxKagamine.Moq.HttpClient +namespace Moq.Contrib.HttpClient { /// /// Custom Moq matchers for using . diff --git a/src/MaxKagamine.Moq.HttpClient/ResponseExtensions.cs b/src/Moq.Contrib.HttpClient/ResponseExtensions.cs similarity index 99% rename from src/MaxKagamine.Moq.HttpClient/ResponseExtensions.cs rename to src/Moq.Contrib.HttpClient/ResponseExtensions.cs index c1b9460..afb9b94 100644 --- a/src/MaxKagamine.Moq.HttpClient/ResponseExtensions.cs +++ b/src/Moq.Contrib.HttpClient/ResponseExtensions.cs @@ -9,7 +9,7 @@ using Moq.Language; using Moq.Language.Flow; -namespace MaxKagamine.Moq.HttpClient +namespace Moq.Contrib.HttpClient { public static partial class MockHttpMessageHandlerExtensions { diff --git a/test/MaxKagamine.Moq.HttpClient.Test/CreateClientFactoryExtensionTests.cs b/test/Moq.Contrib.HttpClient.Test/CreateClientFactoryExtensionTests.cs similarity index 97% rename from test/MaxKagamine.Moq.HttpClient.Test/CreateClientFactoryExtensionTests.cs rename to test/Moq.Contrib.HttpClient.Test/CreateClientFactoryExtensionTests.cs index 3b27412..ba354f2 100644 --- a/test/MaxKagamine.Moq.HttpClient.Test/CreateClientFactoryExtensionTests.cs +++ b/test/Moq.Contrib.HttpClient.Test/CreateClientFactoryExtensionTests.cs @@ -6,7 +6,7 @@ using Moq; using Xunit; -namespace MaxKagamine.Moq.HttpClient.Test +namespace Moq.Contrib.HttpClient.Test { public class CreateClientFactoryExtensionTests { diff --git a/test/MaxKagamine.Moq.HttpClient.Test/MaxKagamine.Moq.HttpClient.Test.csproj b/test/Moq.Contrib.HttpClient.Test/Moq.Contrib.HttpClient.Test.csproj similarity index 88% rename from test/MaxKagamine.Moq.HttpClient.Test/MaxKagamine.Moq.HttpClient.Test.csproj rename to test/Moq.Contrib.HttpClient.Test/Moq.Contrib.HttpClient.Test.csproj index f1c3926..41fdf32 100644 --- a/test/MaxKagamine.Moq.HttpClient.Test/MaxKagamine.Moq.HttpClient.Test.csproj +++ b/test/Moq.Contrib.HttpClient.Test/Moq.Contrib.HttpClient.Test.csproj @@ -19,7 +19,7 @@ - + diff --git a/test/MaxKagamine.Moq.HttpClient.Test/RequestExtensionsTests.cs b/test/Moq.Contrib.HttpClient.Test/RequestExtensionsTests.cs similarity index 99% rename from test/MaxKagamine.Moq.HttpClient.Test/RequestExtensionsTests.cs rename to test/Moq.Contrib.HttpClient.Test/RequestExtensionsTests.cs index 384f186..f33a16c 100644 --- a/test/MaxKagamine.Moq.HttpClient.Test/RequestExtensionsTests.cs +++ b/test/Moq.Contrib.HttpClient.Test/RequestExtensionsTests.cs @@ -14,7 +14,7 @@ using Newtonsoft.Json.Serialization; using Xunit; -namespace MaxKagamine.Moq.HttpClient.Test +namespace Moq.Contrib.HttpClient.Test { public class RequestExtensionsTests { diff --git a/test/MaxKagamine.Moq.HttpClient.Test/ResponseExtensionsTests.cs b/test/Moq.Contrib.HttpClient.Test/ResponseExtensionsTests.cs similarity index 99% rename from test/MaxKagamine.Moq.HttpClient.Test/ResponseExtensionsTests.cs rename to test/Moq.Contrib.HttpClient.Test/ResponseExtensionsTests.cs index e96c6ad..c3c916f 100644 --- a/test/MaxKagamine.Moq.HttpClient.Test/ResponseExtensionsTests.cs +++ b/test/Moq.Contrib.HttpClient.Test/ResponseExtensionsTests.cs @@ -10,7 +10,7 @@ using Moq; using Xunit; -namespace MaxKagamine.Moq.HttpClient.Test +namespace Moq.Contrib.HttpClient.Test { public class ResponseExtensionsTests { diff --git a/test/MaxKagamine.Moq.HttpClient.Test/SequenceExtensionsTests.cs b/test/Moq.Contrib.HttpClient.Test/SequenceExtensionsTests.cs similarity index 99% rename from test/MaxKagamine.Moq.HttpClient.Test/SequenceExtensionsTests.cs rename to test/Moq.Contrib.HttpClient.Test/SequenceExtensionsTests.cs index 4f23c0c..b97cc9e 100644 --- a/test/MaxKagamine.Moq.HttpClient.Test/SequenceExtensionsTests.cs +++ b/test/Moq.Contrib.HttpClient.Test/SequenceExtensionsTests.cs @@ -7,7 +7,7 @@ using Polly; using Xunit; -namespace MaxKagamine.Moq.HttpClient.Test +namespace Moq.Contrib.HttpClient.Test { public class SequenceExtensionsTests {