Refactoring

godrose · godrose · commit bb71dbda475b · 2018-12-24T08:36:43.000+02:00
diff --git a/Samples.Specifications.Client.Tests.Integration/Module.cs b/Samples.Specifications.Client.Tests.Integration/Module.cs
@@ -1,8 +1,7 @@
 ﻿using System.Reflection;
-using Attest.Testing.Contracts;
-using Attest.Testing.Integration;
 using JetBrains.Annotations;
 using Samples.Specifications.Tests.Contracts;
+using Samples.Specifications.Tests.Infra;
 using Solid.Practices.IoC;
 using Solid.Practices.Modularity;
 
@@ -15,10 +14,9 @@ public void RegisterModule(IDependencyRegistrator dependencyRegistrator)
         {
             dependencyRegistrator
                 .RegisterAutomagically(
-                Assembly.LoadFrom(AssemblyInfo.AssemblyName),
-                Assembly.GetExecutingAssembly())
-                .AddSingleton<IStartLocalApplicationService, StartLocalApplicationService>()                
-                .AddSingleton<ITeardownService, TeardownService>();
+                    Assembly.LoadFrom(AssemblyInfo.AssemblyName),
+                    Assembly.GetExecutingAssembly())
+                .UseLocalApplicationForIntegration();
         }
-    }
+    }    
 }
diff --git a/Samples.Specifications.Client.Tests.Integration/Samples.Specifications.Client.Tests.Integration.csproj b/Samples.Specifications.Client.Tests.Integration/Samples.Specifications.Client.Tests.Integration.csproj
@@ -110,6 +110,10 @@
       <Project>{1677d87b-7e7b-436e-8e71-e98a242b89b4}</Project>
       <Name>Samples.Specifications.Tests.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Samples.Specifications.Tests.Infra\Samples.Specifications.Tests.Infra.csproj">
+      <Project>{1e03f181-2690-4ea6-8b99-975d6da4e759}</Project>
+      <Name>Samples.Specifications.Tests.Infra</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config">
diff --git a/Samples.Specifications.Tests.EndToEnd/Module.cs b/Samples.Specifications.Tests.EndToEnd/Module.cs
@@ -1,6 +1,6 @@
 ﻿using Attest.Testing.Contracts;
-using Attest.Testing.EndToEnd;
 using JetBrains.Annotations;
+using Samples.Specifications.Tests.Infra;
 using Solid.Practices.IoC;
 using Solid.Practices.Modularity;
 
@@ -10,7 +10,7 @@ namespace Samples.Specifications.Tests.EndToEnd
     internal sealed class Module : ICompositionModule<IDependencyRegistrator>
     {
         public void RegisterModule(IDependencyRegistrator dependencyRegistrator) => dependencyRegistrator
-            .AddSingleton<IApplicationPathInfo, ApplicationPathInfo>()            
-            .AddSingleton<IStartLocalApplicationService, StartLocalApplicationService>();
+            .AddSingleton<IApplicationPathInfo, ApplicationPathInfo>()
+            .UseLocalApplicationForEndToEnd();
     }
 }
diff --git a/Samples.Specifications.Tests.EndToEnd/Samples.Specifications.Tests.EndToEnd.csproj b/Samples.Specifications.Tests.EndToEnd/Samples.Specifications.Tests.EndToEnd.csproj
@@ -32,4 +32,8 @@
     <PackageReference Include="Solid.Practices.Modularity" Version="2.0.0-rc1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Samples.Specifications.Tests.Infra\Samples.Specifications.Tests.Infra.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/Samples.Specifications.Tests.Infra.Launcher/Startup.cs b/Samples.Specifications.Tests.Infra.Launcher/Startup.cs
@@ -21,7 +21,7 @@ public void Initialize()
                 .Use(new RegisterResolverMiddleware<Bootstrapper>(_iocContainer))
                 .Use(new RegisterCollectionMiddleware<Bootstrapper, IDynamicApplicationModule>())
                 .Use(new RegisterCollectionMiddleware<Bootstrapper, IStaticApplicationModule>())
-                .Use(new RegisterCollectionMiddleware<Bootstrapper, ITeardownService>());
+                .Use(new RegisterCollectionMiddleware<Bootstrapper, ITeardownService>());           
             bootstrapper.Use(new UseApplicationModulesMiddleware());
             bootstrapper.Initialize();
         }
diff --git a/Samples.Specifications.Tests.Infra.Launcher/UseApplicationModulesMiddleware.cs b/Samples.Specifications.Tests.Infra.Launcher/UseApplicationModulesMiddleware.cs
@@ -18,5 +18,5 @@ public IHaveRegistrator Apply(IHaveRegistrator @object)
                 .AddSingleton<IStaticSetupService, StaticSetupService>();
             return @object;
         }
-    }
+    }    
 }
