Merge pull request #546 from github/grokys/remove-duplicate-guard

shana · web-flow · commit 8448a3bc9b03 · 2016-09-12T21:16:06.000+02:00
Remove duplicate guard class.
diff --git a/src/GitHub.App/Api/ApiClient.cs b/src/GitHub.App/Api/ApiClient.cs
@@ -18,6 +18,7 @@
 using Octokit.Internal;
 using System.Collections.Generic;
 using GitHub.Models;
+using GitHub.Extensions;
 
 namespace GitHub.Api
 {
diff --git a/src/GitHub.App/Caches/LoginCache.cs b/src/GitHub.App/Caches/LoginCache.cs
@@ -4,6 +4,7 @@
 using System.Reactive;
 using System.Reactive.Linq;
 using Akavache;
+using GitHub.Extensions;
 using GitHub.Primitives;
 using NLog;
 
diff --git a/src/GitHub.App/Factories/SqlitePersistentBlobCacheFactory.cs b/src/GitHub.App/Factories/SqlitePersistentBlobCacheFactory.cs
@@ -6,6 +6,7 @@
 using System.ComponentModel.Composition;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
+using GitHub.Extensions;
 
 namespace GitHub.Factories
 {
diff --git a/src/GitHub.App/Models/RepositoryHost.cs b/src/GitHub.App/Models/RepositoryHost.cs
@@ -17,6 +17,7 @@
 using System.Linq;
 using System.Reactive.Threading.Tasks;
 using System.Collections.Generic;
+using GitHub.Extensions;
 
 namespace GitHub.Models
 {
diff --git a/src/GitHub.App/Services/GitClient.cs b/src/GitHub.App/Services/GitClient.cs
@@ -3,8 +3,9 @@
 using System.Linq;
 using System.Reactive;
 using System.Reactive.Linq;
-using LibGit2Sharp;
+using GitHub.Extensions;
 using GitHub.Primitives;
+using LibGit2Sharp;
 
 namespace GitHub.Services
 {
diff --git a/src/GitHub.App/Services/RepositoryCreationService.cs b/src/GitHub.App/Services/RepositoryCreationService.cs
@@ -3,6 +3,7 @@
 using System.Reactive;
 using System.Reactive.Linq;
 using GitHub.Api;
+using GitHub.Extensions;
 using GitHub.Extensions.Reactive;
 using GitHub.Models;
 using Octokit;
diff --git a/src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj b/src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj
@@ -125,7 +125,6 @@
       <Link>Key.snk</Link>
     </None>
     <Compile Include="Helpers\ExceptionHelper.cs" />
-    <Compile Include="Helpers\Guard.cs" />
     <Compile Include="Models\GitIgnoreItem.cs" />
     <Compile Include="Models\LicenseItem.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/src/GitHub.Exports.Reactive/Helpers/Guard.cs b/src/GitHub.Exports.Reactive/Helpers/Guard.cs
diff --git a/src/GitHub.Extensions/Guard.cs b/src/GitHub.Extensions/Guard.cs
@@ -37,13 +37,13 @@ public static void ArgumentNonNegative(int value, string name)
         }
 
         /// <summary>
-        ///   Checks a string argument to ensure it isn't null or empty.
+        /// Checks a string argument to ensure it isn't null or empty.
         /// </summary>
         /// <param name = "value">The argument value to check.</param>
         /// <param name = "name">The name of the argument.</param>
         public static void ArgumentNotEmptyString(string value, string name)
         {
-            if (value.Length > 0) return;
+            if (value?.Length > 0) return;
             string message = String.Format(CultureInfo.InvariantCulture, "The value for '{0}' must not be empty", name);
 #if DEBUG
             if (!InUnitTestRunner())
diff --git a/src/GitHub.UI.Reactive/Validation/ReactiveValidatableObject.cs b/src/GitHub.UI.Reactive/Validation/ReactiveValidatableObject.cs
@@ -10,6 +10,7 @@
 using ReactiveUI;
 using NullGuard;
 using GitHub.Services;
+using GitHub.Extensions;
 
 namespace GitHub.Validation
 {
diff --git a/src/UnitTests/GitHub.Extensions/GuardTests.cs b/src/UnitTests/GitHub.Extensions/GuardTests.cs
@@ -0,0 +1,121 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using GitHub.Extensions;
+using Xunit;
+
+namespace UnitTests.GitHub.Extensions
+{
+    public class GuardTests
+    {
+        public class TheArgumentNotNullMethod : TestBaseClass
+        {
+            [Fact]
+            public void ShouldNotThrow()
+            {
+                Guard.ArgumentNotNull(new object(), "name");
+            }
+
+            [Fact]
+            public void ShouldThrow()
+            {
+                Assert.Throws<ArgumentNullException>(() => Guard.ArgumentNotNull(null, "name"));
+            }
+        }
+
+        public class TheArgumentNonNegativeMethod : TestBaseClass
+        {
+            [Fact]
+            public void ShouldNotThrowFor0()
+            {
+                Guard.ArgumentNonNegative(0, "name");
+            }
+
+            [Fact]
+            public void ShouldNotThrowFor1()
+            {
+                Guard.ArgumentNonNegative(1, "name");
+            }
+
+            [Fact]
+            public void ShouldThrowForMinus1()
+            {
+                Assert.Throws<ArgumentException>(() => Guard.ArgumentNonNegative(-1, "name"));
+            }
+        }
+
+        public class TheArgumentNotEmptyStringMethod : TestBaseClass
+        {
+            [Fact]
+            public void ShouldNotThrowForString()
+            {
+                Guard.ArgumentNotEmptyString("string", "name");
+            }
+
+            [Fact]
+            public void ShouldThrowForEmptyString()
+            {
+                Assert.Throws<ArgumentException>(() => Guard.ArgumentNotEmptyString("", "name"));
+            }
+
+            [Fact]
+            public void ShouldThrowForNull()
+            {
+                Assert.Throws<ArgumentException>(() => Guard.ArgumentNotEmptyString(null, "name"));
+            }
+        }
+
+        public class TheArgumentInRangeMethod : TestBaseClass
+        {
+            [Fact]
+            public void ShouldNotThrowForGreaterThanMinimum()
+            {
+                Guard.ArgumentInRange(12, 10, "name");
+            }
+
+            [Fact]
+            public void ShouldNotThrowForEqualToMinimumNoMaximum()
+            {
+                Guard.ArgumentInRange(10, 10, "name");
+            }
+
+            [Fact]
+            public void ShouldNotThrowForEqualToMinimumWithMaximum()
+            {
+                Guard.ArgumentInRange(10, 10, 20, "name");
+            }
+
+            [Fact]
+            public void ShouldNotThrowForEqualToMaximum()
+            {
+                Guard.ArgumentInRange(20, 10, 20, "name");
+            }
+
+            [Fact]
+            public void ShouldNotThrowForBetweenMinimumAndMaximum()
+            {
+                Guard.ArgumentInRange(12, 10, 20, "name");
+            }
+
+            [Fact]
+            public void ShouldThrowForLessThanMinimumNoMaximum()
+            {
+                Assert.Throws<ArgumentOutOfRangeException>(() => Guard.ArgumentInRange(2, 10, "name"));
+            }
+
+            [Fact]
+            public void ShouldThrowForLessThanMinimumWithMaximum()
+            {
+                Assert.Throws<ArgumentOutOfRangeException>(() => Guard.ArgumentInRange(2, 10, 20, "name"));
+            }
+
+            [Fact]
+            public void ShouldThrowForGreaterThanMaximum()
+            {
+                Assert.Throws<ArgumentOutOfRangeException>(() => Guard.ArgumentInRange(22, 10, 20, "name"));
+            }
+        }
+    }
+}
diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj
@@ -181,6 +181,7 @@
     <Compile Include="GitHub.Exports\GitServiceTests.cs" />
     <None Include="GitHub.Exports\VSServicesTests.cs" />
     <Compile Include="GitHub.Exports\SimpleRepositoryModelTests.cs" />
+    <Compile Include="GitHub.Extensions\GuardTests.cs" />
     <Compile Include="GitHub.Extensions\UriExtensionTests.cs" />
     <Compile Include="GitHub.Primitives\UriStringTests.cs" />
     <Compile Include="GitHub.UI\Converters.cs" />

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`using Octokit.Internal;`
`19`	`19`	`using System.Collections.Generic;`
`20`	`20`	`using GitHub.Models;`
	`21`	`+using GitHub.Extensions;`
`21`	`22`
`22`	`23`	`namespace GitHub.Api`
`23`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using System.ComponentModel.Composition;`
`7`	`7`	`using System.Reactive.Linq;`
`8`	`8`	`using System.Threading.Tasks;`
	`9`	`+using GitHub.Extensions;`
`9`	`10`
`10`	`11`	`namespace GitHub.Factories`
`11`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`using System.Linq;`
`18`	`18`	`using System.Reactive.Threading.Tasks;`
`19`	`19`	`using System.Collections.Generic;`
	`20`	`+using GitHub.Extensions;`
`20`	`21`
`21`	`22`	`namespace GitHub.Models`
`22`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`using ReactiveUI;`
`11`	`11`	`using NullGuard;`
`12`	`12`	`using GitHub.Services;`
	`13`	`+using GitHub.Extensions;`
`13`	`14`
`14`	`15`	`namespace GitHub.Validation`
`15`	`16`	`{`