Made some minor style changes

This commit is contained in:
Haacked
2014-10-24 15:27:23 -07:00
parent 2eaeb8c40f
commit dd712ff0e9
3 changed files with 21 additions and 28 deletions
+2 -4
View File
@@ -1,9 +1,7 @@
using System;
using System.Threading.Tasks;
using NSubstitute;
using Octokit.Tests.Helpers;
using Xunit;
using System.Collections.Generic;
using NSubstitute;
using Xunit;
namespace Octokit.Tests.Clients
{
+8 -6
View File
@@ -11,7 +11,7 @@ namespace Octokit
[SuppressMessage("Microsoft.Design", "CA1012:AbstractTypesShouldNotHaveConstructors")]
public abstract class BaseSearchRequest
{
public BaseSearchRequest(string term)
protected BaseSearchRequest(string term)
{
Ensure.ArgumentNotNullOrEmptyString(term, "term");
Term = term;
@@ -80,15 +80,17 @@ namespace Octokit
{
get
{
var d = new Dictionary<string, string>();
d.Add("page", Page.ToString(CultureInfo.CurrentCulture));
d.Add("per_page", PerPage.ToString(CultureInfo.CurrentCulture));
var d = new Dictionary<string, string>
{
{ "page", Page.ToString(CultureInfo.CurrentCulture) }
, { "per_page", PerPage.ToString(CultureInfo.CurrentCulture) }
, { "order", SortOrder }
, { "q", TermAndQualifiers }
};
if (!String.IsNullOrWhiteSpace(Sort))
{
d.Add("sort", Sort);
}
d.Add("order", SortOrder);
d.Add("q", TermAndQualifiers);
return d;
}
}
@@ -187,7 +187,7 @@ namespace Octokit
[SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.Int32.ToString")]
public Range(int size)
{
query = size.ToString();
query = size.ToString(CultureInfo.InvariantCulture);
}
/// <summary>
@@ -195,34 +195,30 @@ namespace Octokit
/// </summary>
/// <param name="minSize"></param>
/// <param name="maxSize"></param>
[SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.String.Format(System.String,System.Object[])"), System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.String.Format(System.String,System.Object,System.Object)"), System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.Int32.ToString")]
public Range(int minSize, int maxSize)
{
query = string.Format("{0}..{1}", minSize, maxSize);
query = string.Format(CultureInfo.InvariantCulture, "{0}..{1}", minSize, maxSize);
}
/// <summary>
/// Matches repositories with regards to the size <see cref="size"/>
/// We will use the <see cref="op"/> to see what operator will be applied to the size qualifier
/// </summary>
[SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.String.Format(System.String,System.Object[])"), System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.Int32.ToString"), System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.String.Format(System.String,System.Object)")]
public Range(int size, SearchQualifierOperator op)
{
switch (op)
{
case SearchQualifierOperator.GreaterThan:
query = string.Format(">{0}", size.ToString());
query = string.Format(CultureInfo.InvariantCulture, ">{0}", size);
break;
case SearchQualifierOperator.LessThan:
query = string.Format("<{0}", size.ToString());
query = string.Format(CultureInfo.InvariantCulture, "<{0}", size);
break;
case SearchQualifierOperator.LessThanOrEqualTo:
query = string.Format("<={0}", size.ToString());
query = string.Format(CultureInfo.InvariantCulture, "<={0}", size);
break;
case SearchQualifierOperator.GreaterThanOrEqualTo:
query = string.Format(">={0}", size.ToString());
break;
default:
query = string.Format(CultureInfo.InvariantCulture, ">={0}", size);
break;
}
}
@@ -271,7 +267,7 @@ namespace Octokit
/// </summary>
public class DateRange
{
private string query = string.Empty;
private readonly string query = string.Empty;
/// <summary>
/// Matches repositories with regards to the date <see cref="date"/>
@@ -279,24 +275,21 @@ namespace Octokit
/// </summary>
/// <param name="date">The date</param>
/// <param name="op">And its search operator</param>
[SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.String.Format(System.String,System.Object[])"), System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.DateTime.ToString(System.String)"), System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.String.Format(System.String,System.Object)")]
public DateRange(DateTime date, SearchQualifierOperator op)
{
switch (op)
{
case SearchQualifierOperator.GreaterThan:
query = string.Format(">{0}", date.ToString("yyyy-MM-dd"));
query = string.Format(CultureInfo.InvariantCulture, ">{0:yyyy-MM-dd}", date);
break;
case SearchQualifierOperator.LessThan:
query = string.Format("<{0}", date.ToString("yyyy-MM-dd"));
query = string.Format(CultureInfo.InvariantCulture, "<{0:yyyy-MM-dd}", date);
break;
case SearchQualifierOperator.LessThanOrEqualTo:
query = string.Format("<={0}", date.ToString("yyyy-MM-dd"));
query = string.Format(CultureInfo.InvariantCulture, "<={0:yyyy-MM-dd}", date);
break;
case SearchQualifierOperator.GreaterThanOrEqualTo:
query = string.Format(">={0}", date.ToString("yyyy-MM-dd"));
break;
default:
query = string.Format(CultureInfo.InvariantCulture, ">={0:yyyy-MM-dd}", date);
break;
}
}