Simplify namespace matching in CleanArchitectureTests

mm-hsh · mm-hsh · commit 8b45ac2004f8 · 2026-04-24T14:42:08.000+05:30
Updated namespace matching rules to use simpler wildcard patterns instead of complex regular expressions. This affects repository, service, and controller class/interface checks, improving readability and maintainability of the architecture tests.
diff --git a/source/AAS.TwinEngine.DataEngine.UnitTests/CleanArchitectureTests.cs b/source/AAS.TwinEngine.DataEngine.UnitTests/CleanArchitectureTests.cs
@@ -80,7 +80,7 @@ public void ApiShallNotHaveDependenciesToInfrastructure()
     public void RepositoryClassesShallBeInCorrectNamespace()
     {
         Classes().That().HaveNameEndingWith("Repository").Should()
-            .ResideInNamespaceMatching($"{BaseNamespace}\\.Infrastructure\\.DataAccess.*")
+            .ResideInNamespaceMatching($"{BaseNamespace}.Infrastructure.Providers*")
             .WithoutRequiringPositiveResults()
             .Check(_architecture);
     }
@@ -93,7 +93,7 @@ public void RepositoryInterfacesShallBeInCorrectNamespace()
             .And()
             .DoNotHaveFullName($"{BaseNamespace}.Infrastructure.DataAccess.GenericRepository.IMongoDbRepository")
             .Should()
-            .ResideInNamespaceMatching($"{BaseNamespace}\\.ApplicationLogic($|\\.*)")
+            .ResideInNamespaceMatching($"{BaseNamespace}.ApplicationLogic.*")
             .WithoutRequiringPositiveResults()
             .Check(_architecture);
     }
@@ -102,7 +102,7 @@ public void RepositoryInterfacesShallBeInCorrectNamespace()
     public void ServicesShallBeInCorrectNamespace()
     {
         Classes().That().HaveNameEndingWith("Service").Should()
-            .ResideInNamespaceMatching($"{BaseNamespace}\\.ApplicationLogic\\.Services($|\\.*)")
+            .ResideInNamespaceMatching($"{BaseNamespace}.ApplicationLogic.Service.*")
             .Check(_architecture);
     }
 
@@ -111,15 +111,15 @@ public void ServiceInterfacesShallBeInCorrectNamespace()
     {
         Interfaces().That().HaveNameEndingWith("Service")
             .Should()
-            .ResideInNamespaceMatching($"{BaseNamespace}\\.ApplicationLogic\\.Services($|\\.*)")
+            .ResideInNamespaceMatching($"{BaseNamespace}.ApplicationLogic.Service.*")
             .Check(_architecture);
     }
 
     [Fact]
     public void ControllerShallBeInCorrectNamespace()
     {
         Classes().That().HaveNameEndingWith("Controller").Should()
-            .ResideInNamespaceMatching($"{BaseNamespace}\\.Api($|\\.*)")
+            .ResideInNamespaceMatching($"{BaseNamespace}.Api.*")
             .Check(_architecture);
     }
 }
diff --git a/source/AAS.TwinEngine.Plugin.TestPlugin.UnitTests/CleanArchitectureTests.cs b/source/AAS.TwinEngine.Plugin.TestPlugin.UnitTests/CleanArchitectureTests.cs
@@ -80,7 +80,7 @@ public void ApiShallNotHaveDependenciesToInfrastructure()
     public void RepositoryClassesShallBeInCorrectNamespace()
     {
         Classes().That().HaveNameEndingWith("Repository").Should()
-            .ResideInNamespaceMatching($"{BaseNamespace}\\.Infrastructure\\.DataAccess.*")
+            .ResideInNamespaceMatching($"{BaseNamespace}.Infrastructure.Providers*")
             .WithoutRequiringPositiveResults()
             .Check(_architecture);
     }
@@ -93,7 +93,7 @@ public void RepositoryInterfacesShallBeInCorrectNamespace()
             .And()
             .DoNotHaveFullName($"{BaseNamespace}.Infrastructure.DataAccess.GenericRepository.IMongoDbRepository")
             .Should()
-            .ResideInNamespaceMatching($"{BaseNamespace}\\.ApplicationLogic($|\\.*)")
+            .ResideInNamespaceMatching($"{BaseNamespace}.ApplicationLogic.*")
             .WithoutRequiringPositiveResults()
             .Check(_architecture);
     }
