Restructure self-tests

schulzjo-tng · schulzjo-tng · commit e58b6b6f49f6 · 2026-07-09T14:35:34.000+02:00
- Required because the previous setting was unable to test junit5-engine and junit6-engine at the same time

Signed-off-by: Dr. Jonathan Schulz &lt;jonathan.schulz@tngtech.com&gt;
diff --git a/archunit-example/example-junit4/build.gradle b/archunit-example/example-junit4/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'archunit.java-examples-conventions'
+    id 'archunit.self-test-conventions'
 }
 
 ext.moduleName = 'com.tngtech.archunit.example.junit4'
@@ -15,4 +16,4 @@ test {
             excludeCategories 'com.tngtech.archunit.exampletest.junit4.Example'
         }
     }
-}
+}
diff --git a/archunit-example/example-junit4/src/archTest/java/com/tngtech/archunit/exampletest/junit4/ArchUnitArchitectureTest.java b/archunit-example/example-junit4/src/archTest/java/com/tngtech/archunit/exampletest/junit4/ArchUnitArchitectureTest.java
@@ -0,0 +1,18 @@
+package com.tngtech.archunit.exampletest.junit4;
+
+import com.tngtech.archunit.ArchUnitExampleArchitectureRules;
+import com.tngtech.archunit.junit.AnalyzeClasses;
+import com.tngtech.archunit.junit.ArchTest;
+import com.tngtech.archunit.junit.ArchTests;
+import com.tngtech.archunit.junit.ArchUnitRunner;
+import org.junit.runner.RunWith;
+
+@RunWith(ArchUnitRunner.class)
+@AnalyzeClasses(packages = "com.tngtech.archunit.exampletest.junit4")
+public class ArchUnitArchitectureTest {
+    private ArchUnitArchitectureTest() {
+    }
+
+    @ArchTest
+    public static final ArchTests example_rules = ArchTests.in(ArchUnitExampleArchitectureRules.class);
+}
diff --git a/archunit-example/example-junit5/build.gradle b/archunit-example/example-junit5/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'archunit.java-examples-conventions'
+    id 'archunit.self-test-conventions'
 }
 
 ext.moduleName = 'com.tngtech.archunit.example.junit5'
diff --git a/archunit-example/example-junit5/src/archTest/java/com/tngtech/archunit/exampletest/junit5/ArchUnitArchitectureTest.java b/archunit-example/example-junit5/src/archTest/java/com/tngtech/archunit/exampletest/junit5/ArchUnitArchitectureTest.java
@@ -0,0 +1,15 @@
+package com.tngtech.archunit.exampletest.junit5;
+
+import com.tngtech.archunit.ArchUnitExampleArchitectureRules;
+import com.tngtech.archunit.junit.AnalyzeClasses;
+import com.tngtech.archunit.junit.ArchTest;
+import com.tngtech.archunit.junit.ArchTests;
+
+@AnalyzeClasses(packages = "com.tngtech.archunit.exampletest.junit5")
+public class ArchUnitArchitectureTest {
+    private ArchUnitArchitectureTest() {
+    }
+
+    @ArchTest
+    public static final ArchTests example_rules = ArchTests.in(ArchUnitExampleArchitectureRules.class);
+}
diff --git a/archunit-example/example-junit6/build.gradle b/archunit-example/example-junit6/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'archunit.java-examples-conventions'
+    id 'archunit.self-test-conventions'
 }
 
 ext.moduleName = 'com.tngtech.archunit.example.junit6'
diff --git a/archunit-example/example-junit6/src/archTest/java/com/tngtech/archunit/exampletest/junit6/ArchUnitArchitectureTest.java b/archunit-example/example-junit6/src/archTest/java/com/tngtech/archunit/exampletest/junit6/ArchUnitArchitectureTest.java
@@ -0,0 +1,15 @@
+package com.tngtech.archunit.exampletest.junit6;
+
+import com.tngtech.archunit.ArchUnitExampleArchitectureRules;
+import com.tngtech.archunit.junit.AnalyzeClasses;
+import com.tngtech.archunit.junit.ArchTest;
+import com.tngtech.archunit.junit.ArchTests;
+
+@AnalyzeClasses(packages = "com.tngtech.archunit.exampletest.junit6")
+public class ArchUnitArchitectureTest {
+    private ArchUnitArchitectureTest() {
+    }
+
+    @ArchTest
+    public static final ArchTests example_rules = ArchTests.in(ArchUnitExampleArchitectureRules.class);
+}
diff --git a/archunit-example/example-plain/build.gradle b/archunit-example/example-plain/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'archunit.java-examples-conventions'
+    id 'archunit.self-test-conventions'
 }
 
 ext.moduleName = 'com.tngtech.archunit.example.plain'
