From 0bd266da23c87685388ea489097021d404241e83 Mon Sep 17 00:00:00 2001 From: mworzala Date: Mon, 21 Mar 2022 22:32:13 +0000 Subject: [PATCH] Add Junit test suites for isolated unit and integration tests. --- build.gradle.kts | 2 ++ gradle/libs.versions.toml | 3 +++ src/test/java/IntegrationTests.java | 11 +++++++++++ src/test/java/UnitTests.java | 11 +++++++++++ 4 files changed, 27 insertions(+) create mode 100644 src/test/java/IntegrationTests.java create mode 100644 src/test/java/UnitTests.java diff --git a/build.gradle.kts b/build.gradle.kts index 2a1e2df30..2d01fa83b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -46,6 +46,8 @@ dependencies { testImplementation(libs.junit.api) testImplementation(libs.junit.params) testRuntimeOnly(libs.junit.engine) + testImplementation(libs.junit.suite.api) + testRuntimeOnly(libs.junit.suite.engine) // Only here to ensure J9 module support for extensions and our classloaders testCompileOnly(libs.mockito.core) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6852175fa..c528854eb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,6 +24,7 @@ jcTools = "3.3.0" # Test junit-jupiter = "5.8.2" +junit-platform = "1.8.2" mockito = "4.2.0" # Code Generation @@ -77,6 +78,8 @@ jcTools = { group = "org.jctools", name = "jctools-core", version.ref = "jcTools junit-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit-jupiter" } junit-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit-jupiter" } junit-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "junit-jupiter" } +junit-suite-api = { group = "org.junit.platform", name = "junit-platform-suite-api", version.ref = "junit-platform" } +junit-suite-engine = { group = "org.junit.platform", name = "junit-platform-suite-engine", version.ref = "junit-platform" } mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" } # Code Generation diff --git a/src/test/java/IntegrationTests.java b/src/test/java/IntegrationTests.java new file mode 100644 index 000000000..400b8c0d9 --- /dev/null +++ b/src/test/java/IntegrationTests.java @@ -0,0 +1,11 @@ +import org.junit.platform.suite.api.IncludeClassNamePatterns; +import org.junit.platform.suite.api.SelectPackages; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SuiteDisplayName; + +@Suite +@SuiteDisplayName("Integration Tests") +@SelectPackages("net.minestom.server") +@IncludeClassNamePatterns(".*IntegrationTest") +public class IntegrationTests { +} diff --git a/src/test/java/UnitTests.java b/src/test/java/UnitTests.java new file mode 100644 index 000000000..214649dda --- /dev/null +++ b/src/test/java/UnitTests.java @@ -0,0 +1,11 @@ +import org.junit.platform.suite.api.ExcludeClassNamePatterns; +import org.junit.platform.suite.api.SelectPackages; +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SuiteDisplayName; + +@Suite +@SuiteDisplayName("Unit Tests") +@SelectPackages("net.minestom.server") +@ExcludeClassNamePatterns(".*IntegrationTest") +public class UnitTests { +}