You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2022/05/30 09:14:14 UTC
[logging-log4j2] branch release-2.x updated: Fix cleanup procedure after H2 tests
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new a5532c6759 Fix cleanup procedure after H2 tests
a5532c6759 is described below
commit a5532c67598e85dd5e3de0ecb5288b20148f76dc
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Mon May 30 11:14:07 2022 +0200
Fix cleanup procedure after H2 tests
A cleanup procedure for H2 tests, which require a file DB, was present,
but didn't work.
---
.../logging/log4j/core/appender/db/jdbc/AbstractH2Test.java | 8 --------
.../appender/db/jdbc/JdbcAppenderColumnMappingLiteralTest.java | 6 ------
.../logging/log4j/core/appender/db/jdbc/JdbcH2TestHelper.java | 4 ++--
3 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractH2Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractH2Test.java
index 9f2133b4ee..49e156890b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractH2Test.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractH2Test.java
@@ -18,9 +18,7 @@ package org.apache.logging.log4j.core.appender.db.jdbc;
import java.io.IOException;
-import org.junit.After;
import org.junit.AfterClass;
-import org.junit.Before;
import org.junit.BeforeClass;
/**
@@ -34,10 +32,4 @@ public abstract class AbstractH2Test {
JdbcH2TestHelper.deleteDir();
}
- @After
- @Before
- public void deleteDir() throws IOException {
- JdbcH2TestHelper.deleteDir();
- }
-
}
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderColumnMappingLiteralTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderColumnMappingLiteralTest.java
index 3610ab060f..ae0c72d2e3 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderColumnMappingLiteralTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderColumnMappingLiteralTest.java
@@ -51,12 +51,6 @@ public class JdbcAppenderColumnMappingLiteralTest extends AbstractH2Test {
}
protected JdbcAppenderColumnMappingLiteralTest(final JdbcRule jdbcRule) {
- try {
- JdbcH2TestHelper.deleteDir();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
this.rules = RuleChainFactory.create(jdbcRule, new LoggerContextRule(
"org/apache/logging/log4j/core/appender/db/jdbc/log4j2-dm-column-mapping-literal.xml"));
this.jdbcRule = jdbcRule;
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcH2TestHelper.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcH2TestHelper.java
index 6786f8915c..5ad4189e79 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcH2TestHelper.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcH2TestHelper.java
@@ -36,7 +36,7 @@ public class JdbcH2TestHelper {
/**
* A JDBC connection string for an H2 database in the Java temporary directory.
*/
- static final String CONNECTION_STRING_TEMP_DIR = "jdbc:h2:" + getH2Path() + ";TRACE_LEVEL_SYSTEM_OUT=0";
+ static final String CONNECTION_STRING_TEMP_DIR = "jdbc:h2:" + getH2Path() + "/test_log4j;TRACE_LEVEL_SYSTEM_OUT=0";
static final String USER_NAME = "sa";
static final String PASSWORD = "";
@@ -56,7 +56,7 @@ public class JdbcH2TestHelper {
};
/** Directory used in configuration files and connection strings. */
- static final String H2_TEST_RELATIVE_DIR = "h2/test_log4j";
+ static final String H2_TEST_RELATIVE_DIR = "h2";
static void deleteDir() throws IOException {
final Path resolve = getH2Path();