diff --git a/README.md b/README.md index 4cbb0840314e..8b65c0c3f9ee 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ See also for releases and > in JUnit Jupiter. - `junit-jupiter-migration-support`:: + `junit-jupiter-migrationsupport`:: Migration support from JUnit 4 to JUnit Jupiter, only required for running selected JUnit 4 rules. @@ -121,7 +121,7 @@ package org.junit.jupiter { [junit-jupiter-api] as jupiter_api [junit-jupiter-engine] as jupiter_engine [junit-jupiter-params] as jupiter_params - [junit-jupiter-migration-support] as jupiter_migration_support + [junit-jupiter-migrationsupport] as jupiter_migration_support } package org.junit.vintage { diff --git a/documentation/src/docs/asciidoc/release-notes-5.0.0-M5.adoc b/documentation/src/docs/asciidoc/release-notes-5.0.0-M5.adoc index 681e8ce7d13e..14274fa57b69 100644 --- a/documentation/src/docs/asciidoc/release-notes-5.0.0-M5.adoc +++ b/documentation/src/docs/asciidoc/release-notes-5.0.0-M5.adoc @@ -21,7 +21,7 @@ is placed on the Java 9 module path. | `junit-jupiter-api-.jar` | `org.junit.jupiter.api` | `junit-jupiter-engine-.jar` | `org.junit.jupiter.engine` -| `junit-jupiter-migration-support-.jar` | `org.junit.jupiter.migrationsupport` +| `junit-jupiter-migrationsupport-.jar` | `org.junit.jupiter.migrationsupport` | `junit-jupiter-params-.jar` | `org.junit.jupiter.params` | `junit-platform-commons-.jar` | `org.junit.platform.commons` | `junit-platform-console-.jar` | `org.junit.platform.console` @@ -91,6 +91,8 @@ is placed on the Java 9 module path. ===== Deprecations and Breaking Changes +* The migration support module is now named `junit-jupiter-migrationsupport`, without + the dash `-` between `migration` and `support`. * In order to ensure the _composability_ of all supported extension APIs in JUnit Jupiter, several methods in existing APIs have been renamed. ** See <> for details. diff --git a/junit-jupiter-migration-support/LICENSE.md b/junit-jupiter-migrationsupport/LICENSE.md similarity index 100% rename from junit-jupiter-migration-support/LICENSE.md rename to junit-jupiter-migrationsupport/LICENSE.md diff --git a/junit-jupiter-migration-support/README.md b/junit-jupiter-migrationsupport/README.md similarity index 95% rename from junit-jupiter-migration-support/README.md rename to junit-jupiter-migrationsupport/README.md index 6bf22d5d2f7e..730e2c8e94b1 100644 --- a/junit-jupiter-migration-support/README.md +++ b/junit-jupiter-migrationsupport/README.md @@ -1,4 +1,4 @@ -# Module junit-jupiter-migration-support +# Module junit-jupiter-migrationsupport This module provides support for JUnit 4 rules within JUnit Jupiter. Currently, this support is limited to subclasses of the ```org.junit.rules.Verifier``` diff --git a/junit-jupiter-migration-support/junit-jupiter-migration-support.gradle b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle similarity index 100% rename from junit-jupiter-migration-support/junit-jupiter-migration-support.gradle rename to junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle diff --git a/junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleSupport.java similarity index 100% rename from junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleSupport.java rename to junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleSupport.java diff --git a/junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupport.java similarity index 100% rename from junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupport.java rename to junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupport.java diff --git a/junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java similarity index 100% rename from junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java rename to junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupport.java diff --git a/junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java similarity index 100% rename from junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java rename to junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupport.java diff --git a/junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleFieldSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleFieldSupport.java similarity index 100% rename from junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleFieldSupport.java rename to junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleFieldSupport.java diff --git a/junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleMethodSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleMethodSupport.java similarity index 100% rename from junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleMethodSupport.java rename to junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/TestRuleMethodSupport.java diff --git a/junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java similarity index 100% rename from junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java rename to junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/VerifierSupport.java diff --git a/junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/AbstractTestRuleAdapter.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/AbstractTestRuleAdapter.java similarity index 100% rename from junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/AbstractTestRuleAdapter.java rename to junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/AbstractTestRuleAdapter.java diff --git a/junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExpectedExceptionAdapter.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExpectedExceptionAdapter.java similarity index 100% rename from junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExpectedExceptionAdapter.java rename to junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExpectedExceptionAdapter.java diff --git a/junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExternalResourceAdapter.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExternalResourceAdapter.java similarity index 100% rename from junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExternalResourceAdapter.java rename to junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/ExternalResourceAdapter.java diff --git a/junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/GenericBeforeAndAfterAdvice.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/GenericBeforeAndAfterAdvice.java similarity index 100% rename from junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/GenericBeforeAndAfterAdvice.java rename to junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/GenericBeforeAndAfterAdvice.java diff --git a/junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/VerifierAdapter.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/VerifierAdapter.java similarity index 100% rename from junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/VerifierAdapter.java rename to junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/VerifierAdapter.java diff --git a/junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/package-info.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/package-info.java similarity index 100% rename from junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/package-info.java rename to junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/adapter/package-info.java diff --git a/junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/member/AbstractTestRuleAnnotatedMember.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/AbstractTestRuleAnnotatedMember.java similarity index 100% rename from junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/member/AbstractTestRuleAnnotatedMember.java rename to junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/AbstractTestRuleAnnotatedMember.java diff --git a/junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedField.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedField.java similarity index 100% rename from junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedField.java rename to junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedField.java diff --git a/junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMember.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMember.java similarity index 100% rename from junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMember.java rename to junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMember.java diff --git a/junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMemberFactory.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMemberFactory.java similarity index 100% rename from junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMemberFactory.java rename to junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMemberFactory.java diff --git a/junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMethod.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMethod.java similarity index 100% rename from junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMethod.java rename to junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/TestRuleAnnotatedMethod.java diff --git a/junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/member/package-info.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/package-info.java similarity index 100% rename from junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/member/package-info.java rename to junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/member/package-info.java diff --git a/junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/package-info.java b/junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/package-info.java similarity index 100% rename from junit-jupiter-migration-support/src/main/java/org/junit/jupiter/migrationsupport/rules/package-info.java rename to junit-jupiter-migrationsupport/src/main/java/org/junit/jupiter/migrationsupport/rules/package-info.java diff --git a/junit-jupiter-migration-support/src/main/resources/META-INF/services/org.junit.platform.engine.TestEngine b/junit-jupiter-migrationsupport/src/main/resources/META-INF/services/org.junit.platform.engine.TestEngine similarity index 100% rename from junit-jupiter-migration-support/src/main/resources/META-INF/services/org.junit.platform.engine.TestEngine rename to junit-jupiter-migrationsupport/src/main/resources/META-INF/services/org.junit.platform.engine.TestEngine diff --git a/junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java similarity index 100% rename from junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java rename to junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/JupiterMigrationSupportTestSuite.java diff --git a/junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleAdapterTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleAdapterTests.java similarity index 100% rename from junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleAdapterTests.java rename to junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/AbstractTestRuleAdapterTests.java diff --git a/junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupportWithBothRuleTypesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupportWithBothRuleTypesTests.java similarity index 100% rename from junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupportWithBothRuleTypesTests.java rename to junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupportWithBothRuleTypesTests.java diff --git a/junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupportTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupportTests.java similarity index 100% rename from junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupportTests.java rename to junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExpectedExceptionSupportTests.java diff --git a/junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMixedMethodAndFieldRulesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMixedMethodAndFieldRulesTests.java similarity index 100% rename from junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMixedMethodAndFieldRulesTests.java rename to junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMixedMethodAndFieldRulesTests.java diff --git a/junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleFieldRulesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleFieldRulesTests.java similarity index 100% rename from junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleFieldRulesTests.java rename to junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleFieldRulesTests.java diff --git a/junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleMethodRulesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleMethodRulesTests.java similarity index 100% rename from junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleMethodRulesTests.java rename to junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleMethodRulesTests.java diff --git a/junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForTemporaryFolderFieldTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForTemporaryFolderFieldTests.java similarity index 100% rename from junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForTemporaryFolderFieldTests.java rename to junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForTemporaryFolderFieldTests.java diff --git a/junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportWithInheritanceTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportWithInheritanceTests.java similarity index 100% rename from junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportWithInheritanceTests.java rename to junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportWithInheritanceTests.java diff --git a/junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceWithoutAdapterTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceWithoutAdapterTests.java similarity index 100% rename from junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceWithoutAdapterTests.java rename to junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceWithoutAdapterTests.java diff --git a/junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/FailAfterAllHelper.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/FailAfterAllHelper.java similarity index 100% rename from junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/FailAfterAllHelper.java rename to junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/FailAfterAllHelper.java diff --git a/junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/LauncherBasedEnableRuleMigrationSupportTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/LauncherBasedEnableRuleMigrationSupportTests.java similarity index 100% rename from junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/LauncherBasedEnableRuleMigrationSupportTests.java rename to junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/LauncherBasedEnableRuleMigrationSupportTests.java diff --git a/junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/VerifierSupportForMixedMethodAndFieldRulesTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/VerifierSupportForMixedMethodAndFieldRulesTests.java similarity index 100% rename from junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/VerifierSupportForMixedMethodAndFieldRulesTests.java rename to junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/VerifierSupportForMixedMethodAndFieldRulesTests.java diff --git a/junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierFieldTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierFieldTests.java similarity index 100% rename from junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierFieldTests.java rename to junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierFieldTests.java diff --git a/junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierMethodTests.java b/junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierMethodTests.java similarity index 100% rename from junit-jupiter-migration-support/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierMethodTests.java rename to junit-jupiter-migrationsupport/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierMethodTests.java diff --git a/junit-jupiter-migration-support/src/test/resources/log4j2-test.xml b/junit-jupiter-migrationsupport/src/test/resources/log4j2-test.xml similarity index 100% rename from junit-jupiter-migration-support/src/test/resources/log4j2-test.xml rename to junit-jupiter-migrationsupport/src/test/resources/log4j2-test.xml diff --git a/platform-tests/src/test/java/org/junit/AutomaticModuleNameTests.java b/platform-tests/src/test/java/org/junit/AutomaticModuleNameTests.java index c5a777956445..af429a5cd804 100644 --- a/platform-tests/src/test/java/org/junit/AutomaticModuleNameTests.java +++ b/platform-tests/src/test/java/org/junit/AutomaticModuleNameTests.java @@ -75,9 +75,6 @@ static Stream moduleDirectoryNames() throws IOException { @MethodSource("moduleDirectoryNames") void automaticModuleName(String module) { String expected = "org." + module.replace('-', '.'); - if (module.equals("junit-jupiter-migration-support")) { - expected = "org.junit.jupiter.migrationsupport"; - } String jarName = module + "-" + version(module) + ".jar"; Path jarPath = Paths.get("..", module).resolve("build/libs").resolve(jarName).normalize(); try (JarFile jarFile = new JarFile(jarPath.toFile())) { diff --git a/settings.gradle b/settings.gradle index d9017c6bb7ad..669c93764e3e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,7 +3,7 @@ rootProject.name = 'junit5' include 'documentation' include 'junit-jupiter-api' include 'junit-jupiter-engine' -include 'junit-jupiter-migration-support' +include 'junit-jupiter-migrationsupport' include 'junit-jupiter-params' include 'junit-platform-commons' include 'junit-platform-console'