refactor: Renamed projects for better segregation

daug32 · Jun 8, 2024 · 77cd2b4 · 77cd2b4
1 parent 648f50d
commit 77cd2b4
Show file tree

Hide file tree

Showing 22 changed files with 83 additions and 63 deletions.
diff --git a/...onfigurations/PageLoadingConfiguration.cs → ...onfigurations/PageLoadingConfiguration.cs b/...onfigurations/PageLoadingConfiguration.cs → ...onfigurations/PageLoadingConfiguration.cs
diff --git a/...gurations/WebSiteComparerConfiguration.cs → ...gurations/WebSiteComparerConfiguration.cs b/...gurations/WebSiteComparerConfiguration.cs → ...gurations/WebSiteComparerConfiguration.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace WebSiteComparer.Core.Configurations;
+namespace WebSiteComparer.Core.Configurations;
 
 public class WebSiteComparerConfiguration
 {

diff --git a/...re/Configurations/WebsiteConfiguration.cs → ...es/Configurations/WebsiteConfiguration.cs b/...re/Configurations/WebsiteConfiguration.cs → ...es/Configurations/WebsiteConfiguration.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace WebSiteComparer.Core.Configurations;
+namespace WebSiteComparer.Core.Configurations;
 
 public class WebsiteConfiguration
 {

diff --git a/....Core/ChangesTracking/IChangesDetector.cs → ....Comparing.Interfaces/IChangesDetector.cs b/....Core/ChangesTracking/IChangesDetector.cs → ....Comparing.Interfaces/IChangesDetector.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using WebSiteComparer.Core.Configurations;
+using WebSiteComparer.Core.Configurations;
 
 namespace WebSiteComparer.Core.ChangesTracking;
 

diff --git a/...Core/Screenshots/IScreenshotRepository.cs → ...aces/Screenshots/IScreenshotRepository.cs b/...Core/Screenshots/IScreenshotRepository.cs → ...aces/Screenshots/IScreenshotRepository.cs
@@ -1,5 +1,4 @@
-using System;
-using ImageProcessing.Models;
+using ImageProcessing.Models;
 
 namespace WebSiteComparer.Core.Screenshots;
 

diff --git a/...arer.Core/Screenshots/IScreenshotTaker.cs → ...nterfaces/Screenshots/IScreenshotTaker.cs b/...arer.Core/Screenshots/IScreenshotTaker.cs → ...nterfaces/Screenshots/IScreenshotTaker.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using ImageProcessing.Models;
+using ImageProcessing.Models;
 using Microsoft.Playwright;
 
 namespace WebSiteComparer.Core.Screenshots;

diff --git a/...rer.Core/Screenshots/ScreenshotOptions.cs → ...terfaces/Screenshots/ScreenshotOptions.cs b/...rer.Core/Screenshots/ScreenshotOptions.cs → ...terfaces/Screenshots/ScreenshotOptions.cs
@@ -1,5 +1,4 @@
-using System;
-using WebSiteComparer.Core.Configurations;
+using WebSiteComparer.Core.Configurations;
 
 namespace WebSiteComparer.Core.Screenshots;
 

diff --git a/UiTesting.Comparing.Interfaces/UiTesting.Comparing.Interfaces.csproj b/UiTesting.Comparing.Interfaces/UiTesting.Comparing.Interfaces.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <RootNamespace>WebSiteComparer.Interfaces</RootNamespace>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\ImageProcessing\ImageProcessing.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Microsoft.Playwright" Version="1.41.0" />
+    </ItemGroup>
+
+</Project>
diff --git a/UiTesting.Comparing/AssemblyInfo.cs b/UiTesting.Comparing/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo( "UiTesting.Comparing.Tests" )]
diff --git a/...iteComparer.Core/ConfigureDependencies.cs → UiTesting.Comparing/ConfigureDependencies.cs b/...iteComparer.Core/ConfigureDependencies.cs → UiTesting.Comparing/ConfigureDependencies.cs
@@ -1,13 +1,13 @@
 using Microsoft.Extensions.DependencyInjection;
 using ImageProcessing;
 using ImageProcessing.Implementation.Comparing;
+using UiTesting.Comparing.Implementation.ChangesDetecting;
+using UiTesting.Comparing.Implementation.Screenshots;
 using WebSiteComparer.Core.ChangesTracking;
 using WebSiteComparer.Core.Configurations;
-using WebSiteComparer.Core.Implementation.ChangesDetecting;
-using WebSiteComparer.Core.Implementation.Screenshots;
 using WebSiteComparer.Core.Screenshots;
 
-namespace WebSiteComparer.Core;
+namespace UiTesting.Comparing;
 
 public static class ConfigureDependencies
 {

diff --git a/...ation/ChangesDetecting/ChangesDetector.cs → ...ation/ChangesDetecting/ChangesDetector.cs b/...ation/ChangesDetecting/ChangesDetector.cs → ...ation/ChangesDetecting/ChangesDetector.cs
@@ -9,23 +9,23 @@
 using UiTesting.Playwright.Factories;
 using Microsoft.Extensions.Logging;
 using Microsoft.Playwright;
+using UiTesting.Comparing.Implementation.Extensions;
 using WebSiteComparer.Core.ChangesTracking;
 using WebSiteComparer.Core.Configurations;
-using WebSiteComparer.Core.Implementation.Extensions;
 using WebSiteComparer.Core.Screenshots;
 
-namespace WebSiteComparer.Core.Implementation.ChangesDetecting;
+namespace UiTesting.Comparing.Implementation.ChangesDetecting;
 
 internal class ChangesDetector : IChangesDetector
 {
     private readonly IScreenshotTaker _screenshotTaker;
     private readonly IScreenshotRepository _screenshotRepository;
     private readonly IImageComparer _imageComparer;
     private readonly ILogger _logger;
-    
+
     private readonly string _comparingOutputDirectory;
 
-    public ChangesDetector( 
+    public ChangesDetector(
         IImageComparer imageComparer,
         ILogger<ChangesDetector> logger,
         IScreenshotTaker screenshotTaker,
@@ -44,7 +44,7 @@ public Task FindChangesAsync( IEnumerable<WebsiteConfiguration> configurations )
         var screenshotOptions = configurations
             .SelectMany( configuration => configuration.Urls
                 .Select( url => new ScreenshotOptions(
-                    new Uri( url ), 
+                    new Uri( url ),
                     configuration.ScreenshotWidth,
                     configuration.PageLoadingConfiguration ) ) )
             .ToList();
@@ -55,7 +55,7 @@ public Task FindChangesAsync( IEnumerable<WebsiteConfiguration> configurations )
     public Task FindChangesAsync( WebsiteConfiguration configuration )
     {
         var screenshotOptions = configuration.Urls
-            .Select( url => new ScreenshotOptions( 
+            .Select( url => new ScreenshotOptions(
                 new Uri( url ),
                 configuration.ScreenshotWidth,
                 configuration.PageLoadingConfiguration ) )
@@ -72,25 +72,24 @@ private async Task FindChangesInternalAsync( List<ScreenshotOptions> screenshotO
             directoryInfo.ClearDirectory();
         }
 
-        await using ( var browserFactory = new BrowserFactory() )
-        {
-            IBrowser browser = await browserFactory.GetBrowserAsync();
-
-            await Parallel.ForEachAsync(
-                screenshotOptions,
-                async ( screenshotOption, _ ) =>
-                {
-                    IPage page = await browser.NewPageAsync( 
-                        screenshotOption
-                            .PageLoadingConfiguration
-                            .ToPlaywrightPageOptions() );
-                    CashedBitmap screenshot = await _screenshotTaker.TakeScreenshotAsync( page, screenshotOption );
-
-                    await Task.WhenAll(
-                        CompareToOldVersionAsync( screenshotOption.Uri, screenshot ),
-                        page.CloseAsync() );
-                } );
-        }
+        await using var browserFactory = new BrowserFactory();
+        IBrowser browser = await browserFactory.GetBrowserAsync();
+
+        await Parallel.ForEachAsync(
+            screenshotOptions,
+            async ( screenshotOption, _ ) =>
+            {
+                IPage page = await browser.NewPageAsync(
+                    screenshotOption
+                        .PageLoadingConfiguration
+                        .ToPlaywrightPageOptions() );
+
+                CashedBitmap screenshot = await _screenshotTaker.TakeScreenshotAsync( page, screenshotOption );
+
+                await Task.WhenAll(
+                    CompareToOldVersionAsync( screenshotOption.Uri, screenshot ),
+                    page.CloseAsync() );
+            } );
     }
 
     private async Task CompareToOldVersionAsync( Uri uri, CashedBitmap newState )

diff --git a/...ion/Extensions/DirectoryInfoExtensions.cs → ...ion/Extensions/DirectoryInfoExtensions.cs b/...ion/Extensions/DirectoryInfoExtensions.cs → ...ion/Extensions/DirectoryInfoExtensions.cs
@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace WebSiteComparer.Core.Implementation.Extensions;
+namespace UiTesting.Comparing.Implementation.Extensions;
 
 internal static class DirectoryInfoExtensions
 {

diff --git a/...ons/PageLoadingConfigurationExtensions.cs → ...ons/PageLoadingConfigurationExtensions.cs b/...ons/PageLoadingConfigurationExtensions.cs → ...ons/PageLoadingConfigurationExtensions.cs
@@ -1,7 +1,7 @@
 using Microsoft.Playwright;
 using WebSiteComparer.Core.Configurations;
 
-namespace WebSiteComparer.Core.Implementation.Extensions;
+namespace UiTesting.Comparing.Implementation.Extensions;
 
 internal static class PageLoadingConfigurationExtensions
 {

diff --git a/...mplementation/Extensions/UriExtensions.cs → ...mplementation/Extensions/UriExtensions.cs b/...mplementation/Extensions/UriExtensions.cs → ...mplementation/Extensions/UriExtensions.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Text;
 
-namespace WebSiteComparer.Core.Implementation.Extensions;
+namespace UiTesting.Comparing.Implementation.Extensions;
 
 internal static class UriExtensions
 {

diff --git a/...ementation/Screenshots/ScreenshotTaker.cs → ...ementation/Screenshots/ScreenshotTaker.cs b/...ementation/Screenshots/ScreenshotTaker.cs → ...ementation/Screenshots/ScreenshotTaker.cs
@@ -11,7 +11,7 @@
 using Microsoft.Playwright;
 using WebSiteComparer.Core.Screenshots;
 
-namespace WebSiteComparer.Core.Implementation.Screenshots;
+namespace UiTesting.Comparing.Implementation.Screenshots;
 
 internal class ScreenshotTaker : IScreenshotTaker
 {

diff --git a/...tion/Screenshots/ScreenshotsRepository.cs → ...tion/Screenshots/ScreenshotsRepository.cs b/...tion/Screenshots/ScreenshotsRepository.cs → ...tion/Screenshots/ScreenshotsRepository.cs
@@ -1,11 +1,11 @@
 using System;
 using System.IO;
 using ImageProcessing.Models;
+using UiTesting.Comparing.Implementation.Extensions;
 using WebSiteComparer.Core.Configurations;
-using WebSiteComparer.Core.Implementation.Extensions;
 using WebSiteComparer.Core.Screenshots;
 
-namespace WebSiteComparer.Core.Implementation.Screenshots;
+namespace UiTesting.Comparing.Implementation.Screenshots;
 
 internal class ScreenshotsRepository : IScreenshotRepository
 {

diff --git a/...Comparer.Core/WebSiteComparer.Core.csproj → ...ting.Comparing/UiTesting.Comparing.csproj b/...Comparer.Core/WebSiteComparer.Core.csproj → ...ting.Comparing/UiTesting.Comparing.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <ImplicitUsings>disable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
@@ -17,6 +17,7 @@
       <ProjectReference Include="..\ImageProcessing.Extensions\ImageProcessing.Extensions.csproj" />
       <ProjectReference Include="..\ImageProcessing\ImageProcessing.csproj" />
       <ProjectReference Include="..\UiTesting.Playwright\UiTesting.Playwright.csproj" />
+      <ProjectReference Include="..\UiTesting.Comparing.Interfaces\UiTesting.Comparing.Interfaces.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/WebSiteComparer.Console/ConfigureDependencies.cs b/WebSiteComparer.Console/ConfigureDependencies.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using WebSiteComparer.Console.Commands;
-using WebSiteComparer.Core;
+using UiTesting.Comparing;
 using WebSiteComparer.Core.Configurations;
 using WebSiteComparer.UseCases;
 

diff --git a/WebSiteComparer.Console/WebSiteComparer.Console.csproj b/WebSiteComparer.Console/WebSiteComparer.Console.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
@@ -13,7 +13,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\WebSiteComparer.Core\WebSiteComparer.Core.csproj" />
+      <ProjectReference Include="..\UiTesting.Comparing\UiTesting.Comparing.csproj" />
       <ProjectReference Include="..\WebSiteComparer.UseCases\WebSiteComparer.UseCases.csproj" />
     </ItemGroup>
 

diff --git a/WebSiteComparer.Core/AssemblyInfo.cs b/WebSiteComparer.Core/AssemblyInfo.cs
diff --git a/WebSiteComparer.UseCases/WebSiteComparer.UseCases.csproj b/WebSiteComparer.UseCases/WebSiteComparer.UseCases.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
       <ProjectReference Include="..\ImageProcessing.Extensions\ImageProcessing.Extensions.csproj" />
       <ProjectReference Include="..\ImageProcessing\ImageProcessing.csproj" />
-      <ProjectReference Include="..\WebSiteComparer.Core\WebSiteComparer.Core.csproj" />
+      <ProjectReference Include="..\UiTesting.Comparing\UiTesting.Comparing.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/WebSiteComparer.sln b/WebSiteComparer.sln
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebSiteComparer.Core", "WebSiteComparer.Core\WebSiteComparer.Core.csproj", "{97236950-46B3-4196-B1E6-CDE9CCC3D7A9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UiTesting.Comparing", "UiTesting.Comparing\UiTesting.Comparing.csproj", "{97236950-46B3-4196-B1E6-CDE9CCC3D7A9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Public", "Public", "{D9ECE104-9F8D-448E-B057-4C22279B056C}"
 	ProjectSection(SolutionItems) = preProject
@@ -31,6 +31,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{F2B23B85-C5D9-
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebSiteComparer.Console", "WebSiteComparer.Console\WebSiteComparer.Console.csproj", "{04E8E77B-D3C2-4C1A-BDFB-49C6870E01B9}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UiTesting.Comparing.Interfaces", "UiTesting.Comparing.Interfaces\UiTesting.Comparing.Interfaces.csproj", "{98F96635-026D-43BB-825B-C8A151D061B1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Infrastructure", "Infrastructure", "{577AF1AD-BFF0-460D-9F66-AAE5F8EEE0B9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Application", "Application", "{F7483EBC-66FA-4BBA-B142-6F2EFA9AE1D8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -65,12 +71,21 @@ Global
 		{04E8E77B-D3C2-4C1A-BDFB-49C6870E01B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{04E8E77B-D3C2-4C1A-BDFB-49C6870E01B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{04E8E77B-D3C2-4C1A-BDFB-49C6870E01B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{98F96635-026D-43BB-825B-C8A151D061B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{98F96635-026D-43BB-825B-C8A151D061B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{98F96635-026D-43BB-825B-C8A151D061B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{98F96635-026D-43BB-825B-C8A151D061B1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{FB48C990-7318-412F-A4B3-9FAADC4A77E0} = {D9ECE104-9F8D-448E-B057-4C22279B056C}
 		{5CE0B3B7-7D3D-409E-BED3-8F5CAEAB0CBD} = {3E71BFB6-07F3-4E09-B265-9495EA6D50F8}
 		{30ACFF24-A636-4EAC-99ED-3C6AD5CBD214} = {3E71BFB6-07F3-4E09-B265-9495EA6D50F8}
 		{406A06C2-656B-46CE-9CBA-0FB39E791AE1} = {B909EDB8-23E6-4C63-966E-82C92BAC4DC4}
 		{04E8E77B-D3C2-4C1A-BDFB-49C6870E01B9} = {F2B23B85-C5D9-42BA-B104-0EBCDA9618B8}
+		{3E71BFB6-07F3-4E09-B265-9495EA6D50F8} = {577AF1AD-BFF0-460D-9F66-AAE5F8EEE0B9}
+		{97236950-46B3-4196-B1E6-CDE9CCC3D7A9} = {577AF1AD-BFF0-460D-9F66-AAE5F8EEE0B9}
+		{98F96635-026D-43BB-825B-C8A151D061B1} = {577AF1AD-BFF0-460D-9F66-AAE5F8EEE0B9}
+		{F7D8F3A5-7D76-4CBD-B2A1-B8F99CFF856D} = {577AF1AD-BFF0-460D-9F66-AAE5F8EEE0B9}
+		{326C8927-663B-402D-A149-5FF0620C6B42} = {F7483EBC-66FA-4BBA-B142-6F2EFA9AE1D8}
 	EndGlobalSection
 EndGlobal
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		using System.Runtime.CompilerServices;

		[assembly: InternalsVisibleTo( "UiTesting.Comparing.Tests" )]