From bb6087e0f765d25e917e9110d81bc5e0a35ca5f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Fuch=C3=9F?= Date: Fri, 8 Mar 2024 09:33:14 +0100 Subject: [PATCH] Squashed 'tests/integration-tests/' changes from e95fd39..a54c39f a54c39f Fix Architecture Layers git-subtree-dir: tests/integration-tests git-subtree-split: a54c39f71b5b2f85aa519847fdcf6cd36aab9265 --- .../core/tests/architecture/ArchitectureTest.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests-base/src/main/java/edu/kit/kastel/mcse/ardoco/core/tests/architecture/ArchitectureTest.java b/tests-base/src/main/java/edu/kit/kastel/mcse/ardoco/core/tests/architecture/ArchitectureTest.java index d9f02bf..e5680c6 100644 --- a/tests-base/src/main/java/edu/kit/kastel/mcse/ardoco/core/tests/architecture/ArchitectureTest.java +++ b/tests-base/src/main/java/edu/kit/kastel/mcse/ardoco/core/tests/architecture/ArchitectureTest.java @@ -42,15 +42,16 @@ public class ArchitectureTest { .haveSimpleName("Model") .should() .onlyHaveDependentClassesThat() - .resideInAnyPackage("..models..", "..connectiongenerator..", "..inconsistency..", "..pipeline..", "..common..", "..output..", "..tests.."); + .resideInAnyPackage("..models..", "..connectiongenerator..", "..inconsistency..", "..id..", "..pipeline..", "..common..", "..output..", + "..tests.."); @ArchTest public static final ArchRule linksOnlyAfterConnectionGenerator = classes().that() .haveSimpleNameEndingWith("Link") .should() .onlyHaveDependentClassesThat() - .resideInAnyPackage("..connectiongenerator..", "..codetraceability..", "..tracelinks..", "..inconsistency..", "..pipeline..", "..common..", - "..api..", "..tests.."); + .resideInAnyPackage("..connectiongenerator..", "..codetraceability..", "..tracelinks..", "..inconsistency..", "..id..", "..pipeline..", + "..common..", "..api..", "..tests.."); @ArchTest public static final ArchRule usingLinkAsNamingOnlyInConnectionGenerator = classes().that() @@ -63,7 +64,7 @@ public class ArchitectureTest { .haveSimpleNameContaining("Inconsistency") .should() .onlyHaveDependentClassesThat() - .resideInAnyPackage("..inconsistency..", "..execution..", "..api..", "..common..", "..tests.."); + .resideInAnyPackage("..inconsistency..", "..id..", "..execution..", "..api..", "..common..", "..tests.."); @ArchTest public static final ArchRule layerRule = layeredArchitecture().consideringAllDependencies() @@ -79,7 +80,7 @@ public class ArchitectureTest { .layer("ConnectionGenerator") .definedBy("..connectiongenerator..") .layer("InconsistencyDetection") - .definedBy("..inconsistency..") + .definedBy("..inconsistency..", "..id..") .layer("CodeTraceability") .definedBy("..codetraceability..") .layer("Pipeline")