Failure message reworded s/covered/contained in architecture/

Signed-off-by: Rob Oxspring <[email protected]>
TNG · Jan 10, 2020 · 3525437 · 3525437
1 parent eb8a9fd
commit 3525437
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/archunit/src/main/java/com/tngtech/archunit/library/Architectures.java b/archunit/src/main/java/com/tngtech/archunit/library/Architectures.java
@@ -264,7 +264,7 @@ private AllClassesAreContainedInLayersSpec(DescribedPredicate<JavaClass> ignorin
 
             public EvaluationResult evaluate(final JavaClasses classes, final LayerDefinitions layerDefinitions) {
                 return classes()
-                        .should(new ArchCondition<JavaClass>("All classes are covered") {
+                        .should(new ArchCondition<JavaClass>("All classes are contained in architecture") {
                             @Override
                             public void check(JavaClass item, ConditionEvents events) {
                                 if (ignoring.isPresent() && ignoring.get().apply(item)) {
@@ -275,7 +275,7 @@ public void check(JavaClass item, ConditionEvents events) {
                                         return;
                                     }
                                 }
-                                events.add(violated(this, String.format("Class <%s> is not covered", item.getName())));
+                                events.add(violated(this, String.format("Class <%s> is not contained in architecture", item.getName())));
                             }
                         })
                         .evaluate(classes);

diff --git a/archunit/src/test/java/com/tngtech/archunit/library/ArchitecturesTest.java b/archunit/src/test/java/com/tngtech/archunit/library/ArchitecturesTest.java
@@ -262,7 +262,7 @@ public void layered_architecture_combines_multiple_ignores() {
     }
 
     @Test
-    public void layered_architecture_ensure_all_classes_are_contained_in_layers_are_covered_fully() {
+    public void layered_architecture_ensure_all_classes_are_contained_in_architecture_fully() {
         JavaClasses classes = new ClassFileImporter().importClasses(
                 FirstAnyPkgClass.class,
                 SecondThreeAnyClass.class);
@@ -316,7 +316,7 @@ public void layered_architecture_ensure_all_classes_are_contained_in_layers() {
 
         final EvaluationResult result = architecture.evaluate(classes);
         assertThat(result.getFailureReport().getDetails())
-                .contains("Class <" + SecondThreeAnyClass.class.getName() + "> is not covered");
+                .contains("Class <" + SecondThreeAnyClass.class.getName() + "> is not contained in architecture");
         assertThat(result.hasViolation()).as("result has violation")
                 .isTrue();
     }
@@ -440,9 +440,9 @@ public void onion_architecture_rejects_empty_layers_if_layers_are_explicitly_not
 
     private OnionArchitecture anOnionArchitectureWithEmptyLayers() {
         return onionArchitecture()
-                    .domainModels(absolute("onionarchitecture.domain.model.does.not.exist"))
-                    .domainServices(absolute("onionarchitecture.domain.service.not.there"))
-                    .applicationServices(absolute("onionarchitecture.application.http410"));
+                .domainModels(absolute("onionarchitecture.domain.model.does.not.exist"))
+                .domainServices(absolute("onionarchitecture.domain.service.not.there"))
+                .applicationServices(absolute("onionarchitecture.application.http410"));
     }
 
     private void assertFailureOnionArchitectureWithEmptyLayers(EvaluationResult result) {
@@ -453,7 +453,8 @@ private void assertFailureOnionArchitectureWithEmptyLayers(EvaluationResult resu
         ));
     }
 
-    public void onion_architecture_ensure_all_classes_are_contained_in_architecture_are_covered_fully() {
+    @Test
+    public void onion_architecture_ensure_all_classes_are_contained_in_architecture_are_contained_in_architecture_fully() {
         OnionArchitecture architecture = onionArchitecture()
                 .domainModels(absolute("onionarchitecture.domain.model"))
                 .domainServices(absolute("onionarchitecture.domain.service"))
@@ -465,7 +466,7 @@ public void onion_architecture_ensure_all_classes_are_contained_in_architecture_
         JavaClasses classes = new ClassFileImporter().importPackages(getClass().getPackage().getName() + ".testclasses.onionarchitecture");
 
         assertThat(architecture.evaluate(classes).getFailureReport().getDetails())
-                .doesNotContain("Class <" + RestAdapterLayerClass.class.getName() + "> is not covered");
+                .doesNotContain("Class <" + RestAdapterLayerClass.class.getName() + "> is not contained in architecture");
     }
 
     @Test
@@ -480,7 +481,7 @@ public void onion_architecture_ensure_all_classes_are_contained_in_architecture_
         JavaClasses classes = new ClassFileImporter().importPackages(getClass().getPackage().getName() + ".testclasses.onionarchitecture");
 
         assertThat(architecture.evaluate(classes).getFailureReport().getDetails())
-                .doesNotContain("Class <" + RestAdapterLayerClass.class.getName() + "> is not covered");
+                .doesNotContain("Class <" + RestAdapterLayerClass.class.getName() + "> is not contained in architecture");
     }
 
     @Test
@@ -499,7 +500,7 @@ public void onion_architecture_ensure_all_classes_are_contained_in_architecture_
             System.out.println(detail);
         }
         assertThat(result.getFailureReport().getDetails())
-                .contains("Class <" + RestAdapterLayerClass.class.getName() + "> is not covered");
+                .contains("Class <" + RestAdapterLayerClass.class.getName() + "> is not contained in architecture");
         assertThat(result.hasViolation()).as("result has violation")
                 .isTrue();
     }