diff --git a/archunit-example/example-plain/src/archTest/java/com/tngtech/archunit/exampletest/ArchUnitArchitectureTest.java b/archunit-example/example-plain/src/archTest/java/com/tngtech/archunit/exampletest/ArchUnitArchitectureTest.java
@@ -0,0 +1,16 @@
+package com.tngtech.archunit.exampletest;
+
+import com.tngtech.archunit.ArchUnitExampleArchitectureRules;
+import com.tngtech.archunit.junit.AnalyzeClasses;
+import com.tngtech.archunit.junit.ArchTest;
+import com.tngtech.archunit.junit.ArchTests;
+
+@AnalyzeClasses(
+        packages = {"com.tngtech.archunit.example", "com.tngtech.archunit.exampletest"})
+public class ArchUnitArchitectureTest {
+    private ArchUnitArchitectureTest() {
+    }
+
+    @ArchTest
+    public static final ArchTests example_rules = ArchTests.in(ArchUnitExampleArchitectureRules.class);
+}
diff --git a/archunit-junit/junit4/build.gradle b/archunit-junit/junit4/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'archunit.java-release-conventions'
     id 'archunit.java-junit-conventions'
+    id 'archunit.self-test-conventions'
 }
 
 ext.moduleName = 'com.tngtech.archunit.junit4'
diff --git a/archunit-junit/junit4/src/archTest/java/com/tngtech/archunit/junit/ArchUnitArchitectureTest.java b/archunit-junit/junit4/src/archTest/java/com/tngtech/archunit/junit/ArchUnitArchitectureTest.java
@@ -0,0 +1,16 @@
+package com.tngtech.archunit.junit;
+
+import com.tngtech.archunit.ArchitectureTestImportOptions.DoNotIncludeSelfTests;
+import com.tngtech.archunit.PublicAPIRules;
+import com.tngtech.archunit.core.importer.ImportOption.DoNotIncludeTests;
+import org.junit.runner.RunWith;
+
+@RunWith(ArchUnitRunner.class)
+@AnalyzeClasses(packages = "com.tngtech.archunit.junit", importOptions = {DoNotIncludeTests.class, DoNotIncludeSelfTests.class})
+public class ArchUnitArchitectureTest {
+    private ArchUnitArchitectureTest() {
+    }
+
+    @ArchTest
+    public static final ArchTests public_api_rules = ArchTests.in(PublicAPIRules.class);
+}
diff --git a/archunit-junit/junit5/api/build.gradle b/archunit-junit/junit5/api/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'archunit.java-release-conventions'
+    id 'archunit.self-test-conventions'
 }
 
 ext.moduleName = 'com.tngtech.archunit.junit5.api'
diff --git a/archunit-junit/junit5/api/src/archTest/java/com/tngtech/archunit/junit/ArchUnitArchitectureTest.java b/archunit-junit/junit5/api/src/archTest/java/com/tngtech/archunit/junit/ArchUnitArchitectureTest.java
@@ -0,0 +1,14 @@
+package com.tngtech.archunit.junit;
+
+import com.tngtech.archunit.ArchitectureTestImportOptions.DoNotIncludeSelfTests;
+import com.tngtech.archunit.PublicAPIRules;
+import com.tngtech.archunit.core.importer.ImportOption.DoNotIncludeTests;
+
+@AnalyzeClasses(packages = "com.tngtech.archunit.junit", importOptions = {DoNotIncludeTests.class, DoNotIncludeSelfTests.class})
+public class ArchUnitArchitectureTest {
+    private ArchUnitArchitectureTest() {
+    }
+    
+    @ArchTest
+    public static final ArchTests public_api_rules = ArchTests.in(PublicAPIRules.class);
+}
diff --git a/archunit-junit/junit5/engine-api/build.gradle b/archunit-junit/junit5/engine-api/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'archunit.java-release-conventions'
     id 'archunit.java-junit-conventions'