diff --git a/Samples.Specifications.Tests.Infra/DelegateExtensions.cs b/Samples.Specifications.Tests.Infra/DelegateExtensions.cs
@@ -4,6 +4,7 @@
 
 namespace Samples.Specifications.Tests.Infra
 {
+    //TODO: Move to packages
     public static class DelegateExtensions
     {
         public static void Execute(this Action action) =>
diff --git a/Samples.Specifications.Tests.Infra/RegistratorExtensions.cs b/Samples.Specifications.Tests.Infra/RegistratorExtensions.cs
@@ -0,0 +1,21 @@
+﻿using Attest.Testing.Contracts;
+using Solid.Practices.IoC;
+
+namespace Samples.Specifications.Tests.Infra
+{
+    //TODO: Move to packages
+    public static class RegistratorExtensions
+    {
+        public static IDependencyRegistrator UseLocalApplicationForIntegration(this IDependencyRegistrator dependencyRegistrator)
+        {
+            dependencyRegistrator.RegisterSingleton<IStartLocalApplicationService, Attest.Testing.Integration.StartLocalApplicationService>();
+            return dependencyRegistrator;
+        }
+
+        public static IDependencyRegistrator UseLocalApplicationForEndToEnd(this IDependencyRegistrator dependencyRegistrator)
+        {
+            dependencyRegistrator.RegisterSingleton<IStartLocalApplicationService, Attest.Testing.EndToEnd.StartLocalApplicationService>();
+            return dependencyRegistrator;
+        }
+    }
+}
diff --git a/Samples.Specifications.Tests.Infra/Samples.Specifications.Tests.Infra.csproj b/Samples.Specifications.Tests.Infra/Samples.Specifications.Tests.Infra.csproj
@@ -35,6 +35,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Attest.Tests.Core" Version="2.0.0-rc2" />
     <PackageReference Include="JetBrains.Annotations" Version="2018.2.1" />
     <PackageReference Include="Solid.Practices.Modularity" Version="2.0.0-rc1" />
     <PackageReference Include="System.Management" Version="4.5.0" />
diff --git a/Samples.Specifications.Tests.Infra/WindowsProcessManagementService.cs b/Samples.Specifications.Tests.Infra/WindowsProcessManagementService.cs
@@ -6,6 +6,7 @@
 
 namespace Samples.Specifications.Tests.Infra
 {
+    //TODO: Move to packages
     [UsedImplicitly]
     internal sealed class WindowsProcessManagementService : IProcessManagementService
     {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Attest.Testing.Contracts;`
`2`		`-using Attest.Testing.EndToEnd;`
`3`	`2`	`using JetBrains.Annotations;`
	`3`	`+using Samples.Specifications.Tests.Infra;`
`4`	`4`	`using Solid.Practices.IoC;`
`5`	`5`	`using Solid.Practices.Modularity;`
`6`	`6`
`@@ -10,7 +10,7 @@ namespace Samples.Specifications.Tests.EndToEnd`
`10`	`10`	`internal sealed class Module : ICompositionModule<IDependencyRegistrator>`
`11`	`11`	`{`
`12`	`12`	`public void RegisterModule(IDependencyRegistrator dependencyRegistrator) => dependencyRegistrator`
`13`		`- .AddSingleton<IApplicationPathInfo, ApplicationPathInfo>()`
`14`		`- .AddSingleton<IStartLocalApplicationService, StartLocalApplicationService>();`
	`13`	`+ .AddSingleton<IApplicationPathInfo, ApplicationPathInfo>()`
	`14`	`+ .UseLocalApplicationForEndToEnd();`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public void Initialize()`
`21`	`21`	`.Use(new RegisterResolverMiddleware<Bootstrapper>(_iocContainer))`
`22`	`22`	`.Use(new RegisterCollectionMiddleware<Bootstrapper, IDynamicApplicationModule>())`
`23`	`23`	`.Use(new RegisterCollectionMiddleware<Bootstrapper, IStaticApplicationModule>())`
`24`		`- .Use(new RegisterCollectionMiddleware<Bootstrapper, ITeardownService>());`
	`24`	`+ .Use(new RegisterCollectionMiddleware<Bootstrapper, ITeardownService>());`
`25`	`25`	`bootstrapper.Use(new UseApplicationModulesMiddleware());`
`26`	`26`	`bootstrapper.Initialize();`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@ public IHaveRegistrator Apply(IHaveRegistrator @object)`
`18`	`18`	`.AddSingleton<IStaticSetupService, StaticSetupService>();`
`19`	`19`	`return @object;`
`20`	`20`	`}`
`21`		`- }`
	`21`	`+ }`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Samples.Specifications.Tests.Infra`
`6`	`6`	`{`
	`7`	`+ //TODO: Move to packages`
`7`	`8`	`public static class DelegateExtensions`
`8`	`9`	`{`
`9`	`10`	`public static void Execute(this Action action) =>`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace Samples.Specifications.Tests.Infra`
`8`	`8`	`{`
	`9`	`+ //TODO: Move to packages`
`9`	`10`	`[UsedImplicitly]`
`10`	`11`	`internal sealed class WindowsProcessManagementService : IProcessManagementService`
`11`	`12`	`{`