Move tests from junit-jupiter-migrationsupport to jupiter-tests

junit-team · Aug 10, 2024 · ef41b3f · ef41b3f
1 parent 10dd400
commit ef41b3f
Show file tree

Hide file tree

Showing 21 changed files with 8 additions and 22 deletions.
diff --git a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
 	id("junitbuild.java-library-conventions")
 	id("junitbuild.junit4-compatibility")
-	id("junitbuild.testing-conventions")
 }
 
 description = "JUnit Jupiter Migration Support"
@@ -13,11 +12,6 @@ dependencies {
 
 	compileOnlyApi(libs.apiguardian)
 
-	testImplementation(projects.junitJupiterEngine)
-	testImplementation(projects.junitPlatformLauncher)
-	testImplementation(projects.junitPlatformSuiteEngine)
-	testImplementation(projects.junitPlatformTestkit)
-
 	osgiVerification(projects.junitJupiterEngine)
 	osgiVerification(projects.junitPlatformLauncher)
 }

diff --git a/junit-jupiter-migrationsupport/src/test/resources/log4j2-test.xml b/junit-jupiter-migrationsupport/src/test/resources/log4j2-test.xml
diff --git a/jupiter-tests/jupiter-tests.gradle.kts b/jupiter-tests/jupiter-tests.gradle.kts
@@ -1,14 +1,16 @@
 import org.gradle.api.tasks.PathSensitivity.RELATIVE
 
 plugins {
+	id("junitbuild.code-generator")
 	id("junitbuild.kotlin-library-conventions")
+	id("junitbuild.junit4-compatibility")
 	id("junitbuild.testing-conventions")
-	id("junitbuild.code-generator")
 	groovy
 }
 
 dependencies {
 	testImplementation(projects.junitJupiter)
+	testImplementation(projects.junitJupiterMigrationsupport)
 	testImplementation(projects.junitPlatformLauncher)
 	testImplementation(projects.junitPlatformSuiteEngine)
 	testImplementation(projects.junitPlatformTestkit)
@@ -28,4 +30,9 @@ tasks {
 		inputs.dir("src/test/resources").withPathSensitivity(RELATIVE)
 		systemProperty("developmentVersion", version)
 	}
+	test_4_12 {
+		filter {
+			includeTestsMatching("org.junit.jupiter.migrationsupport.*")
+		}
+	}
 }
diff --git a/...ort/JupiterMigrationSupportTestSuite.java → ...ort/JupiterMigrationSupportTestSuite.java b/...ort/JupiterMigrationSupportTestSuite.java → ...ort/JupiterMigrationSupportTestSuite.java
diff --git a/...ons/IgnoreAnnotationIntegrationTests.java → ...ons/IgnoreAnnotationIntegrationTests.java b/...ons/IgnoreAnnotationIntegrationTests.java → ...ons/IgnoreAnnotationIntegrationTests.java
diff --git a/...port/conditions/IgnoreConditionTests.java → ...port/conditions/IgnoreConditionTests.java b/...port/conditions/IgnoreConditionTests.java → ...port/conditions/IgnoreConditionTests.java
diff --git a/...t/rules/AbstractTestRuleAdapterTests.java → ...t/rules/AbstractTestRuleAdapterTests.java b/...t/rules/AbstractTestRuleAdapterTests.java → ...t/rules/AbstractTestRuleAdapterTests.java
diff --git a/...grationSupportWithBothRuleTypesTests.java → ...grationSupportWithBothRuleTypesTests.java b/...grationSupportWithBothRuleTypesTests.java → ...grationSupportWithBothRuleTypesTests.java
diff --git a/.../rules/ExpectedExceptionSupportTests.java → .../rules/ExpectedExceptionSupportTests.java b/.../rules/ExpectedExceptionSupportTests.java → .../rules/ExpectedExceptionSupportTests.java
diff --git a/...fferentDeclaredReturnTypesRulesTests.java → ...fferentDeclaredReturnTypesRulesTests.java b/...fferentDeclaredReturnTypesRulesTests.java → ...fferentDeclaredReturnTypesRulesTests.java
diff --git a/...portForMixedMethodAndFieldRulesTests.java → ...portForMixedMethodAndFieldRulesTests.java b/...portForMixedMethodAndFieldRulesTests.java → ...portForMixedMethodAndFieldRulesTests.java
diff --git a/...rceSupportForMultipleFieldRulesTests.java → ...rceSupportForMultipleFieldRulesTests.java b/...rceSupportForMultipleFieldRulesTests.java → ...rceSupportForMultipleFieldRulesTests.java
diff --git a/...ceSupportForMultipleMethodRulesTests.java → ...ceSupportForMultipleMethodRulesTests.java b/...ceSupportForMultipleMethodRulesTests.java → ...ceSupportForMultipleMethodRulesTests.java
diff --git a/...eSupportForTemporaryFolderFieldTests.java → ...eSupportForTemporaryFolderFieldTests.java b/...eSupportForTemporaryFolderFieldTests.java → ...eSupportForTemporaryFolderFieldTests.java
diff --git a/...lResourceSupportWithInheritanceTests.java → ...lResourceSupportWithInheritanceTests.java b/...lResourceSupportWithInheritanceTests.java → ...lResourceSupportWithInheritanceTests.java
diff --git a/.../ExternalResourceWithoutAdapterTests.java → .../ExternalResourceWithoutAdapterTests.java b/.../ExternalResourceWithoutAdapterTests.java → .../ExternalResourceWithoutAdapterTests.java
diff --git a/...tionsupport/rules/FailAfterAllHelper.java → ...tionsupport/rules/FailAfterAllHelper.java b/...tionsupport/rules/FailAfterAllHelper.java → ...tionsupport/rules/FailAfterAllHelper.java
diff --git a/...BasedEnableRuleMigrationSupportTests.java → ...BasedEnableRuleMigrationSupportTests.java b/...BasedEnableRuleMigrationSupportTests.java → ...BasedEnableRuleMigrationSupportTests.java
diff --git a/...portForMixedMethodAndFieldRulesTests.java → ...portForMixedMethodAndFieldRulesTests.java b/...portForMixedMethodAndFieldRulesTests.java → ...portForMixedMethodAndFieldRulesTests.java
diff --git a/...WrongExtendWithForVerifierFieldTests.java → ...WrongExtendWithForVerifierFieldTests.java b/...WrongExtendWithForVerifierFieldTests.java → ...WrongExtendWithForVerifierFieldTests.java
diff --git a/...rongExtendWithForVerifierMethodTests.java → ...rongExtendWithForVerifierMethodTests.java b/...rongExtendWithForVerifierMethodTests.java → ...rongExtendWithForVerifierMethodTests.java