@@ -102,7 +102,7 @@ public void RepositoryInterfacesShallBeInCorrectNamespace()
     public void ServicesShallBeInCorrectNamespace()
     {
         Classes().That().HaveNameEndingWith("Service").Should()
-            .ResideInNamespaceMatching($"{BaseNamespace}\\.ApplicationLogic\\.Services($|\\.*)")
+            .ResideInNamespaceMatching($"{BaseNamespace}.ApplicationLogic.Service.*")
             .Check(_architecture);
     }
 
@@ -111,15 +111,15 @@ public void ServiceInterfacesShallBeInCorrectNamespace()
     {
         Interfaces().That().HaveNameEndingWith("Service")
             .Should()
-            .ResideInNamespaceMatching($"{BaseNamespace}\\.ApplicationLogic\\.Services($|\\.*)")
+            .ResideInNamespaceMatching($"{BaseNamespace}.ApplicationLogic.Service.*")
             .Check(_architecture);
     }
 
     [Fact]
     public void ControllerShallBeInCorrectNamespace()
     {
         Classes().That().HaveNameEndingWith("Controller").Should()
-            .ResideInNamespaceMatching($"{BaseNamespace}\\.Api($|\\.*)")
+            .ResideInNamespaceMatching($"{BaseNamespace}.Api.*")
             .Check(_architecture);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public void ApiShallNotHaveDependenciesToInfrastructure()`
`80`	`80`	`public void RepositoryClassesShallBeInCorrectNamespace()`
`81`	`81`	`{`
`82`	`82`	`Classes().That().HaveNameEndingWith("Repository").Should()`
`83`		`- .ResideInNamespaceMatching($"{BaseNamespace}\\.Infrastructure\\.DataAccess.*")`
	`83`	`+ .ResideInNamespaceMatching($"{BaseNamespace}.Infrastructure.Providers*")`
`84`	`84`	`.WithoutRequiringPositiveResults()`
`85`	`85`	`.Check(_architecture);`
`86`	`86`	`}`
`@@ -93,7 +93,7 @@ public void RepositoryInterfacesShallBeInCorrectNamespace()`
`93`	`93`	`.And()`
`94`	`94`	`.DoNotHaveFullName($"{BaseNamespace}.Infrastructure.DataAccess.GenericRepository.IMongoDbRepository")`
`95`	`95`	`.Should()`
`96`		`- .ResideInNamespaceMatching($"{BaseNamespace}\\.ApplicationLogic($\|\\.*)")`
	`96`	`+ .ResideInNamespaceMatching($"{BaseNamespace}.ApplicationLogic.*")`
`97`	`97`	`.WithoutRequiringPositiveResults()`
`98`	`98`	`.Check(_architecture);`
`99`	`99`	`}`
`@@ -102,7 +102,7 @@ public void RepositoryInterfacesShallBeInCorrectNamespace()`
`102`	`102`	`public void ServicesShallBeInCorrectNamespace()`
`103`	`103`	`{`
`104`	`104`	`Classes().That().HaveNameEndingWith("Service").Should()`
`105`		`- .ResideInNamespaceMatching($"{BaseNamespace}\\.ApplicationLogic\\.Services($\|\\.*)")`
	`105`	`+ .ResideInNamespaceMatching($"{BaseNamespace}.ApplicationLogic.Service.*")`
`106`	`106`	`.Check(_architecture);`
`107`	`107`	`}`
`108`	`108`
`@@ -111,15 +111,15 @@ public void ServiceInterfacesShallBeInCorrectNamespace()`
`111`	`111`	`{`
`112`	`112`	`Interfaces().That().HaveNameEndingWith("Service")`
`113`	`113`	`.Should()`
`114`		`- .ResideInNamespaceMatching($"{BaseNamespace}\\.ApplicationLogic\\.Services($\|\\.*)")`
	`114`	`+ .ResideInNamespaceMatching($"{BaseNamespace}.ApplicationLogic.Service.*")`
`115`	`115`	`.Check(_architecture);`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`[Fact]`
`119`	`119`	`public void ControllerShallBeInCorrectNamespace()`
`120`	`120`	`{`
`121`	`121`	`Classes().That().HaveNameEndingWith("Controller").Should()`
`122`		`- .ResideInNamespaceMatching($"{BaseNamespace}\\.Api($\|\\.*)")`
	`122`	`+ .ResideInNamespaceMatching($"{BaseNamespace}.Api.*")`
`123`	`123`	`.Check(_architecture);`
`124`	`124`	`}`
`125`	`125`	`}`