Change ctor to simplify code

Author: shana

src/GitHub.Api/SimpleApiClient.cs

@@ -5,6 +5,7 @@
 using GitHub.Primitives;
 using GitHub.Services;
 using Octokit;
+using GitHub.Extensions;
 
 namespace GitHub.Api
 {
@@ -23,10 +24,13 @@ public class SimpleApiClient : ISimpleApiClient
         bool? isEnterprise;
         bool? hasWiki;
 
-        public SimpleApiClient(HostAddress hostAddress, UriString repoUrl, IGitHubClient githubClient,
+        public SimpleApiClient(UriString repoUrl, IGitHubClient githubClient,
             Lazy<IEnterpriseProbeTask> enterpriseProbe, Lazy<IWikiProbe> wikiProbe)
         {
-            HostAddress = hostAddress;
+            Guard.ArgumentNotNull(repoUrl, nameof(repoUrl));
+            Guard.ArgumentNotNull(githubClient, nameof(githubClient));
+
+            HostAddress = HostAddress.Create(repoUrl);
             OriginalUrl = repoUrl;
             client = githubClient;
             this.enterpriseProbe = enterpriseProbe;
@@ -48,7 +52,7 @@ async Task<Repository> GetRepositoryInternal()
             await sem.WaitAsync();
             try
             {
-                if (owner == null && OriginalUrl != null)
+                if (owner == null)
                 {
                     var ownerLogin = OriginalUrl.Owner;
                     var repositoryName = OriginalUrl.RepositoryName;

src/GitHub.Api/SimpleApiClientFactory.cs

@@ -30,7 +30,7 @@ public SimpleApiClientFactory(IProgram program, Lazy<IEnterpriseProbeTask> enter
         public ISimpleApiClient Create(UriString repositoryUrl)
         {
             var hostAddress = HostAddress.Create(repositoryUrl);
-            return cache.GetOrAdd(repositoryUrl, new SimpleApiClient(hostAddress, repositoryUrl,
+            return cache.GetOrAdd(repositoryUrl, new SimpleApiClient(repositoryUrl,
                 new GitHubClient(productHeader, new SimpleCredentialStore(hostAddress), hostAddress.ApiUri),
                 lazyEnterpriseProbe, lazyWikiProbe));
         }

src/GitHub.Extensions/Guard.cs

@@ -1,4 +1,5 @@
-using System;
+using NullGuard;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
@@ -8,6 +9,19 @@ namespace GitHub.Extensions
 {
     public static class Guard
     {
+        public static void ArgumentNotNull([AllowNull]object value, string name)
+        {
+            if (value != null) return;
+            string message = String.Format(CultureInfo.InvariantCulture, "Failed Null Check on '{0}'", name);
+#if DEBUG
+            if (!InUnitTestRunner())
+            {
+                Debug.Fail(message);
+            }
+#endif
+            throw new ArgumentNullException(name, message);
+        }
+
         public static void ArgumentNonNegative(int value, string name)
         {
             if (value > -1) return;
@@ -78,29 +92,7 @@ public static void ArgumentInRange(int value, int minValue, int maxValue, string
         // Borrowed from Splat.
         static bool InUnitTestRunner()
         {
-            var testAssemblies = new[] {
-                "CSUNIT",
-                "NUNIT",
-                "XUNIT",
-                "MBUNIT",
-                "PEX.",
-                "NBEHAVE",
-            };
-
-            try
-            {
-                return SearchForAssembly(testAssemblies);
-            }
-            catch (Exception)
-            {
-                return false;
-            }
-        }
-
-        static bool SearchForAssembly(IEnumerable<string> assemblyList)
-        {
-            return AppDomain.CurrentDomain.GetAssemblies()
-                .Any(x => assemblyList.Any(name => x.FullName.ToUpperInvariant().Contains(name)));
+            return Splat.ModeDetector.InUnitTestRunner();
         }
     }
 }

src/UnitTests/GitHub.Api/SimpleApiClientTests.cs

@@ -21,7 +21,6 @@ public async Task RetrievesRepositoryFromWeb()
             var enterpriseProbe = Substitute.For<IEnterpriseProbeTask>();
             var wikiProbe = Substitute.For<IWikiProbe>();
             var client = new SimpleApiClient(
-                gitHubHost,
                 "https://github.com/github/visualstudio",
                 gitHubClient,
                 new Lazy<IEnterpriseProbeTask>(() => enterpriseProbe),
@@ -43,7 +42,6 @@ public async Task RetrievesCachedRepositoryForSubsequentCalls()
             var enterpriseProbe = Substitute.For<IEnterpriseProbeTask>();
             var wikiProbe = Substitute.For<IWikiProbe>();
             var client = new SimpleApiClient(
-                gitHubHost,
                 "https://github.com/github/visualstudio",
                 gitHubClient,
                 new Lazy<IEnterpriseProbeTask>(() => enterpriseProbe),
@@ -73,7 +71,6 @@ public async Task ReturnsTrueWhenWikiProbeReturnsOk(WikiProbeResult probeResult,
             wikiProbe.ProbeAsync(repository)
                 .Returns(_ => Task.FromResult(probeResult), _ => { throw new Exception("Only call it once"); });
             var client = new SimpleApiClient(
-                gitHubHost,
                 "https://github.com/github/visualstudio",
                 gitHubClient,
                 new Lazy<IEnterpriseProbeTask>(() => enterpriseProbe),
@@ -94,7 +91,6 @@ public void ReturnsFalseWhenWeHaveNotRequestedRepository()
             var enterpriseProbe = Substitute.For<IEnterpriseProbeTask>();
             var wikiProbe = Substitute.For<IWikiProbe>();
             var client = new SimpleApiClient(
-                gitHubHost,
                 "https://github.com/github/visualstudio",
                 gitHubClient,
                 new Lazy<IEnterpriseProbeTask>(() => enterpriseProbe),
@@ -123,7 +119,6 @@ public async Task ReturnsTrueWhenEnterpriseProbeReturnsOk(EnterpriseProbeResult
                 .Returns(_ => Task.FromResult(probeResult), _ => { throw new Exception("Only call it once"); });
             var wikiProbe = Substitute.For<IWikiProbe>();
             var client = new SimpleApiClient(
-                gitHubHost,
                 "https://github.com/github/visualstudio",
                 gitHubClient,
                 new Lazy<IEnterpriseProbeTask>(() => enterpriseProbe),
@@ -144,7 +139,6 @@ public void ReturnsFalseWhenWeHaveNotRequestedRepository()
             var enterpriseProbe = Substitute.For<IEnterpriseProbeTask>();
             var wikiProbe = Substitute.For<IWikiProbe>();
             var client = new SimpleApiClient(
-                gitHubHost,
                 "https://github.com/github/visualstudio",
                 gitHubClient,
                 new Lazy<IEnterpriseProbeTask>(() => enterpriseProbe),