Repository: commons-pool Updated Branches: refs/heads/master 08179eb3d -> 7f52a8d96
[POOL-324] org.apache.commons.pool2.impl.GenericObjectPool.getFactoryType() throws java.lang.ClassCastException Project: http://git-wip-us.apache.org/repos/asf/commons-pool/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-pool/commit/7f52a8d9 Tree: http://git-wip-us.apache.org/repos/asf/commons-pool/tree/7f52a8d9 Diff: http://git-wip-us.apache.org/repos/asf/commons-pool/diff/7f52a8d9 Branch: refs/heads/master Commit: 7f52a8d961978b25b4111b61b29971da883a1a27 Parents: 08179eb Author: Gary Gregory <garydgreg...@gmail.com> Authored: Sat May 26 09:35:49 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Sat May 26 09:35:49 2018 -0600 ---------------------------------------------------------------------- .../pool2/impl/TestGenericObjectPool.java | 87 ++++++++++++++------ 1 file changed, 64 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-pool/blob/7f52a8d9/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java index 915e083..cc71fd4 100644 --- a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java +++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java @@ -2711,43 +2711,84 @@ public class TestGenericObjectPool extends TestBaseObjectPool { } } - private BasePooledObjectFactory<String> createBasePooledObjectfactory() { - return new BasePooledObjectFactory<String>() { - @Override - public String create() { - // fake - return null; - } - - @Override - public PooledObject<String> wrap(final String obj) { - // fake - return null; - } - }; - } + private BasePooledObjectFactory<String> createNullPooledObjectFactory() { + return new BasePooledObjectFactory<String>() { + @Override + public String create() { + // fake + return null; + } + + @Override + public PooledObject<String> wrap(final String obj) { + // fake + return null; + } + }; + } + + private BasePooledObjectFactory<String> createDefaultPooledObjectFactory() { + return new BasePooledObjectFactory<String>() { + @Override + public String create() { + // fake + return null; + } + + @Override + public PooledObject<String> wrap(final String obj) { + // fake + return new DefaultPooledObject<String>(obj); + } + }; + } @Test - public void testGetFactoryType() { - try (final GenericObjectPool<String> pool = new GenericObjectPool<>(createBasePooledObjectfactory())) { + public void testGetFactoryType_NullPooledObjectFactory() { + try (final GenericObjectPool<String> pool = new GenericObjectPool<>(createNullPooledObjectFactory())) { + Assert.assertNotNull((pool.getFactoryType())); + } + } + + @Test + public void testGetFactoryType_DefaultPooledObjectFactory() { + try (final GenericObjectPool<String> pool = new GenericObjectPool<>(createDefaultPooledObjectFactory())) { + Assert.assertNotNull((pool.getFactoryType())); + } + } + + @Test + @Ignore("https://issues.apache.org/jira/browse/POOL-324";) + public void testGetFactoryType_PoolUtilsSynchronizedNullPooledFactory() { + try (final GenericObjectPool<String> pool = new GenericObjectPool<>( + PoolUtils.synchronizedPooledFactory(createNullPooledObjectFactory()))) { + Assert.assertNotNull((pool.getFactoryType())); + } + } + + @Test + @Ignore("https://issues.apache.org/jira/browse/POOL-324";) + public void testGetFactoryType_PoolUtilsSynchronizedDefaultPooledFactory() { + try (final GenericObjectPool<String> pool = new GenericObjectPool<>( + PoolUtils.synchronizedPooledFactory(createDefaultPooledObjectFactory()))) { Assert.assertNotNull((pool.getFactoryType())); } } @Test - @Ignore - public void testGetFactoryType_PoolUtilssynchronizedPooledFactory() { + @Ignore("https://issues.apache.org/jira/browse/POOL-324";) + public void testGetFactoryType_SynchronizedNullPooledObjectFactory() { try (final GenericObjectPool<String> pool = new GenericObjectPool<>( - PoolUtils.synchronizedPooledFactory(createBasePooledObjectfactory()))) { + new TestSynchronizedPooledObjectFactory<>(createNullPooledObjectFactory()))) { Assert.assertNotNull((pool.getFactoryType())); } } @Test - @Ignore - public void testGetFactoryType_SynchronizedPooledObjectFactory() { + @Ignore("https://issues.apache.org/jira/browse/POOL-324";) + public void testGetFactoryType_SynchronizedDefaultPooledObjectFactory() { try (final GenericObjectPool<String> pool = new GenericObjectPool<>( - new TestSynchronizedPooledObjectFactory<>(createBasePooledObjectfactory()))) { + new TestSynchronizedPooledObjectFactory<>(createDefaultPooledObjectFactory()))) { Assert.assertNotNull((pool.getFactoryType())); } }