+    id 'archunit.self-test-conventions'
 }
 
 ext.moduleName = 'com.tngtech.archunit.junit5.engineapi'
@@ -17,12 +18,6 @@ dependencies {
 
 compileJava.dependsOn project(':archunit-junit5-api').finishArchive
 
-test {
-    useJUnitPlatform() {
-        excludeEngines 'archunit'
-    }
-}
-
 shadowJar {
     exclude 'META-INF/maven/**'
 
diff --git a/archunit-junit/junit5/engine-api/src/archTest/java/com/tngtech/archunit/junit/engine_api/ArchUnitArchitectureTest.java b/archunit-junit/junit5/engine-api/src/archTest/java/com/tngtech/archunit/junit/engine_api/ArchUnitArchitectureTest.java
@@ -0,0 +1,17 @@
+package com.tngtech.archunit.junit.engine_api;
+
+import com.tngtech.archunit.PublicAPIRules;
+import com.tngtech.archunit.ArchitectureTestImportOptions.DoNotIncludeSelfTests;
+import com.tngtech.archunit.core.importer.ImportOption.DoNotIncludeTests;
+import com.tngtech.archunit.junit.AnalyzeClasses;
+import com.tngtech.archunit.junit.ArchTest;
+import com.tngtech.archunit.junit.ArchTests;
+
+@AnalyzeClasses(packages = "com.tngtech.archunit.junit.engine_api", importOptions = {DoNotIncludeTests.class, DoNotIncludeSelfTests.class})
+public class ArchUnitArchitectureTest {
+    private ArchUnitArchitectureTest() {
+    }
+
+    @ArchTest
+    public static final ArchTests public_api_rules = ArchTests.in(PublicAPIRules.class);
+}
diff --git a/archunit-junit/junit5/engine/build.gradle b/archunit-junit/junit5/engine/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'archunit.java-release-conventions'
     id 'archunit.java-junit-conventions'
+    id 'archunit.self-test-conventions'
 }
 
 ext.moduleName = 'com.tngtech.archunit.junit5.engine'
@@ -34,12 +35,6 @@ sourcesJar {
     from project(':archunit-junit').sourceSets.main.allSource
 }
 
-test {
-    useJUnitPlatform {
-        excludeEngines 'archunit'
-    }
-}
-
 shadowJar {
     exclude 'META-INF/maven/**'
 
diff --git a/archunit-junit/junit5/engine/src/archTest/java/com/tngtech/archunit/junit/internal/ArchUnitArchitectureTest.java b/archunit-junit/junit5/engine/src/archTest/java/com/tngtech/archunit/junit/internal/ArchUnitArchitectureTest.java
@@ -0,0 +1,17 @@
+package com.tngtech.archunit.junit.internal;
+
+import com.tngtech.archunit.ArchitectureTestImportOptions.DoNotIncludeSelfTests;
+import com.tngtech.archunit.PublicAPIRules;
+import com.tngtech.archunit.core.importer.ImportOption.DoNotIncludeTests;
+import com.tngtech.archunit.junit.AnalyzeClasses;
+import com.tngtech.archunit.junit.ArchTest;
+import com.tngtech.archunit.junit.ArchTests;
+
+@AnalyzeClasses(packages = "com.tngtech.archunit.junit.internal", importOptions = {DoNotIncludeTests.class, DoNotIncludeSelfTests.class})
+public class ArchUnitArchitectureTest {
+    private ArchUnitArchitectureTest() {
+    }
+
+    @ArchTest
+    public static final ArchTests public_api_rules = ArchTests.in(PublicAPIRules.class);
+}
diff --git a/archunit-junit/junit6/api/build.gradle b/archunit-junit/junit6/api/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'archunit.java-release-conventions'
+    id 'archunit.self-test-conventions'
 }
 
 ext.moduleName = 'com.tngtech.archunit.junit6.api'
diff --git a/archunit-junit/junit6/api/src/archTest/java/com/tngtech/archunit/junit/ArchUnitArchitectureTest.java b/archunit-junit/junit6/api/src/archTest/java/com/tngtech/archunit/junit/ArchUnitArchitectureTest.java
@@ -0,0 +1,14 @@
+package com.tngtech.archunit.junit;
+
+import com.tngtech.archunit.ArchitectureTestImportOptions.DoNotIncludeSelfTests;
+import com.tngtech.archunit.PublicAPIRules;
+import com.tngtech.archunit.core.importer.ImportOption.DoNotIncludeTests;
+
+@AnalyzeClasses(packages = "com.tngtech.archunit.junit", importOptions = {DoNotIncludeTests.class, DoNotIncludeSelfTests.class})
+public class ArchUnitArchitectureTest {
+    private ArchUnitArchitectureTest() {
+    }
+
+    @ArchTest
+    public static final ArchTests public_api_rules = ArchTests.in(PublicAPIRules.class);
+}
diff --git a/archunit-junit/junit6/engine-api/build.gradle b/archunit-junit/junit6/engine-api/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'archunit.java-release-conventions'
     id 'archunit.java-junit-conventions'
+    id 'archunit.self-test-conventions'
 }
 
 ext.moduleName = 'com.tngtech.archunit.junit6.engineapi'
