github-forks
/
HikariCP
mirror of https://github.com/brettwooldridge/HikariCP.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove debugging code and add coverage test for property setter.

Browse Source
pull/192/head
Brett Wooldridge 11 years ago
parent 57ae67a08a
commit da07a6c8b7
6 changed files with 122 additions and 112 deletions
Show Stats Download Patch File Download Diff File

7
hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
Unescape Escape View File

@ -397,13 +397,6 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener
}
}
/** {@inheritDoc} */
@Override
public void dumpPoolState()
{
connectionBag.dumpState();
}
// ***********************************************************************
// Private methods
// ***********************************************************************

2
hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPoolMBean.java
Unescape Escape View File

@ -32,6 +32,4 @@ public interface HikariPoolMBean
int getThreadsAwaitingConnection();
void closeIdleConnections();
void dumpPoolState();
}

108
hikaricp-java6/src/test/java/com/zaxxer/hikari/TestPropertySetter.java
Unescape Escape View File

@ -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<String> propertyNames = PropertyBeanSetter.getPropertyNames(HikariConfig.class);
Assert.assertTrue(propertyNames.contains("dataSourceClassName"));
}
@Test
public void testGetPropertyNames() throws Exception
{
Set<String> 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) {
}
}
}

7
hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
Unescape Escape View File

@ -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
// ***********************************************************************

2
hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPoolMBean.java
Unescape Escape View File

@ -32,6 +32,4 @@ public interface HikariPoolMBean
int getThreadsAwaitingConnection();
void closeIdleConnections();
void dumpPoolState();
}

108
hikaricp/src/test/java/com/zaxxer/hikari/TestPropertySetter.java
Unescape Escape View File

@ -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<String> propertyNames = PropertyBeanSetter.getPropertyNames(HikariConfig.class);
Assert.assertTrue(propertyNames.contains("dataSourceClassName"));
}
@Test
public void testGetPropertyNames() throws Exception
{
Set<String> 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) {
}
}
}

Write Preview
Loading…
Cancel
Save