You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2017/01/07 22:15:57 UTC
[2/3] logging-log4j2 git commit: Refactor
DataSourceConnectionSourceTest to use JndiRule
Refactor DataSourceConnectionSourceTest to use JndiRule
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cbf9ef03
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cbf9ef03
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cbf9ef03
Branch: refs/heads/master
Commit: cbf9ef03b86aa9aa0ecb7244710267cea613d473
Parents: 7e5297d
Author: Matt Sicker <ma...@spr.com>
Authored: Sat Jan 7 16:14:16 2017 -0600
Committer: Matt Sicker <ma...@spr.com>
Committed: Sat Jan 7 16:15:52 2017 -0600
----------------------------------------------------------------------
.../db/jdbc/DataSourceConnectionSourceTest.java | 73 +++++---------------
1 file changed, 19 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cbf9ef03/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSourceTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSourceTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSourceTest.java
index 65ff060..0bdea5e 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSourceTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSourceTest.java
@@ -18,23 +18,16 @@ package org.apache.logging.log4j.core.appender.db.jdbc;
import java.sql.Connection;
import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.Collection;
-import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.sql.DataSource;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.apache.logging.log4j.status.StatusLogger;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import org.apache.logging.log4j.junit.JndiRule;
+import org.apache.logging.log4j.junit.LoggerContextRule;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.RuleChain;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import org.mockejb.jndi.MockContextFactory;
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.given;
@@ -44,49 +37,26 @@ import static org.mockito.Mockito.mock;
public class DataSourceConnectionSourceTest {
@Parameterized.Parameters(name = "{0}")
- public static Collection<Object[]> data() {
- return Arrays.asList(
- new Object[][]{
- {"java:/comp/env/jdbc/Logging01"},
- {"java:/comp/env/jdbc/Logging02"}
- }
- );
+ public static Object[][] data() {
+ return new Object[][]{
+ {"java:/comp/env/jdbc/Logging01"},
+ {"java:/comp/env/jdbc/Logging02"}
+ };
}
+ private static final String CONFIG = "log4j-fatalOnly.xml";
+
+ @Rule
+ public final RuleChain rules;
+ private final DataSource dataSource = mock(DataSource.class);
private final String jndiURL;
- private InitialContext context;
public DataSourceConnectionSourceTest(final String jndiURL) {
+ this.rules = RuleChain.outerRule(new JndiRule(jndiURL, dataSource))
+ .around(new LoggerContextRule(CONFIG));
this.jndiURL = jndiURL;
}
- private static final String CONFIG = "log4j-fatalOnly.xml";
-
- @BeforeClass
- public static void beforeClass() {
- System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
- final LoggerContext ctx = LoggerContext.getContext();
- ctx.reconfigure();
- final StatusLogger logger = StatusLogger.getLogger();
- logger.setLevel(Level.FATAL);
- }
-
- @Before
- public void setUp() throws NamingException {
- MockContextFactory.setAsInitial();
-
- this.context = new InitialContext();
- this.context.createSubcontext("java:");
- this.context.createSubcontext("java:/comp");
- this.context.createSubcontext("java:/comp/env");
- this.context.createSubcontext("java:/comp/env/jdbc");
- }
-
- @After
- public void tearDown() {
- MockContextFactory.revertSetAsInitial();
- }
-
@Test
public void testNullJndiName() {
final DataSourceConnectionSource source = DataSourceConnectionSource.createConnectionSource(null);
@@ -103,28 +73,23 @@ public class DataSourceConnectionSourceTest {
@Test
public void testNoDataSource() {
- final DataSourceConnectionSource source = DataSourceConnectionSource
- .createConnectionSource(this.jndiURL);
+ final DataSourceConnectionSource source = DataSourceConnectionSource.createConnectionSource(jndiURL + "123");
assertNull("The connection source should be null.", source);
}
@Test
public void testDataSource() throws NamingException, SQLException {
- final DataSource dataSource = mock(DataSource.class);
final Connection connection1 = mock(Connection.class);
final Connection connection2 = mock(Connection.class);
given(dataSource.getConnection()).willReturn(connection1, connection2);
- this.context.bind(this.jndiURL, dataSource);
-
- DataSourceConnectionSource source = DataSourceConnectionSource
- .createConnectionSource(this.jndiURL);
+ DataSourceConnectionSource source = DataSourceConnectionSource.createConnectionSource(jndiURL);
assertNotNull("The connection source should not be null.", source);
assertEquals("The toString value is not correct.", "dataSource{ name=" + jndiURL + ", value="
- + dataSource + " }", source.toString());
+ + dataSource + " }", source.toString());
assertSame("The connection is not correct (1).", connection1, source.getConnection());
assertSame("The connection is not correct (2).", connection2, source.getConnection());