Move Jupiter-specific tests to jupiter-tests project

junit-team · Nov 26, 2024 · c1a976e · c1a976e
1 parent f7c8d66
commit c1a976e
Show file tree

Hide file tree

Showing 19 changed files with 28 additions and 47 deletions.
diff --git a/junit-jupiter-api/junit-jupiter-api.gradle.kts b/junit-jupiter-api/junit-jupiter-api.gradle.kts
@@ -15,6 +15,8 @@ dependencies {
 
 	compileOnly(kotlin("stdlib"))
 
+	testFixturesImplementation(libs.assertj)
+
 	osgiVerification(projects.junitJupiterEngine)
 	osgiVerification(projects.junitPlatformLauncher)
 }

diff --git a/...tform/AbstractEqualsAndHashCodeTests.java → ...r/api/AbstractEqualsAndHashCodeTests.java b/...tform/AbstractEqualsAndHashCodeTests.java → ...r/api/AbstractEqualsAndHashCodeTests.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.platform;
+package org.junit.jupiter.api;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/.../engine/support/descriptor/LockTests.java → ...junit/jupiter/api/parallel/LockTests.java b/.../engine/support/descriptor/LockTests.java → ...junit/jupiter/api/parallel/LockTests.java
@@ -8,15 +8,15 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.platform.engine.support.descriptor;
+package org.junit.jupiter.api.parallel;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ;
 import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
 import static org.junit.jupiter.api.parallel.ResourceLocksProvider.Lock;
 
+import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.AbstractEqualsAndHashCodeTests;
 
 /**
  * Unit tests for {@link Lock}.

diff --git a/...scriptor/ResourceLockAnnotationTests.java → ...parallel/ResourceLockAnnotationTests.java b/...scriptor/ResourceLockAnnotationTests.java → ...parallel/ResourceLockAnnotationTests.java
@@ -8,11 +8,10 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.platform.engine.support.descriptor;
+package org.junit.jupiter.api.parallel;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.util.Throwables.getRootCause;
-import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 import static org.junit.platform.engine.support.hierarchical.ExclusiveResource.LockMode;
 import static org.junit.platform.testkit.engine.EventConditions.finishedWithFailure;
 import static org.junit.platform.testkit.engine.TestExecutionResultConditions.instanceOf;
@@ -31,11 +30,7 @@
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
-import org.junit.jupiter.api.parallel.ExecutionMode;
-import org.junit.jupiter.api.parallel.ResourceAccessMode;
-import org.junit.jupiter.api.parallel.ResourceLock;
-import org.junit.jupiter.api.parallel.ResourceLockTarget;
-import org.junit.jupiter.api.parallel.ResourceLocksProvider;
+import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.jupiter.engine.descriptor.ClassTestDescriptor;
 import org.junit.jupiter.engine.descriptor.NestedClassTestDescriptor;
@@ -47,16 +42,14 @@
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.support.hierarchical.ExclusiveResource;
-import org.junit.platform.testkit.engine.EngineTestKit;
 import org.junit.platform.testkit.engine.Event;
-import org.junit.platform.testkit.engine.Events;
 
 /**
  * Integration tests for {@link ResourceLock} and {@link ResourceLocksProvider}.
  *
  * @since 5.12
  */
