From bea3a5dbbdcc2b6e4c3b3da8229730d5bb46bd46 Mon Sep 17 00:00:00 2001 From: David Martin Date: Mon, 2 Mar 2015 22:51:15 +0000 Subject: [PATCH] fixed monoandroid and monotouch projects, got convention tests working --- Octokit.Tests/Clients/EventsClientTests.cs | 18 +++++++++--------- Octokit/Models/Response/Activity.cs | 2 +- .../ActivityPayloads/ActivityPayload.cs | 14 +++++++++++--- .../ActivityPayloads/CommitCommentPayload.cs | 7 +++++-- .../ActivityPayloads/ForkEventPayload.cs | 12 +++++------- .../ActivityPayloads/IssueCommentPayload.cs | 11 +++++++---- .../ActivityPayloads/IssueEventPayload.cs | 15 ++++++--------- .../PullRequestCommentPayload.cs | 13 +++++-------- .../PullRequestEventPayload.cs | 13 +++++-------- .../ActivityPayloads/PushEventPayload.cs | 16 +++++++--------- .../ActivityPayloads/StarredEventPayload.cs | 7 +++++-- Octokit/Octokit-MonoAndroid.csproj | 9 +++++++++ Octokit/Octokit-Monotouch.csproj | 9 +++++++++ 13 files changed, 84 insertions(+), 62 deletions(-) diff --git a/Octokit.Tests/Clients/EventsClientTests.cs b/Octokit.Tests/Clients/EventsClientTests.cs index e62a292d..dbbf6436 100644 --- a/Octokit.Tests/Clients/EventsClientTests.cs +++ b/Octokit.Tests/Clients/EventsClientTests.cs @@ -240,7 +240,7 @@ namespace Octokit.Tests.Clients }; [Fact] - public async void DeserializesPayloadToCorrectType() + public async Task DeserializesPayloadToCorrectType() { _activityTypes.ToList().ForEach(async kvp => { @@ -270,7 +270,7 @@ namespace Octokit.Tests.Clients } [Fact] - public async void DeserializesCommitCommentEventCorrectly() + public async Task DeserializesCommitCommentEventCorrectly() { var jsonObj = new JsonObject { @@ -295,7 +295,7 @@ namespace Octokit.Tests.Clients } [Fact] - public async void DeserializesForkEventCorrectly() + public async Task DeserializesForkEventCorrectly() { var jsonObj = new JsonObject { @@ -320,7 +320,7 @@ namespace Octokit.Tests.Clients } [Fact] - public async void DeserializesIssueCommentEventCorrectly() + public async Task DeserializesIssueCommentEventCorrectly() { var jsonObj = new JsonObject { @@ -352,7 +352,7 @@ namespace Octokit.Tests.Clients } [Fact] - public async void DeserializesIssueEventCorrectly() + public async Task DeserializesIssueEventCorrectly() { var jsonObj = new JsonObject { @@ -389,7 +389,7 @@ namespace Octokit.Tests.Clients } [Fact] - public async void DeserializesPullRequestEventCorrectly() + public async Task DeserializesPullRequestEventCorrectly() { var jsonObj = new JsonObject { @@ -418,7 +418,7 @@ namespace Octokit.Tests.Clients } [Fact] - public async void DeserializesPullRequestCommentEventCorrectly() + public async Task DeserializesPullRequestCommentEventCorrectly() { var jsonObj = new JsonObject { @@ -450,7 +450,7 @@ namespace Octokit.Tests.Clients } [Fact] - public async void DeserializesPushEventCorrectly() + public async Task DeserializesPushEventCorrectly() { var jsonObj = new JsonObject { @@ -486,7 +486,7 @@ namespace Octokit.Tests.Clients } [Fact] - public async void DeserializesStarredEventCorrectly() + public async Task DeserializesStarredEventCorrectly() { var jsonObj = new JsonObject { diff --git a/Octokit/Models/Response/Activity.cs b/Octokit/Models/Response/Activity.cs index 2378d80d..5f0da164 100644 --- a/Octokit/Models/Response/Activity.cs +++ b/Octokit/Models/Response/Activity.cs @@ -64,7 +64,7 @@ namespace Octokit /// /// The payload associated with the activity event. /// - public ActivityPayload Payload { get; set; } + public ActivityPayload Payload { get; protected set; } internal string DebuggerDisplay { diff --git a/Octokit/Models/Response/ActivityPayloads/ActivityPayload.cs b/Octokit/Models/Response/ActivityPayloads/ActivityPayload.cs index cacc89cf..ad5aa1fa 100644 --- a/Octokit/Models/Response/ActivityPayloads/ActivityPayload.cs +++ b/Octokit/Models/Response/ActivityPayloads/ActivityPayload.cs @@ -1,8 +1,16 @@ -namespace Octokit.Models.Response.ActivityPayloads +using System.Diagnostics; + +namespace Octokit.Models.Response.ActivityPayloads { + [DebuggerDisplay("{DebuggerDisplay,nq}")] public class ActivityPayload { - public Repository Repository { get; set; } - public User Sender { get; set; } + public Repository Repository { get; protected set; } + public User Sender { get; protected set; } + + internal string DebuggerDisplay + { + get { return this.Repository.FullName; } + } } } diff --git a/Octokit/Models/Response/ActivityPayloads/CommitCommentPayload.cs b/Octokit/Models/Response/ActivityPayloads/CommitCommentPayload.cs index 346a08b3..3e4988ff 100644 --- a/Octokit/Models/Response/ActivityPayloads/CommitCommentPayload.cs +++ b/Octokit/Models/Response/ActivityPayloads/CommitCommentPayload.cs @@ -1,7 +1,10 @@ -namespace Octokit.Models.Response.ActivityPayloads +using System.Diagnostics; + +namespace Octokit.Models.Response.ActivityPayloads { + [DebuggerDisplay("{DebuggerDisplay,nq}")] public class CommitCommentPayload : ActivityPayload { - public CommitComment Comment { get; set; } + public CommitComment Comment { get; protected set; } } } diff --git a/Octokit/Models/Response/ActivityPayloads/ForkEventPayload.cs b/Octokit/Models/Response/ActivityPayloads/ForkEventPayload.cs index 1efd373d..07a19a13 100644 --- a/Octokit/Models/Response/ActivityPayloads/ForkEventPayload.cs +++ b/Octokit/Models/Response/ActivityPayloads/ForkEventPayload.cs @@ -1,14 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; namespace Octokit.Models.Response.ActivityPayloads { + [DebuggerDisplay("{DebuggerDisplay,nq}")] public class ForkEventPayload : ActivityPayload { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Forkee")] - public Repository Forkee { get; set; } + [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Forkee")] + public Repository Forkee { get; protected set; } } } diff --git a/Octokit/Models/Response/ActivityPayloads/IssueCommentPayload.cs b/Octokit/Models/Response/ActivityPayloads/IssueCommentPayload.cs index 4b82b579..6ebdc538 100644 --- a/Octokit/Models/Response/ActivityPayloads/IssueCommentPayload.cs +++ b/Octokit/Models/Response/ActivityPayloads/IssueCommentPayload.cs @@ -1,11 +1,14 @@ -namespace Octokit.Models.Response.ActivityPayloads +using System.Diagnostics; + +namespace Octokit.Models.Response.ActivityPayloads { + [DebuggerDisplay("{DebuggerDisplay,nq}")] public class IssueCommentPayload : ActivityPayload { // should always be "created" according to github api docs - public string Action { get; set; } - public Issue Issue { get; set; } - public IssueComment Comment { get; set; } + public string Action { get; protected set; } + public Issue Issue { get; protected set; } + public IssueComment Comment { get; protected set; } } } diff --git a/Octokit/Models/Response/ActivityPayloads/IssueEventPayload.cs b/Octokit/Models/Response/ActivityPayloads/IssueEventPayload.cs index dfca8389..e49dff89 100644 --- a/Octokit/Models/Response/ActivityPayloads/IssueEventPayload.cs +++ b/Octokit/Models/Response/ActivityPayloads/IssueEventPayload.cs @@ -1,16 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Diagnostics; namespace Octokit.Models.Response.ActivityPayloads { + [DebuggerDisplay("{DebuggerDisplay,nq}")] public class IssueEventPayload : ActivityPayload { - public string Action { get; set; } - public Issue Issue { get; set; } - public User Assignee { get; set; } - public Label Label { get; set; } + public string Action { get; protected set; } + public Issue Issue { get; protected set; } + public User Assignee { get; protected set; } + public Label Label { get; protected set; } } } diff --git a/Octokit/Models/Response/ActivityPayloads/PullRequestCommentPayload.cs b/Octokit/Models/Response/ActivityPayloads/PullRequestCommentPayload.cs index ac5fac17..23603b7f 100644 --- a/Octokit/Models/Response/ActivityPayloads/PullRequestCommentPayload.cs +++ b/Octokit/Models/Response/ActivityPayloads/PullRequestCommentPayload.cs @@ -1,15 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Diagnostics; namespace Octokit.Models.Response.ActivityPayloads { + [DebuggerDisplay("{DebuggerDisplay,nq}")] public class PullRequestCommentPayload : ActivityPayload { - public string Action { get; set; } - public PullRequest PullRequest { get; set; } - public PullRequestReviewComment Comment { get; set; } + public string Action { get; protected set; } + public PullRequest PullRequest { get; protected set; } + public PullRequestReviewComment Comment { get; protected set; } } } diff --git a/Octokit/Models/Response/ActivityPayloads/PullRequestEventPayload.cs b/Octokit/Models/Response/ActivityPayloads/PullRequestEventPayload.cs index 8e2a3a8c..cc900dd1 100644 --- a/Octokit/Models/Response/ActivityPayloads/PullRequestEventPayload.cs +++ b/Octokit/Models/Response/ActivityPayloads/PullRequestEventPayload.cs @@ -1,16 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Diagnostics; namespace Octokit.Models.Response.ActivityPayloads { + [DebuggerDisplay("{DebuggerDisplay,nq}")] public class PullRequestEventPayload : ActivityPayload { - public string Action { get; set; } - public int Number { get; set; } + public string Action { get; protected set; } + public int Number { get; protected set; } - public PullRequest PullRequest { get; set; } + public PullRequest PullRequest { get; protected set; } } } diff --git a/Octokit/Models/Response/ActivityPayloads/PushEventPayload.cs b/Octokit/Models/Response/ActivityPayloads/PushEventPayload.cs index 8c39bacd..5a5ccc49 100644 --- a/Octokit/Models/Response/ActivityPayloads/PushEventPayload.cs +++ b/Octokit/Models/Response/ActivityPayloads/PushEventPayload.cs @@ -1,16 +1,14 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; +using System.Diagnostics; namespace Octokit.Models.Response.ActivityPayloads { + [DebuggerDisplay("{DebuggerDisplay,nq}")] public class PushEventPayload : ActivityPayload { - public string Head { get; set; } - public string Ref { get; set; } - public int Size { get; set; } - public IReadOnlyList Commits { get; set; } + public string Head { get; protected set; } + public string Ref { get; protected set; } + public int Size { get; protected set; } + public IReadOnlyList Commits { get; protected set; } } } diff --git a/Octokit/Models/Response/ActivityPayloads/StarredEventPayload.cs b/Octokit/Models/Response/ActivityPayloads/StarredEventPayload.cs index 80fe4860..50aa884c 100644 --- a/Octokit/Models/Response/ActivityPayloads/StarredEventPayload.cs +++ b/Octokit/Models/Response/ActivityPayloads/StarredEventPayload.cs @@ -1,7 +1,10 @@ -namespace Octokit.Models.Response.ActivityPayloads +using System.Diagnostics; + +namespace Octokit.Models.Response.ActivityPayloads { + [DebuggerDisplay("{DebuggerDisplay,nq}")] public class StarredEventPayload : ActivityPayload { - public string Action { get; set; } + public string Action { get; protected set; } } } diff --git a/Octokit/Octokit-MonoAndroid.csproj b/Octokit/Octokit-MonoAndroid.csproj index aa58c2a9..46ce84bf 100644 --- a/Octokit/Octokit-MonoAndroid.csproj +++ b/Octokit/Octokit-MonoAndroid.csproj @@ -102,6 +102,15 @@ + + + + + + + + + diff --git a/Octokit/Octokit-Monotouch.csproj b/Octokit/Octokit-Monotouch.csproj index a7bd1580..7ee228d3 100644 --- a/Octokit/Octokit-Monotouch.csproj +++ b/Octokit/Octokit-Monotouch.csproj @@ -99,6 +99,15 @@ + + + + + + + + +