Factor out CreateRepositoryCloneService

Author: jcansdale

test/GitHub.App.UnitTests/Services/RepositoryCloneServiceTests.cs

@@ -7,7 +7,6 @@
 using System.Linq.Expressions;
 using System;
 using GitHub.Models;
-using GitHub.Api;
 
 public class RepositoryCloneServiceTests
 {
@@ -16,10 +15,10 @@ public class TheCloneRepositoryMethod : TestBaseClass
         [Test]
         public async Task ClonesToRepositoryPathAsync()
         {
-            var serviceProvider = Substitutes.ServiceProvider;
+            var serviceProvider = Substitutes.GetServiceProvider();
             var operatingSystem = serviceProvider.GetOperatingSystem();
             var vsGitServices = serviceProvider.GetVSGitServices();
-            var cloneService = serviceProvider.GetRepositoryCloneService();
+            var cloneService = CreateRepositoryCloneService(serviceProvider);
 
             await cloneService.CloneRepository("https://github.com/foo/bar", @"c:\dev\bar");
 
@@ -35,15 +34,9 @@ public async Task ClonesToRepositoryPathAsync()
         [TestCase("https://enterprise.com/foo/bar", 0, nameof(UsageModel.MeasuresModel.NumberOfGitHubClones))]
         public async Task UpdatesMetricsWhenRepositoryClonedAsync(string cloneUrl, int numberOfCalls, string counterName)
         {
-            var serviceProvider = Substitutes.ServiceProvider;
-            var operatingSystem = serviceProvider.GetOperatingSystem();
-            var vsGitServices = serviceProvider.GetVSGitServices();
-            var teamExplorerServices = Substitute.For<ITeamExplorerServices>();
-            var graphqlFactory = Substitute.For<IGraphQLClientFactory>();
-            var gitHubContextService = Substitute.For<IGitHubContextService>();
-            var usageTracker = Substitute.For<IUsageTracker>();
-            var cloneService = new RepositoryCloneService(operatingSystem, vsGitServices, teamExplorerServices,
-                graphqlFactory, gitHubContextService, usageTracker);
+            var serviceProvider = Substitutes.GetServiceProvider();
+            var usageTracker = serviceProvider.GetUsageTracker();
+            var cloneService = CreateRepositoryCloneService(serviceProvider);
 
             await cloneService.CloneRepository(cloneUrl, @"c:\dev\bar");
             var model = UsageModel.Create(Guid.NewGuid());
@@ -68,16 +61,11 @@ public async Task UpdatesMetricsWhenCloneOrOpenRepositoryAsync(string cloneUrl,
         {
             var repositoryPath = @"c:\dev\bar";
             var cloneDialogResult = new CloneDialogResult(repositoryPath, cloneUrl);
-            var serviceProvider = Substitutes.ServiceProvider;
+            var serviceProvider = Substitutes.GetServiceProvider();
             var operatingSystem = serviceProvider.GetOperatingSystem();
             operatingSystem.Directory.DirectoryExists(repositoryPath).Returns(dirExists);
-            var vsGitServices = serviceProvider.GetVSGitServices();
-            var teamExplorerServices = Substitute.For<ITeamExplorerServices>();
-            var graphqlFactory = Substitute.For<IGraphQLClientFactory>();
-            var gitHubContextService = Substitute.For<IGitHubContextService>();
-            var usageTracker = Substitute.For<IUsageTracker>();
-            var cloneService = new RepositoryCloneService(operatingSystem, vsGitServices, teamExplorerServices,
-                graphqlFactory, gitHubContextService, usageTracker);
+            var usageTracker = serviceProvider.GetUsageTracker();
+            var cloneService = CreateRepositoryCloneService(serviceProvider);
 
             await cloneService.CloneOrOpenRepository(cloneDialogResult);
 
@@ -90,16 +78,11 @@ await usageTracker.Received(numberOfCalls).IncrementCounter(
         [TestCase(@"c:\not_default\repo", @"c:\default", 0, nameof(UsageModel.MeasuresModel.NumberOfClonesToDefaultClonePath))]
         public async Task UpdatesMetricsWhenDefaultClonePath(string targetPath, string defaultPath, int numberOfCalls, string counterName)
         {
-            var serviceProvider = Substitutes.ServiceProvider;
-            var operatingSystem = serviceProvider.GetOperatingSystem();
+            var serviceProvider = Substitutes.GetServiceProvider();
             var vsGitServices = serviceProvider.GetVSGitServices();
-            var teamExplorerServices = Substitute.For<ITeamExplorerServices>();
             vsGitServices.GetLocalClonePathFromGitProvider().Returns(defaultPath);
-            var graphqlFactory = Substitute.For<IGraphQLClientFactory>();
-            var gitHubContextService = Substitute.For<IGitHubContextService>();
-            var usageTracker = Substitute.For<IUsageTracker>();
-            var cloneService = new RepositoryCloneService(operatingSystem, vsGitServices, teamExplorerServices,
-                graphqlFactory, gitHubContextService, usageTracker);
+            var usageTracker = serviceProvider.GetUsageTracker();
+            var cloneService = CreateRepositoryCloneService(serviceProvider);
 
             await cloneService.CloneRepository("https://github.com/foo/bar", targetPath);
             var model = UsageModel.Create(Guid.NewGuid());
@@ -108,5 +91,12 @@ await usageTracker.Received(numberOfCalls).IncrementCounter(
                 Arg.Is<Expression<Func<UsageModel.MeasuresModel, int>>>(x =>
                     ((MemberExpression)x.Body).Member.Name == counterName));
         }
+
+        static RepositoryCloneService CreateRepositoryCloneService(IGitHubServiceProvider sp)
+        {
+            return new RepositoryCloneService(sp.GetOperatingSystem(), sp.GetVSGitServices(), sp.GetTeamExplorerServices(),
+                sp.GetGraphQLClientFactory(), sp.GetGitHubContextService(), sp.GetUsageTracker());
+
+        }
     }
 }

test/GitHub.App.UnitTests/Substitutes.cs

@@ -118,6 +118,10 @@ public static IGitHubServiceProvider GetServiceProvider(
             avatarProvider = avatarProvider ?? Substitute.For<IAvatarProvider>();
             ret.GetService(typeof(IGitService)).Returns(gitservice);
             ret.GetService(typeof(IVSServices)).Returns(Substitute.For<IVSServices>());
+            ret.GetService(typeof(ITeamExplorerServices)).Returns(Substitute.For<ITeamExplorerServices>());
+            ret.GetService(typeof(IGraphQLClientFactory)).Returns(Substitute.For<IGraphQLClientFactory>());
+            ret.GetService(typeof(IGitHubContextService)).Returns(Substitute.For<IGitHubContextService>());
+            ret.GetService(typeof(IUsageTracker)).Returns(Substitute.For<IUsageTracker>());
             ret.GetService(typeof(IVSGitServices)).Returns(vsgit);
             ret.GetService(typeof(IOperatingSystem)).Returns(os);
             ret.GetService(typeof(IRepositoryCloneService)).Returns(clone);
@@ -137,6 +141,26 @@ public static IVSServices GetVSServices(this IServiceProvider provider)
             return provider.GetService(typeof(IVSServices)) as IVSServices;
         }
 
+        public static ITeamExplorerServices GetTeamExplorerServices(this IServiceProvider provider)
+        {
+            return provider.GetService(typeof(ITeamExplorerServices)) as ITeamExplorerServices;
+        }
+
+        public static IGraphQLClientFactory GetGraphQLClientFactory(this IServiceProvider provider)
+        {
+            return provider.GetService(typeof(IGraphQLClientFactory)) as IGraphQLClientFactory;
+        }
+
+        public static IGitHubContextService GetGitHubContextService(this IServiceProvider provider)
+        {
+            return provider.GetService(typeof(IGitHubContextService)) as IGitHubContextService;
+        }
+
+        public static IUsageTracker GetUsageTracker(this IServiceProvider provider)
+        {
+            return provider.GetService(typeof(IUsageTracker)) as IUsageTracker;
+        }
+
         public static IVSGitServices GetVSGitServices(this IServiceProvider provider)
         {
             return provider.GetService(typeof(IVSGitServices)) as IVSGitServices;