From 444e8aa8c30565d116083234a2b3c7099ee132fc Mon Sep 17 00:00:00 2001 From: Kristian Hellang Date: Tue, 6 Jan 2015 08:44:19 +0100 Subject: [PATCH] Fixed failing HasDebuggerDisplayAttribute tests --- Octokit/Models/Request/GistFileUpdate.cs | 19 +++++++++++++++++++ Octokit/Models/Request/GistUpdate.cs | 11 +---------- Octokit/Models/Request/NewTreeItem.cs | 12 +++++++++++- Octokit/Models/Response/GistChangeStatus.cs | 12 +++++++++++- Octokit/Models/Response/GistFile.cs | 11 ++++++++++- Octokit/Models/Response/GistFork.cs | 8 ++++++++ Octokit/Models/Response/GistHistory.cs | 8 ++++++++ Octokit/Models/Response/TreeItem.cs | 8 ++++++++ Octokit/Octokit-Mono.csproj | 1 + Octokit/Octokit-MonoAndroid.csproj | 3 ++- Octokit/Octokit-Monotouch.csproj | 3 ++- Octokit/Octokit-Portable.csproj | 1 + Octokit/Octokit-netcore45.csproj | 1 + Octokit/Octokit.csproj | 1 + 14 files changed, 84 insertions(+), 15 deletions(-) create mode 100644 Octokit/Models/Request/GistFileUpdate.cs diff --git a/Octokit/Models/Request/GistFileUpdate.cs b/Octokit/Models/Request/GistFileUpdate.cs new file mode 100644 index 00000000..2c338fbb --- /dev/null +++ b/Octokit/Models/Request/GistFileUpdate.cs @@ -0,0 +1,19 @@ +using System; +using System.Diagnostics; +using System.Globalization; + +namespace Octokit +{ + [DebuggerDisplay("{DebuggerDisplay,nq}")] + public class GistFileUpdate + { + public string NewFileName { get; set; } + + public string Content { get; set; } + + internal string DebuggerDisplay + { + get { return String.Format(CultureInfo.InvariantCulture, "NewFileName: {0}", NewFileName); } + } + } +} \ No newline at end of file diff --git a/Octokit/Models/Request/GistUpdate.cs b/Octokit/Models/Request/GistUpdate.cs index 3462f26a..2ccf21ab 100644 --- a/Octokit/Models/Request/GistUpdate.cs +++ b/Octokit/Models/Request/GistUpdate.cs @@ -26,16 +26,7 @@ namespace Octokit internal string DebuggerDisplay { - get - { - return String.Format(CultureInfo.InvariantCulture, "Description: {0}", Description); - } + get { return String.Format(CultureInfo.InvariantCulture, "Description: {0}", Description); } } } - - public class GistFileUpdate - { - public string NewFileName { get; set; } - public string Content { get; set; } - } } diff --git a/Octokit/Models/Request/NewTreeItem.cs b/Octokit/Models/Request/NewTreeItem.cs index 41087e67..4a3bd5e4 100644 --- a/Octokit/Models/Request/NewTreeItem.cs +++ b/Octokit/Models/Request/NewTreeItem.cs @@ -1,5 +1,10 @@ -namespace Octokit +using System; +using System.Diagnostics; +using System.Globalization; + +namespace Octokit { + [DebuggerDisplay("{DebuggerDisplay,nq}")] public class NewTreeItem { /// @@ -25,5 +30,10 @@ /// The SHA for this Tree item. /// public string Sha { get; set; } + + internal string DebuggerDisplay + { + get { return String.Format(CultureInfo.InvariantCulture, "SHA: {0}, Path: {1}, Type: {2}", Sha, Path, Type); } + } } } \ No newline at end of file diff --git a/Octokit/Models/Response/GistChangeStatus.cs b/Octokit/Models/Response/GistChangeStatus.cs index e3fc1b6e..1f9ca062 100644 --- a/Octokit/Models/Response/GistChangeStatus.cs +++ b/Octokit/Models/Response/GistChangeStatus.cs @@ -1,8 +1,13 @@ -namespace Octokit +using System; +using System.Diagnostics; +using System.Globalization; + +namespace Octokit { /// /// User by to indicate the level of change. /// + [DebuggerDisplay("{DebuggerDisplay,nq}")] public class GistChangeStatus { /// @@ -19,5 +24,10 @@ /// The total number of changes. /// public int Total { get; protected set; } + + internal string DebuggerDisplay + { + get { return String.Format(CultureInfo.InvariantCulture, "Deletions: {0}, Additions: {1}, Total: {2}", Deletions, Additions, Total); } + } } } \ No newline at end of file diff --git a/Octokit/Models/Response/GistFile.cs b/Octokit/Models/Response/GistFile.cs index a396a165..8ffac091 100644 --- a/Octokit/Models/Response/GistFile.cs +++ b/Octokit/Models/Response/GistFile.cs @@ -1,7 +1,11 @@ -using System.Diagnostics.CodeAnalysis; +using System; +using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; +using System.Globalization; namespace Octokit { + [DebuggerDisplay("{DebuggerDisplay,nq}")] public class GistFile { /// @@ -35,5 +39,10 @@ namespace Octokit /// The url to download the file. /// public string RawUrl { get; protected set; } + + internal string DebuggerDisplay + { + get { return String.Format(CultureInfo.InvariantCulture, "Filename: {0}, Size: {1}, Type: {2}, Language: {3}", Filename, Size, Type, Language); } + } } } \ No newline at end of file diff --git a/Octokit/Models/Response/GistFork.cs b/Octokit/Models/Response/GistFork.cs index b33163c5..26c9b79d 100644 --- a/Octokit/Models/Response/GistFork.cs +++ b/Octokit/Models/Response/GistFork.cs @@ -1,7 +1,10 @@ using System; +using System.Diagnostics; +using System.Globalization; namespace Octokit { + [DebuggerDisplay("{DebuggerDisplay,nq}")] public class GistFork { /// @@ -18,5 +21,10 @@ namespace Octokit /// The for when this was created. /// public DateTimeOffset CreatedAt { get; protected set; } + + internal string DebuggerDisplay + { + get { return String.Format(CultureInfo.InvariantCulture, "User: {0}, Url: {1}", User.DebuggerDisplay, Url); } + } } } \ No newline at end of file diff --git a/Octokit/Models/Response/GistHistory.cs b/Octokit/Models/Response/GistHistory.cs index 50c4063d..679659b8 100644 --- a/Octokit/Models/Response/GistHistory.cs +++ b/Octokit/Models/Response/GistHistory.cs @@ -1,10 +1,13 @@ using System; +using System.Diagnostics; +using System.Globalization; namespace Octokit { /// /// A historical version of a /// + [DebuggerDisplay("{DebuggerDisplay,nq}")] public class GistHistory { /// @@ -31,5 +34,10 @@ namespace Octokit /// The the version was created. /// public DateTimeOffset CommittedAt { get; protected set; } + + internal string DebuggerDisplay + { + get { return String.Format(CultureInfo.InvariantCulture, "User: {0}, Url: {1}, Version: {2}, ChangeStatus: {3}", User.DebuggerDisplay, Url, Version, ChangeStatus); } + } } } \ No newline at end of file diff --git a/Octokit/Models/Response/TreeItem.cs b/Octokit/Models/Response/TreeItem.cs index 6be4beca..9ac97d42 100644 --- a/Octokit/Models/Response/TreeItem.cs +++ b/Octokit/Models/Response/TreeItem.cs @@ -1,8 +1,11 @@ using System; +using System.Diagnostics; using System.Diagnostics.CodeAnalysis; +using System.Globalization; namespace Octokit { + [DebuggerDisplay("{DebuggerDisplay,nq}")] public class TreeItem { /// @@ -35,6 +38,11 @@ namespace Octokit /// The URL of this Tree Item. /// public Uri Url { get; protected set; } + + internal string DebuggerDisplay + { + get { return String.Format(CultureInfo.InvariantCulture, "Sha: {0}, Path: {1}, Type: {2}, Size: {3}", Sha, Path, Type, Size); } + } } public enum TreeType diff --git a/Octokit/Octokit-Mono.csproj b/Octokit/Octokit-Mono.csproj index 6e2146d8..deafab2a 100644 --- a/Octokit/Octokit-Mono.csproj +++ b/Octokit/Octokit-Mono.csproj @@ -89,6 +89,7 @@ + diff --git a/Octokit/Octokit-MonoAndroid.csproj b/Octokit/Octokit-MonoAndroid.csproj index fb82da01..08148e37 100644 --- a/Octokit/Octokit-MonoAndroid.csproj +++ b/Octokit/Octokit-MonoAndroid.csproj @@ -371,6 +371,7 @@ + - + \ No newline at end of file diff --git a/Octokit/Octokit-Monotouch.csproj b/Octokit/Octokit-Monotouch.csproj index 51abe5b6..84c577ee 100644 --- a/Octokit/Octokit-Monotouch.csproj +++ b/Octokit/Octokit-Monotouch.csproj @@ -366,7 +366,8 @@ + - + \ No newline at end of file diff --git a/Octokit/Octokit-Portable.csproj b/Octokit/Octokit-Portable.csproj index 0b962539..206879b1 100644 --- a/Octokit/Octokit-Portable.csproj +++ b/Octokit/Octokit-Portable.csproj @@ -357,6 +357,7 @@ + diff --git a/Octokit/Octokit-netcore45.csproj b/Octokit/Octokit-netcore45.csproj index 2d1315a8..9f5a7e62 100644 --- a/Octokit/Octokit-netcore45.csproj +++ b/Octokit/Octokit-netcore45.csproj @@ -361,6 +361,7 @@ + diff --git a/Octokit/Octokit.csproj b/Octokit/Octokit.csproj index 7b4fcaf0..0fa855ba 100644 --- a/Octokit/Octokit.csproj +++ b/Octokit/Octokit.csproj @@ -78,6 +78,7 @@ +