@@ -17,12 +18,6 @@ dependencies {
 
 compileJava.dependsOn project(':archunit-junit6-api').finishArchive
 
-test {
-    useJUnitPlatform() {
-        excludeEngines 'archunit'
-    }
-}
-
 shadowJar {
     exclude 'META-INF/maven/**'
 
diff --git a/archunit-junit/junit6/engine-api/src/archTest/java/com/tngtech/archunit/junit/engine_api/ArchUnitArchitectureTest.java b/archunit-junit/junit6/engine-api/src/archTest/java/com/tngtech/archunit/junit/engine_api/ArchUnitArchitectureTest.java
@@ -0,0 +1,17 @@
+package com.tngtech.archunit.junit.engine_api;
+
+import com.tngtech.archunit.PublicAPIRules;
+import com.tngtech.archunit.ArchitectureTestImportOptions.DoNotIncludeSelfTests;
+import com.tngtech.archunit.core.importer.ImportOption.DoNotIncludeTests;
+import com.tngtech.archunit.junit.AnalyzeClasses;
+import com.tngtech.archunit.junit.ArchTest;
+import com.tngtech.archunit.junit.ArchTests;
+
+@AnalyzeClasses(packages = "com.tngtech.archunit.junit.engine_api", importOptions = {DoNotIncludeTests.class, DoNotIncludeSelfTests.class})
+public class ArchUnitArchitectureTest {
+    private ArchUnitArchitectureTest() {
+    }
+
+    @ArchTest
+    public static final ArchTests public_api_rules = ArchTests.in(PublicAPIRules.class);
+}
diff --git a/archunit-junit/junit6/engine/build.gradle b/archunit-junit/junit6/engine/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'archunit.java-release-conventions'
     id 'archunit.java-junit-conventions'
+    id 'archunit.self-test-conventions'
 }
 
 ext.moduleName = 'com.tngtech.archunit.junit6.engine'
@@ -35,12 +36,6 @@ sourcesJar {
     from project(':archunit-junit').sourceSets.main.allSource
 }
 
-test {
-    useJUnitPlatform {
-        excludeEngines 'archunit'
-    }
-}
-
 shadowJar {
     exclude 'META-INF/maven/**'
 
diff --git a/archunit-junit/junit6/engine/src/archTest/java/com/tngtech/archunit/junit/internal/ArchUnitArchitectureTest.java b/archunit-junit/junit6/engine/src/archTest/java/com/tngtech/archunit/junit/internal/ArchUnitArchitectureTest.java
@@ -0,0 +1,17 @@
+package com.tngtech.archunit.junit.internal;
+
+import com.tngtech.archunit.ArchitectureTestImportOptions.DoNotIncludeSelfTests;
+import com.tngtech.archunit.PublicAPIRules;
+import com.tngtech.archunit.core.importer.ImportOption.DoNotIncludeTests;
+import com.tngtech.archunit.junit.AnalyzeClasses;
+import com.tngtech.archunit.junit.ArchTest;
+import com.tngtech.archunit.junit.ArchTests;
+
+@AnalyzeClasses(packages = "com.tngtech.archunit.junit.internal", importOptions = {DoNotIncludeTests.class, DoNotIncludeSelfTests.class})
+public class ArchUnitArchitectureTest {
+    private ArchUnitArchitectureTest() {
+    }
+
+    @ArchTest
+    public static final ArchTests public_api_rules = ArchTests.in(PublicAPIRules.class);
+}
diff --git a/archunit-self-test/build.gradle b/archunit-self-test/build.gradle
@@ -1,6 +1,5 @@
 plugins {
     id 'archunit.java-conventions'
-    id 'archunit.java-junit-conventions'
 }
 
 ext.moduleName = 'com.tngtech.archunit.archunit-self-test'
@@ -9,14 +8,6 @@ description = "ArchUnit tests for ArchUnit and ArchUnit-Examples themselves"
 ext.minimumJavaVersion = JavaVersion.VERSION_1_8
 
 dependencies {
-    implementation project(path: ':archunit')
-    implementation project(path: ':archunit-junit4')
-    implementation project(path: ':archunit-junit5')
-    implementation project(path: ':archunit-junit5-engine')
-    implementation project(path: ':archunit-example:example-plain')
-    implementation project(path: ':archunit-example:example-plain', configuration: 'tests')
-    implementation project(path: ':archunit-example:example-junit4', configuration: 'tests')
-    implementation project(path: ':archunit-example:example-junit5', configuration: 'tests')
-
-    testImplementation project(path: ':archunit-junit5')
+    compileOnly project(path: ':archunit')
+    compileOnly project(path: ':archunit-junit5-api')
 }
diff --git a/archunit-self-test/src/main/java/com/tngtech/archunit/ArchUnitArchitectureRules.java b/archunit-self-test/src/main/java/com/tngtech/archunit/ArchUnitArchitectureRules.java
diff --git a/archunit-self-test/src/main/java/com/tngtech/archunit/ArchUnitExampleArchitectureRules.java b/archunit-self-test/src/main/java/com/tngtech/archunit/ArchUnitExampleArchitectureRules.java
diff --git a/archunit-self-test/src/main/java/com/tngtech/archunit/ArchitectureTestImportOptions.java b/archunit-self-test/src/main/java/com/tngtech/archunit/ArchitectureTestImportOptions.java
diff --git a/archunit-self-test/src/main/java/com/tngtech/archunit/ImporterRules.java b/archunit-self-test/src/main/java/com/tngtech/archunit/ImporterRules.java
diff --git a/archunit-self-test/src/main/java/com/tngtech/archunit/PublicAPIRules.java b/archunit-self-test/src/main/java/com/tngtech/archunit/PublicAPIRules.java
diff --git a/archunit-self-test/src/test/java/com/tngtech/archunit/ArchUnitExampleArchitectureTest.java b/archunit-self-test/src/test/java/com/tngtech/archunit/ArchUnitExampleArchitectureTest.java
diff --git a/archunit/build.gradle b/archunit/build.gradle
diff --git a/archunit/src/archTest/java/com/tngtech/archunit/ArchUnitArchitectureTest.java b/archunit/src/archTest/java/com/tngtech/archunit/ArchUnitArchitectureTest.java
diff --git a/buildSrc/src/main/groovy/archunit.self-test-conventions.gradle b/buildSrc/src/main/groovy/archunit.self-test-conventions.gradle

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id 'archunit.java-examples-conventions'`
	`3`	`+ id 'archunit.self-test-conventions'`
`3`	`4`	`}`
`4`	`5`
`5`	`6`	`ext.moduleName = 'com.tngtech.archunit.example.junit4'`
`@@ -15,4 +16,4 @@ test {`
`15`	`16`	`excludeCategories 'com.tngtech.archunit.exampletest.junit4.Example'`
`16`	`17`	`}`
`17`	`18`	`}`
`18`		`-}`
	`19`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id 'archunit.java-release-conventions'`
`3`	`3`	`id 'archunit.java-junit-conventions'`
	`4`	`+ id 'archunit.self-test-conventions'`
`4`	`5`	`}`
`5`	`6`
`6`	`7`	`ext.moduleName = 'com.tngtech.archunit.junit4'`