Merge pull request #115 from brandhuf/refractor_circular_dependencies

refractor circular dependencies between Domain, Fluent and Loader

Author: fgather

ArchUnitNET/Fluent/IHasDescription.cs ArchUnitNET/Domain/IHasDescription.cs

@@ -4,7 +4,7 @@
 // 
 // 	SPDX-License-Identifier: Apache-2.0
 
-namespace ArchUnitNET.Fluent
+namespace ArchUnitNET.Domain
 {
     public interface IHasDescription
     {

ArchUnitNET/Fluent/IObjectProvider.cs ArchUnitNET/Domain/IObjectProvider.cs

@@ -5,9 +5,8 @@
 // 	SPDX-License-Identifier: Apache-2.0
 
 using System.Collections.Generic;
-using ArchUnitNET.Domain;
 
-namespace ArchUnitNET.Fluent
+namespace ArchUnitNET.Domain
 {
     public interface IObjectProvider<out T> : IHasDescription where T : ICanBeAnalyzed
     {

ArchUnitNET/Loader/MethodMemberInstance.cs ArchUnitNET/Domain/MethodMemberInstance.cs

@@ -7,9 +7,8 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using ArchUnitNET.Domain;
 
-namespace ArchUnitNET.Loader
+namespace ArchUnitNET.Domain
 {
     public class MethodMemberInstance : ITypeInstance<IType>
     {

ArchUnitNET/Fluent/Extensions/SyntaxElementExtensions.cs

@@ -4,6 +4,8 @@
 // 
 // 	SPDX-License-Identifier: Apache-2.0
 
+using ArchUnitNET.Domain;
+
 namespace ArchUnitNET.Fluent.Extensions
 {
     public static class SyntaxElementExtensions

ArchUnitNET/Fluent/LogicalConjunction.cs

@@ -6,6 +6,7 @@
 
 using System;
 using System.Collections.Generic;
+using ArchUnitNET.Domain;
 
 namespace ArchUnitNET.Fluent
 {

ArchUnitNET/Fluent/Slices/SliceIdentifier.cs

@@ -5,6 +5,7 @@
 // 	SPDX-License-Identifier: Apache-2.0
 // 
 
+using ArchUnitNET.Domain;
 using ArchUnitNET.Fluent.Freeze;
 
 namespace ArchUnitNET.Fluent.Slices

ArchUnitNETTests/ArchitectureTests/ArchUnitArchitectureTests.cs

@@ -7,6 +7,7 @@
 
 using ArchUnitNET.Domain;
 using ArchUnitNET.Fluent;
+using ArchUnitNET.Fluent.Slices;
 using ArchUnitNET.Loader;
 using ArchUnitNET.xUnit;
 using Xunit;
@@ -23,11 +24,19 @@ public class ArchUnitArchitectureTests
         private readonly Architecture _architecture =
             new ArchLoader().LoadAssembly(typeof(Architecture).Assembly).Build();
 
-        [Fact(Skip = "Need more refactoring")]
-        public void DomainHasNoDependencyOnFluentAndLoader()
+        [Fact]
+        public void DomainHasNoDependencyOnFluent()
         {
             Types().That().ResideInNamespace(DomainNamespace)
-                .Should().NotDependOnAny(new[] {LoaderNamespace, FluentNamespace})
+                .Should().NotDependOnAny(FluentNamespace)
+                .Check(_architecture);
+        }
+
+        [Fact]
+        public void DomainHasNoDependencyOnLoader()
+        {
+            Types().That().ResideInNamespace(DomainNamespace)
+                .Should().NotDependOnAny(LoaderNamespace)
                 .Check(_architecture);
         }
 
@@ -46,5 +55,11 @@ public void FluentHasNoDependencyOnLoader()
                 .Should().NotDependOnAny(LoaderNamespace)
                 .Check(_architecture);
         }
+
+        [Fact]
+        public void NoCircularDependencies()
+        {
+            SliceRuleDefinition.Slices().Matching("ArchUnitNET.(*)").Should().BeFreeOfCycles().Check(_architecture);
+        }
     }
 }