From 4fd65200e12a05b65795fe2ae3eeba339ae5aa8e Mon Sep 17 00:00:00 2001 From: Haroon Date: Mon, 25 Nov 2013 10:37:12 +0000 Subject: [PATCH] better names for qualifiers --- Octokit.Tests/Clients/SearchClientTests.cs | 4 ++-- .../Models/Request/SearchQualifierOperator.cs | 5 ++--- .../Models/Request/SearchRepositoriesRequest.cs | 16 ++++++++-------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Octokit.Tests/Clients/SearchClientTests.cs b/Octokit.Tests/Clients/SearchClientTests.cs index 1bbf7be9..516ef8aa 100644 --- a/Octokit.Tests/Clients/SearchClientTests.cs +++ b/Octokit.Tests/Clients/SearchClientTests.cs @@ -72,8 +72,8 @@ namespace Octokit.Tests.Clients //method 1... request.Size = new Range(55); //match 55Mb Exactly request.Size = new Range(100, 5000); //match repo's between 100 and 5000 MB's - request.Size = new Range(1000, SearchQualifierOperator.GreaterOrEqualTo); //match repo's that are greater than or equal to 1000 - request.Size = new Range(1000, SearchQualifierOperator.LessOrEqualTo); //match repo's that are less than or equal to 1000 + request.Size = new Range(1000, SearchQualifierOperator.GreaterThanOrEqualTo); //match repo's that are greater than or equal to 1000 + request.Size = new Range(1000, SearchQualifierOperator.LessThanOrEqualTo); //match repo's that are less than or equal to 1000 request.Size = new Range(1000, SearchQualifierOperator.LessThan); //match repo's that are less than 1000 request.Size = new Range(1000, SearchQualifierOperator.GreaterThan); //match repo's that are greater than 1000 request.Size = Range.GreaterThan(5000); diff --git a/Octokit/Models/Request/SearchQualifierOperator.cs b/Octokit/Models/Request/SearchQualifierOperator.cs index e4988ae1..712d44a7 100644 --- a/Octokit/Models/Request/SearchQualifierOperator.cs +++ b/Octokit/Models/Request/SearchQualifierOperator.cs @@ -13,8 +13,7 @@ namespace Octokit { GreaterThan, // > LessThan, // < - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "LessOr")] - LessOrEqualTo, // <= - GreaterOrEqualTo// >= + LessThanOrEqualTo, // <= + GreaterThanOrEqualTo// >= } } diff --git a/Octokit/Models/Request/SearchRepositoriesRequest.cs b/Octokit/Models/Request/SearchRepositoriesRequest.cs index 3b35994d..bc6b514c 100644 --- a/Octokit/Models/Request/SearchRepositoriesRequest.cs +++ b/Octokit/Models/Request/SearchRepositoriesRequest.cs @@ -240,10 +240,10 @@ namespace Octokit case SearchQualifierOperator.LessThan: query = string.Format("<{0}", size.ToString()); break; - case SearchQualifierOperator.LessOrEqualTo: + case SearchQualifierOperator.LessThanOrEqualTo: query = string.Format("<={0}", size.ToString()); break; - case SearchQualifierOperator.GreaterOrEqualTo: + case SearchQualifierOperator.GreaterThanOrEqualTo: query = string.Format(">={0}", size.ToString()); break; default: @@ -264,7 +264,7 @@ namespace Octokit /// public static Range LessThanOrEquals(int size) { - return new Range(size, SearchQualifierOperator.LessOrEqualTo); + return new Range(size, SearchQualifierOperator.LessThanOrEqualTo); } /// @@ -280,7 +280,7 @@ namespace Octokit /// public static Range GreaterThanOrEquals(int size) { - return new Range(size, SearchQualifierOperator.GreaterOrEqualTo); + return new Range(size, SearchQualifierOperator.GreaterThanOrEqualTo); } public override string ToString() @@ -313,10 +313,10 @@ namespace Octokit case SearchQualifierOperator.LessThan: query = string.Format("<{0}", date.ToString("yyyy-mm-dd")); break; - case SearchQualifierOperator.LessOrEqualTo: + case SearchQualifierOperator.LessThanOrEqualTo: query = string.Format("<={0}", date.ToString("yyyy-mm-dd")); break; - case SearchQualifierOperator.GreaterOrEqualTo: + case SearchQualifierOperator.GreaterThanOrEqualTo: query = string.Format(">={0}", date.ToString("yyyy-mm-dd")); break; default: @@ -343,7 +343,7 @@ namespace Octokit /// public static DateRange LessThanOrEquals(DateTime date) { - return new DateRange(date, SearchQualifierOperator.LessOrEqualTo); + return new DateRange(date, SearchQualifierOperator.LessThanOrEqualTo); } /// @@ -365,7 +365,7 @@ namespace Octokit /// public static DateRange GreaterThanOrEquals(DateTime date) { - return new DateRange(date, SearchQualifierOperator.GreaterOrEqualTo); + return new DateRange(date, SearchQualifierOperator.GreaterThanOrEqualTo); } public override string ToString()