From a239af8249a0bf7c7372a6b82e8b83c57f293cdd Mon Sep 17 00:00:00 2001 From: pltaylor Date: Tue, 5 Nov 2013 11:53:20 -0500 Subject: [PATCH] Fix observable tests --- .../Clients/IObservableActivitiesClient.cs | 1 + ...lient.cs => ObservableActivitiesClient.cs} | 4 +- Octokit.Reactive/Octokit.Reactive.csproj | 2 +- .../ObservableActivitiesClientTests.cs | 53 ++++++++++--------- 4 files changed, 31 insertions(+), 29 deletions(-) rename Octokit.Reactive/Clients/{ObservableActivitiesesClient.cs => ObservableActivitiesClient.cs} (97%) diff --git a/Octokit.Reactive/Clients/IObservableActivitiesClient.cs b/Octokit.Reactive/Clients/IObservableActivitiesClient.cs index 41f6855c..5bcfad79 100644 --- a/Octokit.Reactive/Clients/IObservableActivitiesClient.cs +++ b/Octokit.Reactive/Clients/IObservableActivitiesClient.cs @@ -11,6 +11,7 @@ namespace Octokit.Reactive /// http://developer.github.com/v3/activity/events/#list-public-events /// /// All the public s for the particular user. + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")] IObservable GetAll(); /// diff --git a/Octokit.Reactive/Clients/ObservableActivitiesesClient.cs b/Octokit.Reactive/Clients/ObservableActivitiesClient.cs similarity index 97% rename from Octokit.Reactive/Clients/ObservableActivitiesesClient.cs rename to Octokit.Reactive/Clients/ObservableActivitiesClient.cs index 9d008f5d..520432fd 100644 --- a/Octokit.Reactive/Clients/ObservableActivitiesesClient.cs +++ b/Octokit.Reactive/Clients/ObservableActivitiesClient.cs @@ -3,11 +3,11 @@ using Octokit.Reactive.Internal; namespace Octokit.Reactive { - public class ObservableActivitiesesClient : IObservableActivitiesClient + public class ObservableActivitiesClient : IObservableActivitiesClient { IConnection _connection; - public ObservableActivitiesesClient(IGitHubClient client) + public ObservableActivitiesClient(IGitHubClient client) { Ensure.ArgumentNotNull(client, "client"); diff --git a/Octokit.Reactive/Octokit.Reactive.csproj b/Octokit.Reactive/Octokit.Reactive.csproj index 00d512da..302c99ac 100644 --- a/Octokit.Reactive/Octokit.Reactive.csproj +++ b/Octokit.Reactive/Octokit.Reactive.csproj @@ -74,7 +74,7 @@ Properties\SolutionInfo.cs - + diff --git a/Octokit.Tests/Reactive/ObservableActivitiesClientTests.cs b/Octokit.Tests/Reactive/ObservableActivitiesClientTests.cs index 0d15eaf3..dcfb2d68 100644 --- a/Octokit.Tests/Reactive/ObservableActivitiesClientTests.cs +++ b/Octokit.Tests/Reactive/ObservableActivitiesClientTests.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Reactive.Linq; using System.Threading.Tasks; using NSubstitute; @@ -16,11 +17,11 @@ namespace Octokit.Tests.Reactive public void RequestsCorrectUrl() { var gitHubClient = Substitute.For(); - var client = new ObservableActivitiesesClient(gitHubClient); + var client = new ObservableActivitiesClient(gitHubClient); client.GetAll(); - //gitHubClient.Received().GetAll(Arg.Is(u => u.ToString() == "events")); + gitHubClient.Connection.GetAsync>(new Uri("events", UriKind.Relative), null, null); } } @@ -30,18 +31,18 @@ namespace Octokit.Tests.Reactive public void RequestsCorrectUrl() { var gitHubClient = Substitute.For(); - var client = new ObservableActivitiesesClient(gitHubClient); + var client = new ObservableActivitiesClient(gitHubClient); client.GetAllForRepository("fake", "repo"); - //gitHubClient.Received().GetAll(Arg.Is(u => u.ToString() == "repos/fake/repo/issues/events")); + gitHubClient.Connection.GetAsync>(new Uri("repos/fake/repo/issues/events", UriKind.Relative), null, null); } [Fact] public async Task EnsuresArgumentsNotNull() { var gitHubClient = Substitute.For(); - var client = new ObservableActivitiesesClient(gitHubClient); + var client = new ObservableActivitiesClient(gitHubClient); await AssertEx.Throws(async () => await client.GetAllForRepository(null, "name")); await AssertEx.Throws(async () => await client.GetAllForRepository("", "name")); @@ -56,18 +57,18 @@ namespace Octokit.Tests.Reactive public void RequestsCorrectUrl() { var gitHubClient = Substitute.For(); - var client = new ObservableActivitiesesClient(gitHubClient); + var client = new ObservableActivitiesClient(gitHubClient); client.GetAllForRepositoryNetwork("fake", "repo"); - //gitHubClient.Received().GetAll(Arg.Is(u => u.ToString() == "networks/fake/repo/events")); + gitHubClient.Connection.GetAsync>(new Uri("networks/fake/repo/events", UriKind.Relative), null, null); } [Fact] public async Task EnsuresArgumentsNotNull() { var gitHubClient = Substitute.For(); - var client = new ObservableActivitiesesClient(gitHubClient); + var client = new ObservableActivitiesClient(gitHubClient); await AssertEx.Throws(async () => await client.GetAllForRepositoryNetwork(null, "name")); await AssertEx.Throws(async () => await client.GetAllForRepositoryNetwork("", "name")); @@ -82,18 +83,18 @@ namespace Octokit.Tests.Reactive public void RequestsCorrectUrl() { var gitHubClient = Substitute.For(); - var client = new ObservableActivitiesesClient(gitHubClient); + var client = new ObservableActivitiesClient(gitHubClient); client.GetAllForOrganization("fake"); - //gitHubClient.Received().GetAll(Arg.Is(u => u.ToString() == "orgs/fake/events")); + gitHubClient.Connection.GetAsync>(new Uri("orgs/fake/events", UriKind.Relative), null, null); } [Fact] public async Task EnsuresArgumentsNotNull() { var gitHubClient = Substitute.For(); - var client = new ObservableActivitiesesClient(gitHubClient); + var client = new ObservableActivitiesClient(gitHubClient); await AssertEx.Throws(async () => await client.GetAllForOrganization(null)); await AssertEx.Throws(async () => await client.GetAllForOrganization("")); @@ -106,18 +107,18 @@ namespace Octokit.Tests.Reactive public void RequestsCorrectUrl() { var gitHubClient = Substitute.For(); - var client = new ObservableActivitiesesClient(gitHubClient); + var client = new ObservableActivitiesClient(gitHubClient); client.GetUserReceived("fake"); - //gitHubClient.Received().GetAll(Arg.Is(u => u.ToString() == "users/fake/received_events")); + gitHubClient.Connection.GetAsync>(new Uri("users/fake/received_events", UriKind.Relative), null, null); } [Fact] public async Task EnsuresArgumentsNotNull() { var gitHubClient = Substitute.For(); - var client = new ObservableActivitiesesClient(gitHubClient); + var client = new ObservableActivitiesClient(gitHubClient); await AssertEx.Throws(async () => await client.GetUserReceived(null)); await AssertEx.Throws(async () => await client.GetUserReceived("")); @@ -130,18 +131,18 @@ namespace Octokit.Tests.Reactive public void RequestsCorrectUrl() { var gitHubClient = Substitute.For(); - var client = new ObservableActivitiesesClient(gitHubClient); + var client = new ObservableActivitiesClient(gitHubClient); client.GetUserReceivedPublic("fake"); - //gitHubClient.Received().GetAll(Arg.Is(u => u.ToString() == "users/fake/received_events/public")); + gitHubClient.Connection.GetAsync>(new Uri("users/fake/received_events/public", UriKind.Relative), null, null); } [Fact] public async Task EnsuresArgumentsNotNull() { var gitHubClient = Substitute.For(); - var client = new ObservableActivitiesesClient(gitHubClient); + var client = new ObservableActivitiesClient(gitHubClient); await AssertEx.Throws(async () => await client.GetUserReceivedPublic(null)); await AssertEx.Throws(async () => await client.GetUserReceivedPublic("")); @@ -154,18 +155,18 @@ namespace Octokit.Tests.Reactive public void RequestsCorrectUrl() { var gitHubClient = Substitute.For(); - var client = new ObservableActivitiesesClient(gitHubClient); + var client = new ObservableActivitiesClient(gitHubClient); client.GetUserPerformed("fake"); - //gitHubClient.Received().GetAll(Arg.Is(u => u.ToString() == "users/fake/events")); + gitHubClient.Connection.GetAsync>(new Uri("users/fake/events", UriKind.Relative), null, null); } [Fact] public async Task EnsuresArgumentsNotNull() { var gitHubClient = Substitute.For(); - var client = new ObservableActivitiesesClient(gitHubClient); + var client = new ObservableActivitiesClient(gitHubClient); await AssertEx.Throws(async () => await client.GetUserPerformed(null)); await AssertEx.Throws(async () => await client.GetUserPerformed("")); @@ -178,18 +179,18 @@ namespace Octokit.Tests.Reactive public void RequestsCorrectUrl() { var gitHubClient = Substitute.For(); - var client = new ObservableActivitiesesClient(gitHubClient); + var client = new ObservableActivitiesClient(gitHubClient); client.GetUserPerformedPublic("fake"); - //gitHubClient.Received().GetAll(Arg.Is(u => u.ToString() == "users/fake/events/public")); + gitHubClient.Connection.GetAsync>(new Uri("users/fake/events/public", UriKind.Relative), null, null); } [Fact] public async Task EnsuresArgumentsNotNull() { var gitHubClient = Substitute.For(); - var client = new ObservableActivitiesesClient(gitHubClient); + var client = new ObservableActivitiesClient(gitHubClient); await AssertEx.Throws(async () => await client.GetUserPerformedPublic(null)); await AssertEx.Throws(async () => await client.GetUserPerformedPublic("")); @@ -202,18 +203,18 @@ namespace Octokit.Tests.Reactive public void RequestsCorrectUrl() { var gitHubClient = Substitute.For(); - var client = new ObservableActivitiesesClient(gitHubClient); + var client = new ObservableActivitiesClient(gitHubClient); client.GetForAnOrganization("fake", "org"); - //gitHubClient.Received().GetAll(Arg.Is(u => u.ToString() == "users/fake/events/orgs/org")); + gitHubClient.Connection.GetAsync>(new Uri("users/fake/events/orgs/org", UriKind.Relative), null, null); } [Fact] public async Task EnsuresArgumentsNotNull() { var gitHubClient = Substitute.For(); - var client = new ObservableActivitiesesClient(gitHubClient); + var client = new ObservableActivitiesClient(gitHubClient); await AssertEx.Throws(async () => await client.GetForAnOrganization(null, "org")); await AssertEx.Throws(async () => await client.GetForAnOrganization("", "org"));