Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to JUnit 5 #2771

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open

Migrate to JUnit 5 #2771

wants to merge 25 commits into from

Conversation

ljacqu
Copy link
Member

@ljacqu ljacqu commented Dec 20, 2023

Started in 2019—this migrates all tests to JUnit 5. Unfortunately, this required a few changes in some non-test classes, which is why I'll test the plugin before merging it to master. This PR is useful to see the full diff.

Open points:

  • Test plugin
  • Review changes

- Global issue with the ConsoleLogger remains
- Migration of parameterized tests still open
- TempDir annotation does nothing but the test silently worked and created test files into the project root... Ouch :)
# Conflicts:
#	src/test/java/fr/xephi/authme/AuthMeInitializationTest.java
#	src/test/java/fr/xephi/authme/ConsoleLoggerTest.java
#	src/test/java/fr/xephi/authme/command/help/HelpMessagesServiceTest.java
#	src/test/java/fr/xephi/authme/data/limbo/LimboServiceHelperTest.java
#	src/test/java/fr/xephi/authme/listener/ListenerConsistencyTest.java
#	src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java
#	src/test/java/fr/xephi/authme/message/MessageFilePlaceholderTest.java
#	src/test/java/fr/xephi/authme/message/MessagesIntegrationTest.java
#	src/test/java/fr/xephi/authme/message/updater/MessageUpdaterTest.java
#	src/test/java/fr/xephi/authme/security/totp/GenerateTotpServiceTest.java
# Conflicts:
#	src/test/java/fr/xephi/authme/TestHelper.java
#	src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java
#	src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java
#	src/test/java/fr/xephi/authme/permission/PermissionsManagerInitializationTest.java
#	src/test/java/fr/xephi/authme/process/register/AsyncRegisterTest.java
#	src/test/java/fr/xephi/authme/service/MigrationServiceTest.java
#	src/test/java/fr/xephi/authme/settings/properties/AuthMeSettingsRetrieverTest.java
#	src/test/java/fr/xephi/authme/util/ExceptionUtilsTest.java
#	src/test/java/fr/xephi/authme/util/InternetProtocolUtilsTest.java
#	src/test/java/fr/xephi/authme/util/RandomStringUtilsTest.java
#	src/test/java/fr/xephi/authme/util/StringUtilsTest.java
#	src/test/java/fr/xephi/authme/util/lazytags/TagBuilderTest.java
…o junit5-migration

� Conflicts:
�	pom.xml
�	src/test/java/fr/xephi/authme/TestHelper.java
�	src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java
�	src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java
�	src/test/java/fr/xephi/authme/permission/PermissionsManagerInitializationTest.java
�	src/test/java/fr/xephi/authme/process/register/AsyncRegisterTest.java
�	src/test/java/fr/xephi/authme/service/GeoIpServiceTest.java
�	src/test/java/fr/xephi/authme/service/MigrationServiceTest.java
�	src/test/java/fr/xephi/authme/settings/properties/AuthMeSettingsRetrieverTest.java
�	src/test/java/fr/xephi/authme/util/ExceptionUtilsTest.java
�	src/test/java/fr/xephi/authme/util/InternetProtocolUtilsTest.java
�	src/test/java/fr/xephi/authme/util/RandomStringUtilsTest.java
�	src/test/java/fr/xephi/authme/util/StringUtilsTest.java
�	src/test/java/fr/xephi/authme/util/lazytags/TagBuilderTest.java
…gration

# Conflicts:
#	src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java
#	src/test/java/fr/xephi/authme/process/register/AsyncRegisterTest.java
#	src/test/java/fr/xephi/authme/service/GeoIpServiceTest.java
#	src/test/java/fr/xephi/authme/service/MigrationServiceTest.java
# Conflicts:
#	pom.xml
#	src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java
#	src/test/java/fr/xephi/authme/service/AntiBotServiceTest.java
…ntage!

- This commit ends the migration to JUnit 5 and removes the junit-vintage dependency
- Make some remaining tests & classes package-private
# Conflicts:
#	src/test/java/fr/xephi/authme/command/executable/authme/debug/MySqlDefaultChangerTest.java
#	src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java
#	src/test/java/fr/xephi/authme/permission/handlers/VaultHandlerTest.java
#	src/test/java/fr/xephi/authme/process/email/AsyncChangeEmailTest.java
# Conflicts:
#	src/test/java/fr/xephi/authme/api/v3/AuthMeApiTest.java
#	src/test/java/fr/xephi/authme/output/Log4JFilterTest.java
#	src/test/java/fr/xephi/authme/process/register/AsyncRegisterTest.java
#	src/test/java/fr/xephi/authme/security/crypts/AbstractEncryptionMethodTest.java
#	src/test/java/fr/xephi/authme/service/ValidationServiceTest.java
#	src/test/java/fr/xephi/authme/settings/SettingsWarnerTest.java
#	src/test/java/fr/xephi/authme/settings/commandconfig/CommandManagerTest.java
#	src/test/java/fr/xephi/authme/util/StringUtilsTest.java
# Conflicts:
#	src/test/java/fr/xephi/authme/service/GeoIpServiceTest.java
- Update JUnit, Hamcrest, Mockito versions
- Remove Hamcrest exclusion from Mockito (they've removed Hamcrest as dependency a long time ago)
- Remove public modifiers from test methods and refactor them to be in line with our usual pattern
- Remove custom extension and InjectDelayed/BeforeInjecting annotations
- Revert injector version to same stable version as on master
@ljacqu ljacqu mentioned this pull request Apr 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant