Move architecture tests to a dedicated package

Author: uhafner

.github/workflows/quality-monitor-pit.yml

@@ -56,8 +56,14 @@ jobs:
                 "tools": [
                   {
                     "id": "junit",
-                    "name": "JUnit Tests",
-                    "pattern": "**/target/*-reports/TEST*.xml"
+                    "name": "Unit Tests",
+                    "pattern": "**/target/*-reports/TEST*util*.xml"
+                  },
+                  {
+                    "id": "junit",
+                    "icon": "no_entry",
+                    "name": "Architecture tests",
+                    "pattern": "**/target/surefire-reports/TEST*archunit*.xml"
                   }
                 ]
               },

src/test/java/edu/hm/hafner/util/ArchitectureRules.java renamed to src/test/java/edu/hm/hafner/archunit/ArchitectureRules.java

@@ -1,7 +1,4 @@
-package edu.hm.hafner.util;
-
-import java.io.Serializable;
-import java.util.List;
+package edu.hm.hafner.archunit;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -19,6 +16,11 @@
 import com.tngtech.archunit.lang.ConditionEvents;
 import com.tngtech.archunit.lang.SimpleConditionEvent;
 
+import edu.hm.hafner.util.VisibleForTesting;
+
+import java.io.Serializable;
+import java.util.List;
+
 import static com.tngtech.archunit.core.domain.JavaAccess.Predicates.*;
 import static com.tngtech.archunit.lang.conditions.ArchConditions.*;
 import static com.tngtech.archunit.lang.conditions.ArchPredicates.*;

src/test/java/edu/hm/hafner/util/ArchitectureRulesTest.java renamed to src/test/java/edu/hm/hafner/archunit/ArchitectureRulesTest.java

@@ -1,11 +1,12 @@
-package edu.hm.hafner.util;
+package edu.hm.hafner.archunit;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.tngtech.archunit.core.domain.JavaClasses;
 import com.tngtech.archunit.core.importer.ClassFileImporter;
 
+import edu.hm.hafner.util.Generated;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 import java.io.Serializable;
@@ -25,9 +26,9 @@ void shouldUseProtectedForReadResolve() {
         assertThatExceptionOfType(AssertionError.class).isThrownBy(
                         () -> ArchitectureRules.READ_RESOLVE_SHOULD_BE_PROTECTED.check(importBrokenClass()))
                 .withMessageContainingAll(BROKEN_CLASS_NAME, "was violated (3 times)",
-                        "Method <edu.hm.hafner.util.ArchitectureRulesTest$ArchitectureRulesAlsoViolatedTest.readResolve()> is not protected but the class might be extended in (ArchitectureRulesTest.java:",
-                        "Method <edu.hm.hafner.util.ArchitectureRulesTest$ArchitectureRulesViolatedTest.readResolve()> is not declared in classes that implement java.io.Serializable in (ArchitectureRulesTest.java:",
-                        "Method <edu.hm.hafner.util.ArchitectureRulesTest$ArchitectureRulesViolatedTest.readResolve()> is not protected but the class might be extended in (ArchitectureRulesTest.java:");
+                        "Method <edu.hm.hafner.archunit.ArchitectureRulesTest$ArchitectureRulesAlsoViolatedTest.readResolve()> is not protected but the class might be extended in (ArchitectureRulesTest.java:",
+                        "Method <edu.hm.hafner.archunit.ArchitectureRulesTest$ArchitectureRulesViolatedTest.readResolve()> is not declared in classes that implement java.io.Serializable in (ArchitectureRulesTest.java:",
+                        "Method <edu.hm.hafner.archunit.ArchitectureRulesTest$ArchitectureRulesViolatedTest.readResolve()> is not protected but the class might be extended in (ArchitectureRulesTest.java:");
 
         assertThatNoException().isThrownBy(
                 () -> ArchitectureRules.READ_RESOLVE_SHOULD_BE_PROTECTED.check(importPassingClass()));
@@ -39,9 +40,9 @@ void shouldNotUseJsr305Annotations() {
                         () -> ArchitectureRules.NO_FORBIDDEN_ANNOTATION_USED.check(
                                 importClasses(ArchitectureRulesViolatedTest.class)))
                 .withMessageContainingAll("was violated (3 times)", "edu.umd.cs.findbugs.annotations",
-                        "Field <edu.hm.hafner.util.ArchitectureRulesTest$ArchitectureRulesViolatedTest.noNullable> is annotated with <edu.umd.cs.findbugs.annotations.Nullable>",
-                        "Method <edu.hm.hafner.util.ArchitectureRulesTest$ArchitectureRulesViolatedTest.method(java.lang.String)> is annotated with <edu.umd.cs.findbugs.annotations.Nullable>",
-                        "Parameter <java.lang.String> of method <edu.hm.hafner.util.ArchitectureRulesTest$ArchitectureRulesViolatedTest.method(java.lang.String)> is annotated with <edu.umd.cs.findbugs.annotations.Nullable>");
+                        "Field <edu.hm.hafner.archunit.ArchitectureRulesTest$ArchitectureRulesViolatedTest.noNullable> is annotated with <edu.umd.cs.findbugs.annotations.Nullable>",
+                        "Method <edu.hm.hafner.archunit.ArchitectureRulesTest$ArchitectureRulesViolatedTest.method(java.lang.String)> is annotated with <edu.umd.cs.findbugs.annotations.Nullable>",
+                        "Parameter <java.lang.String> of method <edu.hm.hafner.archunit.ArchitectureRulesTest$ArchitectureRulesViolatedTest.method(java.lang.String)> is annotated with <edu.umd.cs.findbugs.annotations.Nullable>");
 
         assertThatNoException().isThrownBy(
                 () -> ArchitectureRules.NO_FORBIDDEN_ANNOTATION_USED.check(importPassingClass()));

src/test/java/edu/hm/hafner/util/ArchitectureTest.java renamed to src/test/java/edu/hm/hafner/archunit/ArchitectureTest.java

@@ -1,12 +1,12 @@
-package edu.hm.hafner.util;
+package edu.hm.hafner.archunit;
 
 import com.tngtech.archunit.core.importer.ImportOption;
 import com.tngtech.archunit.core.importer.Location;
 import com.tngtech.archunit.junit.AnalyzeClasses;
 import com.tngtech.archunit.junit.ArchTest;
 import com.tngtech.archunit.lang.ArchRule;
 
-import edu.hm.hafner.util.ArchitectureTest.DoNotIncludeRulesUnderTest;
+import edu.hm.hafner.archunit.ArchitectureTest.DoNotIncludeRulesUnderTest;
 
 /**
  * Checks the architecture of this module.

src/test/java/edu/hm/hafner/util/PackageArchitectureTest.java renamed to src/test/java/edu/hm/hafner/archunit/PackageArchitectureTest.java

@@ -1,13 +1,13 @@
-package edu.hm.hafner.util;
-
-import java.net.URL;
-import java.util.Objects;
+package edu.hm.hafner.archunit;
 
 import com.tngtech.archunit.core.importer.ImportOption.DoNotIncludeTests;
 import com.tngtech.archunit.junit.AnalyzeClasses;
 import com.tngtech.archunit.junit.ArchTest;
 import com.tngtech.archunit.lang.ArchRule;
 
+import java.net.URL;
+import java.util.Objects;
+
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.*;
 import static com.tngtech.archunit.library.plantuml.rules.PlantUmlArchCondition.Configuration.*;
 import static com.tngtech.archunit.library.plantuml.rules.PlantUmlArchCondition.*;