From 51260fd22dda8ed1b8e93776353fb01d4925f447 Mon Sep 17 00:00:00 2001 From: ljacqu Date: Sun, 3 Nov 2019 17:38:14 +0100 Subject: [PATCH] Disable regular Hikari log statements during test execution - Also use mock logger instead of a real one in a few select tests to reduce the log output during tests --- .../AbstractSqlDataSourceResourceClosingTest.java | 14 ++++++-------- .../authme/datasource/SQLiteIntegrationTest.java | 2 +- .../PermissionsManagerInitializationTest.java | 2 +- src/test/resources/simplelogger.properties | 2 ++ 4 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 src/test/resources/simplelogger.properties diff --git a/src/test/java/fr/xephi/authme/datasource/AbstractSqlDataSourceResourceClosingTest.java b/src/test/java/fr/xephi/authme/datasource/AbstractSqlDataSourceResourceClosingTest.java index 1827a93a6..4443c54c7 100644 --- a/src/test/java/fr/xephi/authme/datasource/AbstractSqlDataSourceResourceClosingTest.java +++ b/src/test/java/fr/xephi/authme/datasource/AbstractSqlDataSourceResourceClosingTest.java @@ -9,9 +9,11 @@ import org.junit.runners.Parameterized; import java.lang.reflect.Method; import java.sql.Connection; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import static org.mockito.Mockito.mock; @@ -21,7 +23,7 @@ import static org.mockito.Mockito.mock; public abstract class AbstractSqlDataSourceResourceClosingTest extends AbstractResourceClosingTest { /** List of DataSource method names not to test. */ - private static final Set IGNORED_METHODS = ImmutableSet.of("reload", "getType"); + private static final Set IGNORED_METHODS = ImmutableSet.of("reload", "getType", "isCached"); private static Settings settings; @@ -64,12 +66,8 @@ public abstract class AbstractSqlDataSourceResourceClosingTest extends AbstractR /* Get all methods of the DataSource interface, minus the ones in the ignored list. */ private static List getDataSourceMethods() { - List publicMethods = new ArrayList<>(); - for (Method method : DataSource.class.getDeclaredMethods()) { - if (!IGNORED_METHODS.contains(method.getName()) && !method.isSynthetic()) { - publicMethods.add(method); - } - } - return publicMethods; + return Arrays.stream(DataSource.class.getDeclaredMethods()) + .filter(method -> !IGNORED_METHODS.contains(method.getName()) && !method.isSynthetic()) + .collect(Collectors.toList()); } } diff --git a/src/test/java/fr/xephi/authme/datasource/SQLiteIntegrationTest.java b/src/test/java/fr/xephi/authme/datasource/SQLiteIntegrationTest.java index bf6e915c6..06e60eeb6 100644 --- a/src/test/java/fr/xephi/authme/datasource/SQLiteIntegrationTest.java +++ b/src/test/java/fr/xephi/authme/datasource/SQLiteIntegrationTest.java @@ -47,7 +47,7 @@ public class SQLiteIntegrationTest extends AbstractDataSourceIntegrationTest { TestHelper.returnDefaultsForAllProperties(settings); set(DatabaseSettings.MYSQL_DATABASE, "sqlite-test"); set(DatabaseSettings.MYSQL_TABLE, "authme"); - TestHelper.setRealLogger(); + TestHelper.setupLogger(); Path sqlInitFile = TestHelper.getJarPath(TestHelper.PROJECT_ROOT + "datasource/sql-initialize.sql"); // Note ljacqu 20160221: It appears that we can only run one statement per Statement.execute() so we split diff --git a/src/test/java/fr/xephi/authme/permission/PermissionsManagerInitializationTest.java b/src/test/java/fr/xephi/authme/permission/PermissionsManagerInitializationTest.java index 26b29a83f..9e1c5be6a 100644 --- a/src/test/java/fr/xephi/authme/permission/PermissionsManagerInitializationTest.java +++ b/src/test/java/fr/xephi/authme/permission/PermissionsManagerInitializationTest.java @@ -64,7 +64,7 @@ public class PermissionsManagerInitializationTest { @BeforeClass public static void setUpLogger() { - TestHelper.setRealLogger(); + TestHelper.setupLogger(); } @Before diff --git a/src/test/resources/simplelogger.properties b/src/test/resources/simplelogger.properties new file mode 100644 index 000000000..56bab2197 --- /dev/null +++ b/src/test/resources/simplelogger.properties @@ -0,0 +1,2 @@ +# Suppress INFO statements when a new Hikari pool is being created +org.slf4j.simpleLogger.log.com.zaxxer.hikari=WARN