From da07a6c8b71505d5a287181073522254daf48e64 Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Mon, 27 Oct 2014 17:55:07 +0900 Subject: [PATCH] Remove debugging code and add coverage test for property setter. --- .../com/zaxxer/hikari/pool/HikariPool.java | 7 -- .../zaxxer/hikari/pool/HikariPoolMBean.java | 2 - .../com/zaxxer/hikari/TestPropertySetter.java | 108 ++++++++++-------- .../com/zaxxer/hikari/pool/HikariPool.java | 7 -- .../zaxxer/hikari/pool/HikariPoolMBean.java | 2 - .../com/zaxxer/hikari/TestPropertySetter.java | 108 ++++++++++-------- 6 files changed, 122 insertions(+), 112 deletions(-) diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java index 2661e8de..aea7db02 100644 --- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java +++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java @@ -397,13 +397,6 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener } } - /** {@inheritDoc} */ - @Override - public void dumpPoolState() - { - connectionBag.dumpState(); - } - // *********************************************************************** // Private methods // *********************************************************************** diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPoolMBean.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPoolMBean.java index 2c045e73..e03fae05 100644 --- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPoolMBean.java +++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPoolMBean.java @@ -32,6 +32,4 @@ public interface HikariPoolMBean int getThreadsAwaitingConnection(); void closeIdleConnections(); - - void dumpPoolState(); } diff --git a/hikaricp-java6/src/test/java/com/zaxxer/hikari/TestPropertySetter.java b/hikaricp-java6/src/test/java/com/zaxxer/hikari/TestPropertySetter.java index 8c6ba5d7..dff02da1 100644 --- a/hikaricp-java6/src/test/java/com/zaxxer/hikari/TestPropertySetter.java +++ b/hikaricp-java6/src/test/java/com/zaxxer/hikari/TestPropertySetter.java @@ -3,6 +3,7 @@ package com.zaxxer.hikari; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.PrintWriter; +import java.util.Properties; import java.util.Set; import javax.sql.DataSource; @@ -14,60 +15,73 @@ import com.zaxxer.hikari.util.PropertyBeanSetter; public class TestPropertySetter { - @Test - public void testProperty1() - { - File file = new File("src/test/resources/propfile1.properties"); - HikariConfig config = new HikariConfig(file.getPath()); - config.validate(); + @Test + public void testProperty1() + { + File file = new File("src/test/resources/propfile1.properties"); + HikariConfig config = new HikariConfig(file.getPath()); + config.validate(); - Assert.assertEquals(5, config.getMinimumIdle()); - Assert.assertEquals("SELECT 1", config.getConnectionTestQuery()); - } + Assert.assertEquals(5, config.getMinimumIdle()); + Assert.assertEquals("SELECT 1", config.getConnectionTestQuery()); + } - @Test - public void testProperty2() throws Exception - { - File file = new File("src/test/resources/propfile2.properties"); - HikariConfig config = new HikariConfig(file.getPath()); - config.validate(); + @Test + public void testProperty2() throws Exception + { + File file = new File("src/test/resources/propfile2.properties"); + HikariConfig config = new HikariConfig(file.getPath()); + config.validate(); - Class clazz = this.getClass().getClassLoader().loadClass(config.getDataSourceClassName()); - DataSource dataSource = (DataSource) clazz.newInstance(); - PropertyBeanSetter.setTargetFromProperties(dataSource, config.getDataSourceProperties()); - } + Class clazz = this.getClass().getClassLoader().loadClass(config.getDataSourceClassName()); + DataSource dataSource = (DataSource) clazz.newInstance(); + PropertyBeanSetter.setTargetFromProperties(dataSource, config.getDataSourceProperties()); + } - @Test - public void testObjectProperty() throws Exception - { - HikariConfig config = new HikariConfig(); - config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource"); - PrintWriter writer = new PrintWriter(new ByteArrayOutputStream()); - config.addDataSourceProperty("logWriter", writer); + @Test + public void testObjectProperty() throws Exception + { + HikariConfig config = new HikariConfig(); + config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource"); + PrintWriter writer = new PrintWriter(new ByteArrayOutputStream()); + config.addDataSourceProperty("logWriter", writer); - Class clazz = this.getClass().getClassLoader().loadClass(config.getDataSourceClassName()); - DataSource dataSource = (DataSource) clazz.newInstance(); - PropertyBeanSetter.setTargetFromProperties(dataSource, config.getDataSourceProperties()); + Class clazz = this.getClass().getClassLoader().loadClass(config.getDataSourceClassName()); + DataSource dataSource = (DataSource) clazz.newInstance(); + PropertyBeanSetter.setTargetFromProperties(dataSource, config.getDataSourceProperties()); - Assert.assertSame(PrintWriter.class, dataSource.getLogWriter().getClass()); - } + Assert.assertSame(PrintWriter.class, dataSource.getLogWriter().getClass()); + } - @Test - public void testPropertyUpperCase() throws Exception - { - File file = new File("src/test/resources/propfile3.properties"); - HikariConfig config = new HikariConfig(file.getPath()); - config.validate(); + @Test + public void testPropertyUpperCase() throws Exception + { + File file = new File("src/test/resources/propfile3.properties"); + HikariConfig config = new HikariConfig(file.getPath()); + config.validate(); - Class clazz = this.getClass().getClassLoader().loadClass(config.getDataSourceClassName()); - DataSource dataSource = (DataSource) clazz.newInstance(); - PropertyBeanSetter.setTargetFromProperties(dataSource, config.getDataSourceProperties()); - } + Class clazz = this.getClass().getClassLoader().loadClass(config.getDataSourceClassName()); + DataSource dataSource = (DataSource) clazz.newInstance(); + PropertyBeanSetter.setTargetFromProperties(dataSource, config.getDataSourceProperties()); + } - @Test - public void testGetPropertyNames() throws Exception - { - Set propertyNames = PropertyBeanSetter.getPropertyNames(HikariConfig.class); - Assert.assertTrue(propertyNames.contains("dataSourceClassName")); - } + @Test + public void testGetPropertyNames() throws Exception + { + Set propertyNames = PropertyBeanSetter.getPropertyNames(HikariConfig.class); + Assert.assertTrue(propertyNames.contains("dataSourceClassName")); + } + + @Test + public void testSetNonExistantPropertyName() throws Exception + { + try { + Properties props = new Properties(); + props.put("what", "happened"); + PropertyBeanSetter.setTargetFromProperties(new HikariConfig(), props); + Assert.fail(); + } + catch (RuntimeException e) { + } + } } diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java b/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java index 11fd7464..80f2f949 100644 --- a/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java +++ b/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java @@ -384,13 +384,6 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener connectionBag.values(STATE_NOT_IN_USE).stream().filter(p -> connectionBag.reserve(p)).forEach(bagEntry -> closeConnection(bagEntry)); } - /** {@inheritDoc} */ - @Override - public void dumpPoolState() - { - connectionBag.dumpState(); - } - // *********************************************************************** // Private methods // *********************************************************************** diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPoolMBean.java b/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPoolMBean.java index 2c045e73..e03fae05 100644 --- a/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPoolMBean.java +++ b/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPoolMBean.java @@ -32,6 +32,4 @@ public interface HikariPoolMBean int getThreadsAwaitingConnection(); void closeIdleConnections(); - - void dumpPoolState(); } diff --git a/hikaricp/src/test/java/com/zaxxer/hikari/TestPropertySetter.java b/hikaricp/src/test/java/com/zaxxer/hikari/TestPropertySetter.java index 8c6ba5d7..dff02da1 100644 --- a/hikaricp/src/test/java/com/zaxxer/hikari/TestPropertySetter.java +++ b/hikaricp/src/test/java/com/zaxxer/hikari/TestPropertySetter.java @@ -3,6 +3,7 @@ package com.zaxxer.hikari; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.PrintWriter; +import java.util.Properties; import java.util.Set; import javax.sql.DataSource; @@ -14,60 +15,73 @@ import com.zaxxer.hikari.util.PropertyBeanSetter; public class TestPropertySetter { - @Test - public void testProperty1() - { - File file = new File("src/test/resources/propfile1.properties"); - HikariConfig config = new HikariConfig(file.getPath()); - config.validate(); + @Test + public void testProperty1() + { + File file = new File("src/test/resources/propfile1.properties"); + HikariConfig config = new HikariConfig(file.getPath()); + config.validate(); - Assert.assertEquals(5, config.getMinimumIdle()); - Assert.assertEquals("SELECT 1", config.getConnectionTestQuery()); - } + Assert.assertEquals(5, config.getMinimumIdle()); + Assert.assertEquals("SELECT 1", config.getConnectionTestQuery()); + } - @Test - public void testProperty2() throws Exception - { - File file = new File("src/test/resources/propfile2.properties"); - HikariConfig config = new HikariConfig(file.getPath()); - config.validate(); + @Test + public void testProperty2() throws Exception + { + File file = new File("src/test/resources/propfile2.properties"); + HikariConfig config = new HikariConfig(file.getPath()); + config.validate(); - Class clazz = this.getClass().getClassLoader().loadClass(config.getDataSourceClassName()); - DataSource dataSource = (DataSource) clazz.newInstance(); - PropertyBeanSetter.setTargetFromProperties(dataSource, config.getDataSourceProperties()); - } + Class clazz = this.getClass().getClassLoader().loadClass(config.getDataSourceClassName()); + DataSource dataSource = (DataSource) clazz.newInstance(); + PropertyBeanSetter.setTargetFromProperties(dataSource, config.getDataSourceProperties()); + } - @Test - public void testObjectProperty() throws Exception - { - HikariConfig config = new HikariConfig(); - config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource"); - PrintWriter writer = new PrintWriter(new ByteArrayOutputStream()); - config.addDataSourceProperty("logWriter", writer); + @Test + public void testObjectProperty() throws Exception + { + HikariConfig config = new HikariConfig(); + config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource"); + PrintWriter writer = new PrintWriter(new ByteArrayOutputStream()); + config.addDataSourceProperty("logWriter", writer); - Class clazz = this.getClass().getClassLoader().loadClass(config.getDataSourceClassName()); - DataSource dataSource = (DataSource) clazz.newInstance(); - PropertyBeanSetter.setTargetFromProperties(dataSource, config.getDataSourceProperties()); + Class clazz = this.getClass().getClassLoader().loadClass(config.getDataSourceClassName()); + DataSource dataSource = (DataSource) clazz.newInstance(); + PropertyBeanSetter.setTargetFromProperties(dataSource, config.getDataSourceProperties()); - Assert.assertSame(PrintWriter.class, dataSource.getLogWriter().getClass()); - } + Assert.assertSame(PrintWriter.class, dataSource.getLogWriter().getClass()); + } - @Test - public void testPropertyUpperCase() throws Exception - { - File file = new File("src/test/resources/propfile3.properties"); - HikariConfig config = new HikariConfig(file.getPath()); - config.validate(); + @Test + public void testPropertyUpperCase() throws Exception + { + File file = new File("src/test/resources/propfile3.properties"); + HikariConfig config = new HikariConfig(file.getPath()); + config.validate(); - Class clazz = this.getClass().getClassLoader().loadClass(config.getDataSourceClassName()); - DataSource dataSource = (DataSource) clazz.newInstance(); - PropertyBeanSetter.setTargetFromProperties(dataSource, config.getDataSourceProperties()); - } + Class clazz = this.getClass().getClassLoader().loadClass(config.getDataSourceClassName()); + DataSource dataSource = (DataSource) clazz.newInstance(); + PropertyBeanSetter.setTargetFromProperties(dataSource, config.getDataSourceProperties()); + } - @Test - public void testGetPropertyNames() throws Exception - { - Set propertyNames = PropertyBeanSetter.getPropertyNames(HikariConfig.class); - Assert.assertTrue(propertyNames.contains("dataSourceClassName")); - } + @Test + public void testGetPropertyNames() throws Exception + { + Set propertyNames = PropertyBeanSetter.getPropertyNames(HikariConfig.class); + Assert.assertTrue(propertyNames.contains("dataSourceClassName")); + } + + @Test + public void testSetNonExistantPropertyName() throws Exception + { + try { + Properties props = new Properties(); + props.put("what", "happened"); + PropertyBeanSetter.setTargetFromProperties(new HikariConfig(), props); + Assert.fail(); + } + catch (RuntimeException e) { + } + } }