diff --git a/pom.xml b/pom.xml index 62b9a968e..dbe9cf77a 100644 --- a/pom.xml +++ b/pom.xml @@ -922,12 +922,6 @@ test 5.7.1 - - org.junit.vintage - junit-vintage-engine - test - 5.7.1 - org.junit.jupiter junit-jupiter-params diff --git a/src/test/java/fr/xephi/authme/ClassesConsistencyTest.java b/src/test/java/fr/xephi/authme/ClassesConsistencyTest.java index 35c14c166..b6452554d 100644 --- a/src/test/java/fr/xephi/authme/ClassesConsistencyTest.java +++ b/src/test/java/fr/xephi/authme/ClassesConsistencyTest.java @@ -34,7 +34,7 @@ import java.util.stream.Collectors; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Contains consistency tests across all AuthMe classes. diff --git a/src/test/java/fr/xephi/authme/CodeClimateConfigTest.java b/src/test/java/fr/xephi/authme/CodeClimateConfigTest.java index 7c3f83a91..1e814536d 100644 --- a/src/test/java/fr/xephi/authme/CodeClimateConfigTest.java +++ b/src/test/java/fr/xephi/authme/CodeClimateConfigTest.java @@ -11,7 +11,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Consistency test for the CodeClimate configuration file. diff --git a/src/test/java/fr/xephi/authme/IsEqualByReflectionMatcher.java b/src/test/java/fr/xephi/authme/IsEqualByReflectionMatcher.java index 2acf5ee70..0ce5b19ae 100644 --- a/src/test/java/fr/xephi/authme/IsEqualByReflectionMatcher.java +++ b/src/test/java/fr/xephi/authme/IsEqualByReflectionMatcher.java @@ -10,7 +10,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; + /** * Matcher which checks with reflection that all fields have the same value. diff --git a/src/test/java/fr/xephi/authme/api/v3/AuthMeApiTest.java b/src/test/java/fr/xephi/authme/api/v3/AuthMeApiTest.java index 4a266b806..6a9a9554f 100644 --- a/src/test/java/fr/xephi/authme/api/v3/AuthMeApiTest.java +++ b/src/test/java/fr/xephi/authme/api/v3/AuthMeApiTest.java @@ -514,7 +514,7 @@ class AuthMeApiTest { } @Test - public void shouldReturnAuthMePlayerInfo() { + void shouldReturnAuthMePlayerInfo() { // given PlayerAuth auth = PlayerAuth.builder() .name("bobb") @@ -533,7 +533,7 @@ class AuthMeApiTest { } @Test - public void shouldReturnNullForNonExistentAuth() { + void shouldReturnNullForNonExistentAuth() { // given / when Optional result = api.getPlayerInfo("doesNotExist"); diff --git a/src/test/java/fr/xephi/authme/command/CommandInitializerTest.java b/src/test/java/fr/xephi/authme/command/CommandInitializerTest.java index a9a6661cd..98477c728 100644 --- a/src/test/java/fr/xephi/authme/command/CommandInitializerTest.java +++ b/src/test/java/fr/xephi/authme/command/CommandInitializerTest.java @@ -17,7 +17,7 @@ import java.util.regex.Pattern; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Test for {@link CommandInitializer} to guarantee the integrity of the defined commands. diff --git a/src/test/java/fr/xephi/authme/command/executable/authme/debug/DebugSectionConsistencyTest.java b/src/test/java/fr/xephi/authme/command/executable/authme/debug/DebugSectionConsistencyTest.java index 92d007ccf..f5be549df 100644 --- a/src/test/java/fr/xephi/authme/command/executable/authme/debug/DebugSectionConsistencyTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/authme/debug/DebugSectionConsistencyTest.java @@ -14,7 +14,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Consistency tests for {@link DebugSection} implementors. @@ -45,7 +45,7 @@ class DebugSectionConsistencyTest { } @Test - void shouldHaveDifferentSubcommandName() throws IllegalAccessException, InstantiationException { + void shouldHaveDifferentSubcommandName() { Set names = new HashSet<>(); for (DebugSection debugSection : debugSections) { if (!names.add(debugSection.getName())) { diff --git a/src/test/java/fr/xephi/authme/command/executable/authme/debug/MySqlDefaultChangerColumnsTest.java b/src/test/java/fr/xephi/authme/command/executable/authme/debug/MySqlDefaultChangerColumnsTest.java index 8b6b3ff93..46649651f 100644 --- a/src/test/java/fr/xephi/authme/command/executable/authme/debug/MySqlDefaultChangerColumnsTest.java +++ b/src/test/java/fr/xephi/authme/command/executable/authme/debug/MySqlDefaultChangerColumnsTest.java @@ -7,7 +7,7 @@ import java.util.Set; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Consistency test for {@link MySqlDefaultChanger.Columns} enum. diff --git a/src/test/java/fr/xephi/authme/command/help/HelpMessageAndHelpSectionConsistencyTest.java b/src/test/java/fr/xephi/authme/command/help/HelpMessageAndHelpSectionConsistencyTest.java index 04c9eaad0..9376e866c 100644 --- a/src/test/java/fr/xephi/authme/command/help/HelpMessageAndHelpSectionConsistencyTest.java +++ b/src/test/java/fr/xephi/authme/command/help/HelpMessageAndHelpSectionConsistencyTest.java @@ -8,7 +8,7 @@ import java.util.Set; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Test for enums {@link HelpMessage} and {@link HelpSection}. diff --git a/src/test/java/fr/xephi/authme/data/auth/PlayerAuthTest.java b/src/test/java/fr/xephi/authme/data/auth/PlayerAuthTest.java index 70fbc6e0a..679dc52a0 100644 --- a/src/test/java/fr/xephi/authme/data/auth/PlayerAuthTest.java +++ b/src/test/java/fr/xephi/authme/data/auth/PlayerAuthTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Test for {@link PlayerAuth} and its builder. diff --git a/src/test/java/fr/xephi/authme/data/limbo/persistence/LimboPersistenceTypeTest.java b/src/test/java/fr/xephi/authme/data/limbo/persistence/LimboPersistenceTypeTest.java index 5a7776f75..487e05ce1 100644 --- a/src/test/java/fr/xephi/authme/data/limbo/persistence/LimboPersistenceTypeTest.java +++ b/src/test/java/fr/xephi/authme/data/limbo/persistence/LimboPersistenceTypeTest.java @@ -7,7 +7,7 @@ import java.util.Set; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; diff --git a/src/test/java/fr/xephi/authme/data/limbo/persistence/SegmentSizeTest.java b/src/test/java/fr/xephi/authme/data/limbo/persistence/SegmentSizeTest.java index 431435208..4ecee772f 100644 --- a/src/test/java/fr/xephi/authme/data/limbo/persistence/SegmentSizeTest.java +++ b/src/test/java/fr/xephi/authme/data/limbo/persistence/SegmentSizeTest.java @@ -9,7 +9,7 @@ import java.util.Set; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Test for {@link SegmentSize}. diff --git a/src/test/java/fr/xephi/authme/datasource/AbstractDataSourceIntegrationTest.java b/src/test/java/fr/xephi/authme/datasource/AbstractDataSourceIntegrationTest.java index a143c7af7..3caae0178 100644 --- a/src/test/java/fr/xephi/authme/datasource/AbstractDataSourceIntegrationTest.java +++ b/src/test/java/fr/xephi/authme/datasource/AbstractDataSourceIntegrationTest.java @@ -26,7 +26,6 @@ import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assume.assumeThat; /** * Abstract class for data source integration tests. @@ -256,7 +255,7 @@ public abstract class AbstractDataSourceIntegrationTest { // given DataSource dataSource = getDataSource(); Set playersToDelete = new HashSet<>(Arrays.asList("bobby", "doesNotExist")); - assumeThat(dataSource.getAccountsRegistered(), equalTo(2)); + assertThat(dataSource.getAccountsRegistered(), equalTo(2)); // Make sure we start as expected // when dataSource.purgeRecords(playersToDelete); diff --git a/src/test/java/fr/xephi/authme/datasource/MySqlIntegrationTest.java b/src/test/java/fr/xephi/authme/datasource/MySqlIntegrationTest.java index c818fb569..5978fca37 100644 --- a/src/test/java/fr/xephi/authme/datasource/MySqlIntegrationTest.java +++ b/src/test/java/fr/xephi/authme/datasource/MySqlIntegrationTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.when; /** * Integration test for {@link MySQL}. */ -public class MySqlIntegrationTest extends AbstractDataSourceIntegrationTest { +class MySqlIntegrationTest extends AbstractDataSourceIntegrationTest { /** Mock of a settings instance. */ private static Settings settings; diff --git a/src/test/java/fr/xephi/authme/datasource/MySqlResourceClosingTest.java b/src/test/java/fr/xephi/authme/datasource/MySqlResourceClosingTest.java index a794bb4fb..fcc75643c 100644 --- a/src/test/java/fr/xephi/authme/datasource/MySqlResourceClosingTest.java +++ b/src/test/java/fr/xephi/authme/datasource/MySqlResourceClosingTest.java @@ -14,7 +14,7 @@ import static org.mockito.Mockito.mock; /** * Resource closing test for {@link MySQL}. */ -public class MySqlResourceClosingTest extends AbstractSqlDataSourceResourceClosingTest { +class MySqlResourceClosingTest extends AbstractSqlDataSourceResourceClosingTest { @Override protected DataSource createDataSource(Settings settings, Connection connection) throws Exception { diff --git a/src/test/java/fr/xephi/authme/datasource/PostgreSqlIntegrationTest.java b/src/test/java/fr/xephi/authme/datasource/PostgreSqlIntegrationTest.java index e9cf41303..6d5afb53d 100644 --- a/src/test/java/fr/xephi/authme/datasource/PostgreSqlIntegrationTest.java +++ b/src/test/java/fr/xephi/authme/datasource/PostgreSqlIntegrationTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.when; /** * Integration test for {@link PostgreSqlDataSource}. */ -public class PostgreSqlIntegrationTest extends AbstractDataSourceIntegrationTest { +class PostgreSqlIntegrationTest extends AbstractDataSourceIntegrationTest { /** Mock of a settings instance. */ private static Settings settings; diff --git a/src/test/java/fr/xephi/authme/datasource/PostgreSqlResourceClosingTest.java b/src/test/java/fr/xephi/authme/datasource/PostgreSqlResourceClosingTest.java index 0ffcc55d0..56e7cb100 100644 --- a/src/test/java/fr/xephi/authme/datasource/PostgreSqlResourceClosingTest.java +++ b/src/test/java/fr/xephi/authme/datasource/PostgreSqlResourceClosingTest.java @@ -14,7 +14,7 @@ import static org.mockito.Mockito.mock; /** * Resource closing test for {@link PostgreSqlDataSource}. */ -public class PostgreSqlResourceClosingTest extends AbstractSqlDataSourceResourceClosingTest { +class PostgreSqlResourceClosingTest extends AbstractSqlDataSourceResourceClosingTest { @Override protected DataSource createDataSource(Settings settings, Connection connection) throws Exception { diff --git a/src/test/java/fr/xephi/authme/datasource/SQLiteResourceClosingTest.java b/src/test/java/fr/xephi/authme/datasource/SQLiteResourceClosingTest.java index 5600b0ad4..8fd6779ba 100644 --- a/src/test/java/fr/xephi/authme/datasource/SQLiteResourceClosingTest.java +++ b/src/test/java/fr/xephi/authme/datasource/SQLiteResourceClosingTest.java @@ -7,7 +7,7 @@ import java.sql.Connection; /** * Resource closing test for {@link SQLite}. */ -public class SQLiteResourceClosingTest extends AbstractSqlDataSourceResourceClosingTest { +class SQLiteResourceClosingTest extends AbstractSqlDataSourceResourceClosingTest { @Override protected DataSource createDataSource(Settings settings, Connection connection) { diff --git a/src/test/java/fr/xephi/authme/datasource/mysqlextensions/Ipb4ExtensionResourceClosingTest.java b/src/test/java/fr/xephi/authme/datasource/mysqlextensions/Ipb4ExtensionResourceClosingTest.java index 4a2d7f1e2..e2398f13a 100644 --- a/src/test/java/fr/xephi/authme/datasource/mysqlextensions/Ipb4ExtensionResourceClosingTest.java +++ b/src/test/java/fr/xephi/authme/datasource/mysqlextensions/Ipb4ExtensionResourceClosingTest.java @@ -6,7 +6,7 @@ import fr.xephi.authme.settings.Settings; /** * Resource closing test for {@link Ipb4Extension}. */ -public class Ipb4ExtensionResourceClosingTest extends AbstractMySqlExtensionResourceClosingTest { +class Ipb4ExtensionResourceClosingTest extends AbstractMySqlExtensionResourceClosingTest { @Override protected MySqlExtension createExtension(Settings settings, Columns columns) { diff --git a/src/test/java/fr/xephi/authme/datasource/mysqlextensions/PhpBbExtensionResourceClosingTest.java b/src/test/java/fr/xephi/authme/datasource/mysqlextensions/PhpBbExtensionResourceClosingTest.java index 1156dde9f..64a252c96 100644 --- a/src/test/java/fr/xephi/authme/datasource/mysqlextensions/PhpBbExtensionResourceClosingTest.java +++ b/src/test/java/fr/xephi/authme/datasource/mysqlextensions/PhpBbExtensionResourceClosingTest.java @@ -6,7 +6,7 @@ import fr.xephi.authme.settings.Settings; /** * Resource closing test for {@link PhpBbExtension}. */ -public class PhpBbExtensionResourceClosingTest extends AbstractMySqlExtensionResourceClosingTest { +class PhpBbExtensionResourceClosingTest extends AbstractMySqlExtensionResourceClosingTest { @Override protected MySqlExtension createExtension(Settings settings, Columns columns) { diff --git a/src/test/java/fr/xephi/authme/datasource/mysqlextensions/WordpressExtensionResourceClosingTest.java b/src/test/java/fr/xephi/authme/datasource/mysqlextensions/WordpressExtensionResourceClosingTest.java index 20a51a6f4..62e737dc8 100644 --- a/src/test/java/fr/xephi/authme/datasource/mysqlextensions/WordpressExtensionResourceClosingTest.java +++ b/src/test/java/fr/xephi/authme/datasource/mysqlextensions/WordpressExtensionResourceClosingTest.java @@ -6,7 +6,7 @@ import fr.xephi.authme.settings.Settings; /** * Resource closing test for {@link WordpressExtension}. */ -public class WordpressExtensionResourceClosingTest extends AbstractMySqlExtensionResourceClosingTest { +class WordpressExtensionResourceClosingTest extends AbstractMySqlExtensionResourceClosingTest { @Override protected MySqlExtension createExtension(Settings settings, Columns columns) { diff --git a/src/test/java/fr/xephi/authme/listener/ListenerConsistencyTest.java b/src/test/java/fr/xephi/authme/listener/ListenerConsistencyTest.java index 0ee523973..c953f80fc 100644 --- a/src/test/java/fr/xephi/authme/listener/ListenerConsistencyTest.java +++ b/src/test/java/fr/xephi/authme/listener/ListenerConsistencyTest.java @@ -18,7 +18,7 @@ import java.util.Set; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Test for verifying that AuthMe listener methods are well-formed. diff --git a/src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java b/src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java index 49ea0a79d..13e33895f 100644 --- a/src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java +++ b/src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java @@ -34,8 +34,8 @@ import java.util.List; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.fail; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/src/test/java/fr/xephi/authme/message/MessageFilePlaceholderTest.java b/src/test/java/fr/xephi/authme/message/MessageFilePlaceholderTest.java index 1e2a59fa4..bb016bdbc 100644 --- a/src/test/java/fr/xephi/authme/message/MessageFilePlaceholderTest.java +++ b/src/test/java/fr/xephi/authme/message/MessageFilePlaceholderTest.java @@ -16,7 +16,7 @@ import java.util.List; import java.util.stream.Collectors; import static fr.xephi.authme.message.MessagePathHelper.MESSAGES_FOLDER; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import static tools.utils.FileIoUtils.listFilesOrThrow; /** diff --git a/src/test/java/fr/xephi/authme/message/MessageKeyTest.java b/src/test/java/fr/xephi/authme/message/MessageKeyTest.java index c34b66558..2a2f3caf1 100644 --- a/src/test/java/fr/xephi/authme/message/MessageKeyTest.java +++ b/src/test/java/fr/xephi/authme/message/MessageKeyTest.java @@ -9,7 +9,7 @@ import java.util.Set; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.matchesPattern; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Test for {@link MessageKey}. diff --git a/src/test/java/fr/xephi/authme/message/MessagesFileConsistencyTest.java b/src/test/java/fr/xephi/authme/message/MessagesFileConsistencyTest.java index b7385b605..afcd46954 100644 --- a/src/test/java/fr/xephi/authme/message/MessagesFileConsistencyTest.java +++ b/src/test/java/fr/xephi/authme/message/MessagesFileConsistencyTest.java @@ -10,7 +10,7 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Tests that the project's default language file contains a text for all message keys. diff --git a/src/test/java/fr/xephi/authme/message/YamlTextFileCheckerTest.java b/src/test/java/fr/xephi/authme/message/YamlTextFileCheckerTest.java index 3a2afa72a..537916523 100644 --- a/src/test/java/fr/xephi/authme/message/YamlTextFileCheckerTest.java +++ b/src/test/java/fr/xephi/authme/message/YamlTextFileCheckerTest.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.function.Predicate; import static fr.xephi.authme.message.MessagePathHelper.MESSAGES_FOLDER; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import static tools.utils.FileIoUtils.listFilesOrThrow; /** diff --git a/src/test/java/fr/xephi/authme/message/updater/OldMessageKeysMigraterTest.java b/src/test/java/fr/xephi/authme/message/updater/OldMessageKeysMigraterTest.java index 1abb3ac49..70101d699 100644 --- a/src/test/java/fr/xephi/authme/message/updater/OldMessageKeysMigraterTest.java +++ b/src/test/java/fr/xephi/authme/message/updater/OldMessageKeysMigraterTest.java @@ -9,7 +9,7 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Test for {@link OldMessageKeysMigrater}. diff --git a/src/test/java/fr/xephi/authme/permission/AbstractPermissionsEnumTest.java b/src/test/java/fr/xephi/authme/permission/AbstractPermissionsEnumTest.java index 2a6d1eef9..71799d842 100644 --- a/src/test/java/fr/xephi/authme/permission/AbstractPermissionsEnumTest.java +++ b/src/test/java/fr/xephi/authme/permission/AbstractPermissionsEnumTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import java.util.HashSet; import java.util.Set; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Has common tests for enums implementing {@link PermissionNode}. diff --git a/src/test/java/fr/xephi/authme/permission/AdminPermissionTest.java b/src/test/java/fr/xephi/authme/permission/AdminPermissionTest.java index f3e4f1fde..f98f6452a 100644 --- a/src/test/java/fr/xephi/authme/permission/AdminPermissionTest.java +++ b/src/test/java/fr/xephi/authme/permission/AdminPermissionTest.java @@ -3,7 +3,7 @@ package fr.xephi.authme.permission; /** * Test for {@link AdminPermission}. */ -public class AdminPermissionTest extends AbstractPermissionsEnumTest { +class AdminPermissionTest extends AbstractPermissionsEnumTest { @Override protected PermissionNode[] getPermissionNodes() { diff --git a/src/test/java/fr/xephi/authme/permission/DebugSectionPermissionsTest.java b/src/test/java/fr/xephi/authme/permission/DebugSectionPermissionsTest.java index 3e0a9f013..2da9aa1ce 100644 --- a/src/test/java/fr/xephi/authme/permission/DebugSectionPermissionsTest.java +++ b/src/test/java/fr/xephi/authme/permission/DebugSectionPermissionsTest.java @@ -3,7 +3,7 @@ package fr.xephi.authme.permission; /** * Test for {@link DebugSectionPermissions}. */ -public class DebugSectionPermissionsTest extends AbstractPermissionsEnumTest { +class DebugSectionPermissionsTest extends AbstractPermissionsEnumTest { @Override protected PermissionNode[] getPermissionNodes() { diff --git a/src/test/java/fr/xephi/authme/permission/PermissionConsistencyTest.java b/src/test/java/fr/xephi/authme/permission/PermissionConsistencyTest.java index 3284bc0fd..728f684d7 100644 --- a/src/test/java/fr/xephi/authme/permission/PermissionConsistencyTest.java +++ b/src/test/java/fr/xephi/authme/permission/PermissionConsistencyTest.java @@ -22,7 +22,7 @@ import java.util.Set; import java.util.stream.Collectors; import static fr.xephi.authme.TestHelper.getJarFile; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Tests that the permissions listed in plugin.yml correspond to the ones in the code. diff --git a/src/test/java/fr/xephi/authme/permission/PermissionsManagerInitializationTest.java b/src/test/java/fr/xephi/authme/permission/PermissionsManagerInitializationTest.java index 2fb06c90f..ce3453867 100644 --- a/src/test/java/fr/xephi/authme/permission/PermissionsManagerInitializationTest.java +++ b/src/test/java/fr/xephi/authme/permission/PermissionsManagerInitializationTest.java @@ -19,7 +19,6 @@ import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.ServicesManager; -import org.junit.AssumptionViolatedException; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; @@ -41,6 +40,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.nullValue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.only; @@ -159,7 +159,7 @@ class PermissionsManagerInitializationTest { LuckPerms api = mock(LuckPerms.class); ReflectionTestUtils.setField(LuckPermsProvider.class, null, "instance", api); } else if (permissionsSystemType == PERMISSIONS_EX) { - throw new AssumptionViolatedException( + assumeTrue(false, "PermissionsEx instance cannot be mocked because of missing dependencies -- skipping"); } else if (permissionsSystemType == Z_PERMISSIONS) { ZPermissionsService zPermissionsService = mock(ZPermissionsService.class); diff --git a/src/test/java/fr/xephi/authme/permission/PlayerPermissionTest.java b/src/test/java/fr/xephi/authme/permission/PlayerPermissionTest.java index 32a45b98d..f4822d2ef 100644 --- a/src/test/java/fr/xephi/authme/permission/PlayerPermissionTest.java +++ b/src/test/java/fr/xephi/authme/permission/PlayerPermissionTest.java @@ -3,7 +3,7 @@ package fr.xephi.authme.permission; /** * Test for {@link PlayerPermission}. */ -public class PlayerPermissionTest extends AbstractPermissionsEnumTest { +class PlayerPermissionTest extends AbstractPermissionsEnumTest { @Override protected PermissionNode[] getPermissionNodes() { diff --git a/src/test/java/fr/xephi/authme/permission/PlayerStatePermissionTest.java b/src/test/java/fr/xephi/authme/permission/PlayerStatePermissionTest.java index 1be2b46a9..9ebc3bf04 100644 --- a/src/test/java/fr/xephi/authme/permission/PlayerStatePermissionTest.java +++ b/src/test/java/fr/xephi/authme/permission/PlayerStatePermissionTest.java @@ -6,7 +6,7 @@ import java.util.Collection; import java.util.Set; import static com.google.common.collect.Sets.newHashSet; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Test for {@link PlayerStatePermission}. diff --git a/src/test/java/fr/xephi/authme/security/HashAlgorithmIntegrationTest.java b/src/test/java/fr/xephi/authme/security/HashAlgorithmIntegrationTest.java index 9887d699c..bf8ac7bc4 100644 --- a/src/test/java/fr/xephi/authme/security/HashAlgorithmIntegrationTest.java +++ b/src/test/java/fr/xephi/authme/security/HashAlgorithmIntegrationTest.java @@ -22,7 +22,7 @@ import java.util.Set; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; diff --git a/src/test/java/fr/xephi/authme/security/crypts/AbstractEncryptionMethodTest.java b/src/test/java/fr/xephi/authme/security/crypts/AbstractEncryptionMethodTest.java index 9a78867c3..69d8ad6fc 100644 --- a/src/test/java/fr/xephi/authme/security/crypts/AbstractEncryptionMethodTest.java +++ b/src/test/java/fr/xephi/authme/security/crypts/AbstractEncryptionMethodTest.java @@ -10,11 +10,9 @@ import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; -import static junit.framework.TestCase.assertFalse; -import static junit.framework.TestCase.assertTrue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assume.assumeThat; +import static org.junit.jupiter.api.Assumptions.assumeFalse; /** * Test for implementations of {@link EncryptionMethod}. @@ -118,8 +116,8 @@ public abstract class AbstractEncryptionMethodTest { // Test entries in GIVEN_PASSWORDS except the last one for (int i = start; i < GIVEN_PASSWORDS.length - 1; ++i) { String password = GIVEN_PASSWORDS[i]; - assertTrue("Hash for password '" + password + "' should match", - doesGivenHashMatch(password, method)); + assertThat("Hash for password '" + password + "' should match", + doesGivenHashMatch(password, method), equalTo(true)); } // Note #375: Windows console seems to use its own character encoding (Windows-1252?) and it seems impossible to @@ -150,17 +148,17 @@ public abstract class AbstractEncryptionMethodTest { hash, equalTo(method.computeHash(password, salt, USERNAME))); } - assertTrue("Generated hash for '" + password + "' should match password (hash = '" + hash + "')", - method.comparePassword(password, hashedPassword, USERNAME)); - assumeThat(SKIP_LONG_TESTS, equalTo(false)); + assertThat("Generated hash for '" + password + "' should match password (hash = '" + hash + "')", + method.comparePassword(password, hashedPassword, USERNAME), equalTo(true)); + assumeFalse(SKIP_LONG_TESTS); if (!password.equals(password.toLowerCase())) { - assertFalse("Lower-case of '" + password + "' should not match generated hash '" + hash + "'", - method.comparePassword(password.toLowerCase(), hashedPassword, USERNAME)); + assertThat("Lower-case of '" + password + "' should not match generated hash '" + hash + "'", + method.comparePassword(password.toLowerCase(), hashedPassword, USERNAME), equalTo(false)); } if (!password.equals(password.toUpperCase())) { - assertFalse("Upper-case of '" + password + "' should not match generated hash '" + hash + "'", - method.comparePassword(password.toUpperCase(), hashedPassword, USERNAME)); + assertThat("Upper-case of '" + password + "' should not match generated hash '" + hash + "'", + method.comparePassword(password.toUpperCase(), hashedPassword, USERNAME), equalTo(false)); } } } @@ -168,12 +166,12 @@ public abstract class AbstractEncryptionMethodTest { /** Tests various strings to ensure that encryption methods don't rely on the hash's format too much. */ @Test void testMalformedHashes() { - assumeThat(SKIP_LONG_TESTS, equalTo(false)); + assumeFalse(SKIP_LONG_TESTS); String salt = method.hasSeparateSalt() ? "testSalt" : null; for (String bogusHash : BOGUS_HASHES) { HashedPassword hashedPwd = new HashedPassword(bogusHash, salt); - assertFalse("Passing bogus hash '" + bogusHash + "' does not result in an error", - method.comparePassword("Password", hashedPwd, "player")); + assertThat("Passing bogus hash '" + bogusHash + "' does not result in an error", + method.comparePassword("Password", hashedPwd, "player"), equalTo(false)); } } diff --git a/src/test/java/fr/xephi/authme/security/crypts/Argon2Test.java b/src/test/java/fr/xephi/authme/security/crypts/Argon2Test.java index 9a9b760f6..c6d8182b8 100644 --- a/src/test/java/fr/xephi/authme/security/crypts/Argon2Test.java +++ b/src/test/java/fr/xephi/authme/security/crypts/Argon2Test.java @@ -1,7 +1,6 @@ package fr.xephi.authme.security.crypts; -import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assume.assumeThat; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Test for {@link Argon2}. @@ -17,8 +16,7 @@ class Argon2Test extends AbstractEncryptionMethodTest { "$argon2i$v=19$m=65536,t=2,p=1$58v7dWNn9/bpD00QLzSebw$7cMC7p0qceE3Mgf2yQp4X7c+UkO9oyJwQ7S6XTBubNs", // &^%te$t?Pw@_ "$argon2i$v=19$m=65536,t=2,p=1$93OSU71DgBOzpmhti7+6rQ$sSSI6QQQdoG9DlGwLjYz576kTek89nwr9CyNpy6bsL0"); // âË_3(íù* - assumeThat("Argon2 library is not loaded - skipping test", - IS_LIBRARY_LOADED, equalTo(true)); + assumeTrue(IS_LIBRARY_LOADED, "Argon2 library is not loaded - skipping test"); } @Override diff --git a/src/test/java/fr/xephi/authme/security/crypts/Ipb4Test.java b/src/test/java/fr/xephi/authme/security/crypts/Ipb4Test.java index 54fc2fcd8..d8e775b4c 100644 --- a/src/test/java/fr/xephi/authme/security/crypts/Ipb4Test.java +++ b/src/test/java/fr/xephi/authme/security/crypts/Ipb4Test.java @@ -6,7 +6,7 @@ import static fr.xephi.authme.AuthMeMatchers.stringWithLength; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.startsWith; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Test for {@link Ipb4}. diff --git a/src/test/java/fr/xephi/authme/security/crypts/PhpBBTest.java b/src/test/java/fr/xephi/authme/security/crypts/PhpBBTest.java index 199eb8456..271073ecb 100644 --- a/src/test/java/fr/xephi/authme/security/crypts/PhpBBTest.java +++ b/src/test/java/fr/xephi/authme/security/crypts/PhpBBTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import java.util.Map; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Test for {@link PhpBB}. diff --git a/src/test/java/fr/xephi/authme/service/HelpTranslationGeneratorIntegrationTest.java b/src/test/java/fr/xephi/authme/service/HelpTranslationGeneratorIntegrationTest.java index b22235503..dca23ecf6 100644 --- a/src/test/java/fr/xephi/authme/service/HelpTranslationGeneratorIntegrationTest.java +++ b/src/test/java/fr/xephi/authme/service/HelpTranslationGeneratorIntegrationTest.java @@ -29,7 +29,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.BDDMockito.given; /** diff --git a/src/test/java/fr/xephi/authme/service/yaml/YamlFileResourceProviderTest.java b/src/test/java/fr/xephi/authme/service/yaml/YamlFileResourceProviderTest.java index c5750a540..78ad541c6 100644 --- a/src/test/java/fr/xephi/authme/service/yaml/YamlFileResourceProviderTest.java +++ b/src/test/java/fr/xephi/authme/service/yaml/YamlFileResourceProviderTest.java @@ -10,7 +10,7 @@ import java.io.File; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Test for {@link YamlFileResourceProvider}. diff --git a/src/test/java/fr/xephi/authme/settings/SettingsConsistencyTest.java b/src/test/java/fr/xephi/authme/settings/SettingsConsistencyTest.java index 79e87f71a..528d5b048 100644 --- a/src/test/java/fr/xephi/authme/settings/SettingsConsistencyTest.java +++ b/src/test/java/fr/xephi/authme/settings/SettingsConsistencyTest.java @@ -18,7 +18,7 @@ import java.util.Set; import java.util.stream.Collectors; import static fr.xephi.authme.ReflectionTestUtils.getFieldValue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Tests the consistency of the settings configuration. diff --git a/src/test/java/fr/xephi/authme/settings/properties/SettingsClassConsistencyTest.java b/src/test/java/fr/xephi/authme/settings/properties/SettingsClassConsistencyTest.java index 514c05852..2084b43dc 100644 --- a/src/test/java/fr/xephi/authme/settings/properties/SettingsClassConsistencyTest.java +++ b/src/test/java/fr/xephi/authme/settings/properties/SettingsClassConsistencyTest.java @@ -19,7 +19,7 @@ import java.util.Set; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * Test for {@link SettingsHolder} implementations.