-class ResourceLockAnnotationTests {
+class ResourceLockAnnotationTests extends AbstractJupiterTestEngineTests {
 
 	private static final UniqueId uniqueId = UniqueId.root("enigma", "foo");
 
@@ -283,9 +276,9 @@ private Set<ExclusiveResource> getNestedClassResources(Class<?> testClass) {
 		return descriptor.getExclusiveResources();
 	}
 
-	private static void assertThrowsJunitExceptionWithMessage(Class<?> testClass, String message) {
+	private void assertThrowsJunitExceptionWithMessage(Class<?> testClass, String message) {
 		// @formatter:off
-		var events = execute(testClass);
+		var events = executeTestsForClass(testClass).allEvents();
 		assertThat(events.filter(finishedWithFailure(instanceOf(JUnitException.class))::matches))
 				.hasSize(1)
 				.map(Event::getPayload)
@@ -297,13 +290,6 @@ private static void assertThrowsJunitExceptionWithMessage(Class<?> testClass, St
 		// @formatter:on
 	}
 
-	private static Events execute(Class<?> testCase) {
-		return EngineTestKit.engine("junit-jupiter") //
-				.selectors(selectClass(testCase)) //
-				.execute() //
-				.allEvents();
-	}
-
 	// -------------------------------------------------------------------------
 
 	@SuppressWarnings("JUnitMalformedDeclaration")

diff --git a/...escriptor/ResourceLocksProviderTests.java → .../parallel/ResourceLocksProviderTests.java b/...escriptor/ResourceLocksProviderTests.java → .../parallel/ResourceLocksProviderTests.java
@@ -8,14 +8,13 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.platform.engine.support.descriptor;
+package org.junit.jupiter.api.parallel;
 
 import static java.util.Collections.emptySet;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 import static org.junit.platform.testkit.engine.EventConditions.event;
 import static org.junit.platform.testkit.engine.EventConditions.finishedSuccessfully;
 import static org.junit.platform.testkit.engine.EventConditions.test;
@@ -27,17 +26,15 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.parallel.ResourceLock;
-import org.junit.jupiter.api.parallel.ResourceLocksProvider;
-import org.junit.platform.testkit.engine.EngineTestKit;
+import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
 import org.junit.platform.testkit.engine.Event;
 
 /**
  * Integration tests for {@link ResourceLocksProvider}.
  *
  * @since 5.12
  */
-class ResourceLocksProviderTests {
+class ResourceLocksProviderTests extends AbstractJupiterTestEngineTests {
 
 	@Test
 	void classLevelProvider() {
@@ -64,11 +61,7 @@ void methodLevelProviderInNestedClass() {
 	}
 
 	private Stream<Event> execute(Class<?> testCase) {
-		return EngineTestKit.engine("junit-jupiter") //
-				.selectors(selectClass(testCase)) //
-				.execute() //
-				.allEvents() //
-				.stream();
+		return executeTestsForClass(testCase).allEvents().stream();
 	}
 
 	// -------------------------------------------------------------------------

diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java
@@ -13,8 +13,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.AbstractEqualsAndHashCodeTests;
 import org.junit.platform.commons.PreconditionViolationException;
 
 /**

diff --git a/...sts/src/test/java/org/junit/platform/engine/discovery/ClasspathResourceSelectorTests.java b/...sts/src/test/java/org/junit/platform/engine/discovery/ClasspathResourceSelectorTests.java
@@ -10,8 +10,8 @@
 
 package org.junit.platform.engine.discovery;
 
+import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.AbstractEqualsAndHashCodeTests;
 
 /**
  * Unit tests for {@link ClasspathResourceSelector}.

diff --git a/...m-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathRootSelectorTests.java b/...m-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathRootSelectorTests.java
@@ -12,8 +12,8 @@
 
 import java.net.URI;
 
+import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.AbstractEqualsAndHashCodeTests;
 
 /**
  * Unit tests for {@link ClasspathRootSelector}.

diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/DirectorySelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/DirectorySelectorTests.java
@@ -10,8 +10,8 @@
 
 package org.junit.platform.engine.discovery;
 
+import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.AbstractEqualsAndHashCodeTests;
 
 /**
  * Unit tests for {@link DirectorySelector}.

diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/FilePositionTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/FilePositionTests.java
@@ -17,12 +17,12 @@
 
 import java.util.stream.Stream;
 
+import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.platform.AbstractEqualsAndHashCodeTests;
 import org.junit.platform.commons.PreconditionViolationException;
 
 /**

diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/FileSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/FileSelectorTests.java
@@ -10,8 +10,8 @@
 
 package org.junit.platform.engine.discovery;
 
+import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.AbstractEqualsAndHashCodeTests;
 
 /**
  * Unit tests for {@link FileSelector}.

diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java
@@ -15,8 +15,8 @@
 
 import java.util.stream.Stream;
 
+import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.AbstractEqualsAndHashCodeTests;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.PreconditionViolationException;
 

diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/ModuleSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/ModuleSelectorTests.java
@@ -10,8 +10,8 @@
 
 package org.junit.platform.engine.discovery;
 
+import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.AbstractEqualsAndHashCodeTests;
 
 /**
  * Unit tests for {@link ModuleSelector}.

diff --git a/...orm-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java b/...orm-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java
@@ -15,8 +15,8 @@
 
 import java.util.List;
 
+import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.AbstractEqualsAndHashCodeTests;
 import org.junit.platform.commons.PreconditionViolationException;
 
 /**

diff --git a/...rm-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java b/...rm-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java
@@ -15,8 +15,8 @@
 
 import java.util.List;
 
+import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.AbstractEqualsAndHashCodeTests;
 import org.junit.platform.commons.PreconditionViolationException;
 
 /**

diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageSelectorTests.java
@@ -10,8 +10,8 @@
 
 package org.junit.platform.engine.discovery;
 
+import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.AbstractEqualsAndHashCodeTests;
 
 /**
  * Unit tests for {@link PackageSelector}.

diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/UniqueIdSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/UniqueIdSelectorTests.java
@@ -10,8 +10,8 @@
 
 package org.junit.platform.engine.discovery;
 
+import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.AbstractEqualsAndHashCodeTests;
 import org.junit.platform.engine.UniqueId;
 
 /**

diff --git a/platform-tests/src/test/java/org/junit/platform/engine/discovery/UriSelectorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/discovery/UriSelectorTests.java
@@ -12,8 +12,8 @@
 
 import java.net.URI;
 
+import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.AbstractEqualsAndHashCodeTests;
 
 /**
  * Unit tests for {@link UriSelector}.

diff --git a/...s/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestSourceTests.java b/...s/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestSourceTests.java
@@ -23,9 +23,9 @@
 import java.io.Serializable;
 import java.util.stream.Stream;
 
+import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;
-import org.junit.platform.AbstractEqualsAndHashCodeTests;
 import org.junit.platform.engine.TestSource;
 
 /**