You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2017/03/07 07:49:38 UTC
logging-log4j2 git commit: Refactor existing test before playing with
[LOG4J2-1839]
Repository: logging-log4j2
Updated Branches:
refs/heads/master 9e7fe9e1a -> d5b5df4dc
Refactor existing test before playing with [LOG4J2-1839]
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d5b5df4d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d5b5df4d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d5b5df4d
Branch: refs/heads/master
Commit: d5b5df4dc9a314a2a48cd14223ac9007b4260273
Parents: 9e7fe9e
Author: ggregory <gg...@US-L-GG05.rocketsoftware.com>
Authored: Mon Mar 6 23:49:35 2017 -0800
Committer: ggregory <gg...@US-L-GG05.rocketsoftware.com>
Committed: Mon Mar 6 23:49:35 2017 -0800
----------------------------------------------------------------------
.../db/jdbc/JdbcAppenderH2DataSourceTest.java | 24 +++----------
.../jdbc/JdbcAppenderH2FactoryMethodTest.java | 24 ++++---------
.../core/appender/db/jdbc/JdbcH2TestHelper.java | 36 ++++++++++++++++++++
3 files changed, 47 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5b5df4d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderH2DataSourceTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderH2DataSourceTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderH2DataSourceTest.java
index 6bb7b62..acd14ca 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderH2DataSourceTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderH2DataSourceTest.java
@@ -16,10 +16,6 @@
*/
package org.apache.logging.log4j.core.appender.db.jdbc;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
import org.apache.logging.log4j.junit.JdbcRule;
/**
@@ -27,20 +23,10 @@ import org.apache.logging.log4j.junit.JdbcRule;
*/
public class JdbcAppenderH2DataSourceTest extends AbstractJdbcAppenderDataSourceTest {
public JdbcAppenderH2DataSourceTest() {
- super(
- new JdbcRule(
- new ConnectionSource() {
- @Override
- public Connection getConnection() throws SQLException {
- return DriverManager.getConnection("jdbc:h2:mem:Log4j", "sa", "");
- }
- },
- "CREATE TABLE dsLogEntry (" +
- "id INTEGER IDENTITY, eventDate DATETIME, literalColumn VARCHAR(255), level NVARCHAR(10), " +
- "logger NVARCHAR(255), message VARCHAR(1024), exception NCLOB, anotherDate TIMESTAMP" +
- ")",
- "DROP TABLE dsLogEntry"
- )
- );
+ super(new JdbcRule(JdbcH2TestHelper.TEST_CONFIGURATION_SOURCE,
+ "CREATE TABLE dsLogEntry ("
+ + "id INTEGER IDENTITY, eventDate DATETIME, literalColumn VARCHAR(255), level NVARCHAR(10), "
+ + "logger NVARCHAR(255), message VARCHAR(1024), exception NCLOB, anotherDate TIMESTAMP" + ")",
+ "DROP TABLE dsLogEntry"));
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5b5df4d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderH2FactoryMethodTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderH2FactoryMethodTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderH2FactoryMethodTest.java
index 54bfd17..c79b6ba 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderH2FactoryMethodTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppenderH2FactoryMethodTest.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.core.appender.db.jdbc;
import java.sql.Connection;
-import java.sql.DriverManager;
import java.sql.SQLException;
import org.apache.logging.log4j.junit.JdbcRule;
@@ -27,25 +26,14 @@ import org.apache.logging.log4j.junit.JdbcRule;
*/
public class JdbcAppenderH2FactoryMethodTest extends AbstractJdbcAppenderFactoryMethodTest {
public JdbcAppenderH2FactoryMethodTest() {
- super(
- new JdbcRule(
- new ConnectionSource() {
- @Override
- public Connection getConnection() throws SQLException {
- return JdbcAppenderH2FactoryMethodTest.getConnection();
- }
- },
- "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"
- );
+ super(new JdbcRule(JdbcH2TestHelper.TEST_CONFIGURATION_SOURCE,
+ "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");
}
public static Connection getConnection() throws SQLException {
- return DriverManager.getConnection("jdbc:h2:mem:Log4j", "sa", "");
+ return JdbcH2TestHelper.getConnection();
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d5b5df4d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcH2TestHelper.java
----------------------------------------------------------------------
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
new file mode 100644
index 0000000..407a284
--- /dev/null
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcH2TestHelper.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.core.appender.db.jdbc;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+public class JdbcH2TestHelper {
+
+ public static Connection getConnection() throws SQLException {
+ return DriverManager.getConnection("jdbc:h2:mem:Log4j", "sa", "");
+ }
+
+ public static ConnectionSource TEST_CONFIGURATION_SOURCE = new ConnectionSource() {
+ @Override
+ public Connection getConnection() throws SQLException {
+ return JdbcH2TestHelper.getConnection();
+ }
+ };
+
+}