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 2023/01/24 08:42:06 UTC
[logging-log4j2] branch master updated (fcfd38b3da -> 9c4b8e0545)
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from fcfd38b3da Sync .asf.yaml
new bb8da324e0 Fix JDBC tests after H2 upgrade
new 9c4b8e0545 Fix JPA tests (switch to Postgres compatibility)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../appender/JdbcAppenderColumnMappingLiteralTest.java | 18 +++++++++---------
.../jdbc/appender/JdbcAppenderH2DataSourceTest.java | 4 ++--
.../jdbc/appender/JdbcAppenderH2FactoryMethodTest.java | 7 ++++---
.../logging/log4j/jdbc/appender/JdbcH2TestHelper.java | 2 +-
.../logging/log4j/jpa/appender/JpaH2AppenderTest.java | 4 ++--
log4j-jpa/src/test/resources/META-INF/persistence.xml | 7 ++++++-
6 files changed, 24 insertions(+), 18 deletions(-)
[logging-log4j2] 01/02: Fix JDBC tests after H2 upgrade
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit bb8da324e0b5609b67e933509724acb9ba1e57e3
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Tue Jan 24 07:58:17 2023 +0100
Fix JDBC tests after H2 upgrade
---
.../appender/JdbcAppenderColumnMappingLiteralTest.java | 18 +++++++++---------
.../jdbc/appender/JdbcAppenderH2DataSourceTest.java | 4 ++--
.../jdbc/appender/JdbcAppenderH2FactoryMethodTest.java | 7 ++++---
.../logging/log4j/jdbc/appender/JdbcH2TestHelper.java | 2 +-
4 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcAppenderColumnMappingLiteralTest.java b/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcAppenderColumnMappingLiteralTest.java
index a7ad418d09..83d0706aed 100644
--- a/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcAppenderColumnMappingLiteralTest.java
+++ b/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcAppenderColumnMappingLiteralTest.java
@@ -16,12 +16,7 @@
*/
package org.apache.logging.log4j.jdbc.appender;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import java.io.ByteArrayOutputStream;
-import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
import java.sql.ResultSet;
@@ -29,14 +24,18 @@ import java.sql.Statement;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.apache.logging.log4j.core.test.RuleChainFactory;
+import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
import org.h2.util.IOUtils;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
-public class JdbcAppenderColumnMappingLiteralTest {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class JdbcAppenderColumnMappingLiteralTest extends AbstractH2Test {
@Rule
public final RuleChain rules;
@@ -44,8 +43,9 @@ public class JdbcAppenderColumnMappingLiteralTest {
public JdbcAppenderColumnMappingLiteralTest() {
this(new JdbcRule(JdbcH2TestHelper.TEST_CONFIGURATION_SOURCE_TMPDIR,
- "CREATE TABLE dsMappingLogEntry (id INTEGER IDENTITY, level VARCHAR(10), logger VARCHAR(255), message VARCHAR(1024), exception CLOB)",
- "DROP TABLE dsMappingLogEntry"));
+ "CREATE TABLE dsMappingLogEntry (id INTEGER GENERATED BY DEFAULT AS IDENTITY, "
+ + " level VARCHAR(10), logger VARCHAR(255), message VARCHAR(1024), exception CLOB)",
+ "DROP TABLE IF EXISTS dsMappingLogEntry"));
}
protected JdbcAppenderColumnMappingLiteralTest(final JdbcRule jdbcRule) {
diff --git a/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcAppenderH2DataSourceTest.java b/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcAppenderH2DataSourceTest.java
index 011193a6e2..6244974848 100644
--- a/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcAppenderH2DataSourceTest.java
+++ b/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcAppenderH2DataSourceTest.java
@@ -23,8 +23,8 @@ public class JdbcAppenderH2DataSourceTest extends AbstractJdbcAppenderDataSource
public JdbcAppenderH2DataSourceTest() {
super(new JdbcRule(JdbcH2TestHelper.TEST_CONFIGURATION_SOURCE_MEM,
"CREATE TABLE dsLogEntry ("
- + "id INTEGER IDENTITY, eventDate DATETIME, literalColumn VARCHAR(255), level NVARCHAR(10), "
+ + "id INTEGER GENERATED BY DEFAULT AS IDENTITY, eventDate DATETIME, literalColumn VARCHAR(255), level NVARCHAR(10), "
+ "logger NVARCHAR(255), message VARCHAR(1024), exception NCLOB, anotherDate TIMESTAMP" + ")",
- "DROP TABLE dsLogEntry"));
+ "DROP TABLE IF EXISTS dsLogEntry"));
}
}
diff --git a/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcAppenderH2FactoryMethodTest.java b/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcAppenderH2FactoryMethodTest.java
index e4e0af1467..fbe59c3e89 100644
--- a/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcAppenderH2FactoryMethodTest.java
+++ b/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcAppenderH2FactoryMethodTest.java
@@ -26,9 +26,10 @@ public class JdbcAppenderH2FactoryMethodTest extends AbstractJdbcAppenderFactory
public JdbcAppenderH2FactoryMethodTest() {
super(new JdbcRule(JdbcH2TestHelper.TEST_CONFIGURATION_SOURCE_MEM,
"CREATE TABLE fmLogEntry ("
- + "id INTEGER IDENTITY, eventDate DATETIME, literalColumn VARCHAR(255), level NVARCHAR(10), "
- + "logger NVARCHAR(255), message VARCHAR(1024), exception NCLOB, anotherDate TIMESTAMP)",
- "DROP TABLE fmLogEntry"), "h2");
+ + "id INTEGER GENERATED BY DEFAULT AS IDENTITY, eventDate DATETIME, literalColumn VARCHAR(255), "
+ + "level NVARCHAR(10), logger NVARCHAR(255), message VARCHAR(1024), exception NCLOB, "
+ + "anotherDate TIMESTAMP)",
+ "DROP TABLE IF EXISTS fmLogEntry"), "h2");
}
public static Connection getConnection() throws SQLException {
diff --git a/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcH2TestHelper.java b/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcH2TestHelper.java
index 61269e0707..f8a5217626 100644
--- a/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcH2TestHelper.java
+++ b/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcH2TestHelper.java
@@ -59,7 +59,7 @@ public class JdbcH2TestHelper {
static final String H2_TEST_RELATIVE_DIR = "h2/test_log4j";
static void deleteDir() throws IOException {
- final Path resolve = getH2Path();
+ final Path resolve = getH2Path().getParent();
if (Files.exists(resolve)) {
PathUtils.deleteDirectory(resolve);
}
[logging-log4j2] 02/02: Fix JPA tests (switch to Postgres compatibility)
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 9c4b8e054534172908795e70bd264388158c3354
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Tue Jan 24 09:25:09 2023 +0100
Fix JPA tests (switch to Postgres compatibility)
---
.../org/apache/logging/log4j/jpa/appender/JpaH2AppenderTest.java | 4 ++--
log4j-jpa/src/test/resources/META-INF/persistence.xml | 7 ++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/JpaH2AppenderTest.java b/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/JpaH2AppenderTest.java
index c3439cc615..cfb9adb5d1 100644
--- a/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/JpaH2AppenderTest.java
+++ b/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/JpaH2AppenderTest.java
@@ -40,13 +40,13 @@ public class JpaH2AppenderTest extends AbstractJpaAppenderTest {
try (Statement statement = connection.createStatement()) {
statement.executeUpdate("CREATE TABLE jpaBaseLogEntry ( "
- + "id INTEGER IDENTITY, eventDate DATETIME, instant NVARCHAR(64), level NVARCHAR(10), "
+ + "id INTEGER GENERATED ALWAYS AS IDENTITY, eventDate DATETIME, instant NVARCHAR(64), level NVARCHAR(10), "
+ "logger NVARCHAR(255), message NVARCHAR(1024), exception NVARCHAR(1048576)" + " )");
}
try (Statement statement = connection.createStatement()) {
statement.executeUpdate("CREATE TABLE jpaBasicLogEntry ( "
- + "id INTEGER IDENTITY, timemillis BIGINT, instant NVARCHAR(64), nanoTime BIGINT, "
+ + "id INTEGER GENERATED ALWAYS AS IDENTITY, timemillis BIGINT, instant NVARCHAR(64), nanoTime BIGINT, "
+ "level NVARCHAR(10), loggerName NVARCHAR(255), message NVARCHAR(1024), "
+ "thrown NVARCHAR(1048576), contextMapJson NVARCHAR(1048576), loggerFQCN NVARCHAR(1024), "
+ "contextStack NVARCHAR(1048576), marker NVARCHAR(255), source NVARCHAR(2048),"
diff --git a/log4j-jpa/src/test/resources/META-INF/persistence.xml b/log4j-jpa/src/test/resources/META-INF/persistence.xml
index 209ae2176e..8b4e1d2c71 100644
--- a/log4j-jpa/src/test/resources/META-INF/persistence.xml
+++ b/log4j-jpa/src/test/resources/META-INF/persistence.xml
@@ -63,9 +63,14 @@
<shared-cache-mode>NONE</shared-cache-mode>
<properties>
<property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
- <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:Log4j"/>
+ <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:Log4j;MODE=PostgreSQL"/>
<property name="javax.persistence.jdbc.user" value="sa"/>
<property name="javax.persistence.jdbc.password" value=""/>
+ <!--
+ Until the issue in https://github.com/eclipse-ee4j/eclipselink/issues/1393
+ we run in PostgreSQL compatibility mode.
+ -->
+ <property name="eclipselink.target-database" value="PostgreSQL"/>
<!--<property name="eclipselink.logging.level" value="FINE"/>
<property name="eclipselink.logging.level.sql" value="FINE"/>
<property name="eclipselink.logging.parameters" value="true"/> uncomment to troubleshoot SQL-->