commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Simone Tripodi <simonetrip...@apache.org>
Subject Re: svn commit: r1096444 - in /commons/proper/pool/trunk/src/test/org/apache/commons/pool2: TestBaseKeyedObjectPool.java TestKeyedObjectPool.java impl/TestGenericKeyedObjectPool.java impl/TestStackKeyedObjectPool.java
Date Mon, 25 Apr 2011 09:52:47 GMT
Hi Phil/all,
after restored/merging the generics, the test method
TestGenericKeyedObjectPool.testMaxTotalLRU is stuck :(
I tried to debug it to understand what happened but didn't figure out
what happened ;(
Can anyone help me please? I put the @Ignore annotation ATM on that method.
Thanks in advance, have a nice day,
Simo

http://people.apache.org/~simonetripodi/
http://www.99soft.org/



On Mon, Apr 25, 2011 at 11:48 AM,  <simonetripodi@apache.org> wrote:
> Author: simonetripodi
> Date: Mon Apr 25 09:48:08 2011
> New Revision: 1096444
>
> URL: http://svn.apache.org/viewvc?rev=1096444&view=rev
> Log:
> TestKeyedObjectPool (and related subclasses) tests moved to JUnit4 annotations
> FIXME TestGenericKeyedObjectPool.testMaxTotalLRU is stuck after restored generics :(
>
> Modified:
>    commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBaseKeyedObjectPool.java
>    commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestKeyedObjectPool.java
>    commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
>    commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestStackKeyedObjectPool.java
>
> Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBaseKeyedObjectPool.java
> URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBaseKeyedObjectPool.java?rev=1096444&r1=1096443&r2=1096444&view=diff
> ==============================================================================
> --- commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBaseKeyedObjectPool.java
(original)
> +++ commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestBaseKeyedObjectPool.java
Mon Apr 25 09:48:08 2011
> @@ -16,9 +16,12 @@
>  */
>  package org.apache.commons.pool2;
>
> -import org.apache.commons.pool2.BaseKeyedObjectPool;
> -import org.apache.commons.pool2.KeyedObjectPool;
> -import org.apache.commons.pool2.KeyedPoolableObjectFactory;
> +import static junit.framework.Assert.assertEquals;
> +import static junit.framework.Assert.assertTrue;
> +import static junit.framework.Assert.fail;
> +
> +import org.junit.After;
> +import org.junit.Test;
>
>
>  /**
> @@ -29,10 +32,6 @@ import org.apache.commons.pool2.KeyedPoo
>  public class TestBaseKeyedObjectPool extends TestKeyedObjectPool {
>     private KeyedObjectPool<Object,Object> _pool = null;
>
> -    public TestBaseKeyedObjectPool(final String testName) {
> -        super(testName);
> -    }
> -
>     @Override
>     protected KeyedObjectPool<Object,Object> makeEmptyPool(KeyedPoolableObjectFactory<Object,Object>
factory) {
>         if (this.getClass() != TestBaseKeyedObjectPool.class) {
> @@ -74,13 +73,9 @@ public class TestBaseKeyedObjectPool ext
>         throw new UnsupportedOperationException("BaseKeyedObjectPool isn't a complete
implementation.");
>     }
>
> -    public void setUp() throws Exception {
> -        super.setUp();
> -    }
> -
> +    @After
>     public void tearDown() throws Exception {
>         _pool = null;
> -        super.tearDown();
>     }
>
>     public void testUnsupportedOperations() throws Exception {
> @@ -151,6 +146,7 @@ public class TestBaseKeyedObjectPool ext
>         return false;
>     }
>
> +    @Test
>     public void testBaseBorrowReturn() throws Exception {
>         try {
>             _pool = makeEmptyPool(3);
> @@ -188,6 +184,7 @@ public class TestBaseKeyedObjectPool ext
>         }
>     }
>
> +    @Test
>     public void testBaseBorrow() throws Exception {
>         try {
>             _pool = makeEmptyPool(3);
> @@ -204,6 +201,7 @@ public class TestBaseKeyedObjectPool ext
>         assertEquals("6",getNthObject(keya,2),_pool.borrowObject(keya));
>     }
>
> +    @Test
>     public void testBaseNumActiveNumIdle() throws Exception {
>         try {
>             _pool = makeEmptyPool(3);
> @@ -230,6 +228,7 @@ public class TestBaseKeyedObjectPool ext
>         assertEquals(0,_pool.getNumIdle("xyzzy12345"));
>     }
>
> +    @Test
>     public void testBaseNumActiveNumIdle2() throws Exception {
>         try {
>             _pool = makeEmptyPool(6);
> @@ -286,6 +285,7 @@ public class TestBaseKeyedObjectPool ext
>         assertEquals(2,_pool.getNumIdle(keyb));
>     }
>
> +    @Test
>     public void testBaseClear() throws Exception {
>         try {
>             _pool = makeEmptyPool(3);
> @@ -310,6 +310,7 @@ public class TestBaseKeyedObjectPool ext
>         assertEquals(getNthObject(keya,2),obj2);
>     }
>
> +    @Test
>     public void testBaseInvalidateObject() throws Exception {
>         try {
>             _pool = makeEmptyPool(3);
> @@ -331,6 +332,7 @@ public class TestBaseKeyedObjectPool ext
>         assertEquals(0,_pool.getNumIdle(keya));
>     }
>
> +    @Test
>     public void testBaseAddObject() throws Exception {
>         try {
>             _pool = makeEmptyPool(3);
>
> Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestKeyedObjectPool.java
> URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestKeyedObjectPool.java?rev=1096444&r1=1096443&r2=1096444&view=diff
> ==============================================================================
> --- commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestKeyedObjectPool.java
(original)
> +++ commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestKeyedObjectPool.java
Mon Apr 25 09:48:08 2011
> @@ -16,19 +16,18 @@
>  */
>  package org.apache.commons.pool2;
>
> -import junit.framework.TestCase;
> +import static junit.framework.Assert.assertEquals;
> +import static junit.framework.Assert.fail;
>
> -import java.util.List;
>  import java.util.ArrayList;
> +import java.util.List;
>  import java.util.NoSuchElementException;
>
> -import org.apache.commons.pool2.BaseKeyedPoolableObjectFactory;
> -import org.apache.commons.pool2.KeyedObjectPool;
> -import org.apache.commons.pool2.KeyedPoolableObjectFactory;
> -import org.apache.commons.pool2.ObjectPool;
> +import junit.framework.TestCase;
> +
>  import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
>  import org.apache.commons.pool2.impl.StackKeyedObjectPool;
> -import org.apache.commons.pool2.PoolUtils;
> +import org.junit.Test;
>
>  /**
>  * Abstract {@link TestCase} for {@link ObjectPool} implementations.
> @@ -36,10 +35,7 @@ import org.apache.commons.pool2.PoolUtil
>  * @author Sandy McArthur
>  * @version $Revision$ $Date$
>  */
> -public abstract class TestKeyedObjectPool extends TestCase {
> -    public TestKeyedObjectPool(String testName) {
> -        super(testName);
> -    }
> +public abstract class TestKeyedObjectPool {
>
>     /**
>      * Create an <code>KeyedObjectPool</code> with the specified factory.
> @@ -51,6 +47,7 @@ public abstract class TestKeyedObjectPoo
>
>     protected final String KEY = "key";
>
> +    @Test
>     public void testClosedPoolBehavior() throws Exception {
>         final KeyedObjectPool<Object,Object> pool;
>         try {
> @@ -100,6 +97,7 @@ public abstract class TestKeyedObjectPoo
>     private final Integer ZERO = new Integer(0);
>     private final Integer ONE = new Integer(1);
>
> +    @Test
>     public void testKPOFAddObjectUsage() throws Exception {
>         final FailingKeyedPoolableObjectFactory factory = new FailingKeyedPoolableObjectFactory();
>         final KeyedObjectPool<Object,Object> pool;
> @@ -154,6 +152,7 @@ public abstract class TestKeyedObjectPoo
>         assertEquals(expectedMethods, factory.getMethodCalls());
>     }
>
> +    @Test
>     public void testKPOFBorrowObjectUsages() throws Exception {
>         final FailingKeyedPoolableObjectFactory factory = new FailingKeyedPoolableObjectFactory();
>         final KeyedObjectPool<Object,Object> pool;
> @@ -240,6 +239,7 @@ public abstract class TestKeyedObjectPoo
>         assertEquals(expectedMethods, factory.getMethodCalls());
>     }
>
> +    @Test
>     public void testKPOFReturnObjectUsages() throws Exception {
>         final FailingKeyedPoolableObjectFactory factory = new FailingKeyedPoolableObjectFactory();
>         final KeyedObjectPool<Object,Object> pool;
> @@ -304,6 +304,7 @@ public abstract class TestKeyedObjectPoo
>         }
>     }
>
> +    @Test
>     public void testKPOFInvalidateObjectUsages() throws Exception {
>         final FailingKeyedPoolableObjectFactory factory = new FailingKeyedPoolableObjectFactory();
>         final KeyedObjectPool<Object,Object> pool;
> @@ -341,6 +342,7 @@ public abstract class TestKeyedObjectPoo
>         assertEquals(expectedMethods, factory.getMethodCalls());
>     }
>
> +    @Test
>     public void testKPOFClearUsages() throws Exception {
>         final FailingKeyedPoolableObjectFactory factory = new FailingKeyedPoolableObjectFactory();
>         final KeyedObjectPool<Object,Object> pool;
> @@ -362,6 +364,7 @@ public abstract class TestKeyedObjectPoo
>         pool.clear();
>     }
>
> +    @Test
>     public void testKPOFCloseUsages() throws Exception {
>         final FailingKeyedPoolableObjectFactory factory = new FailingKeyedPoolableObjectFactory();
>         KeyedObjectPool<Object,Object> pool;
> @@ -385,6 +388,7 @@ public abstract class TestKeyedObjectPoo
>         pool.close();
>     }
>
> +    @Test
>     public void testToString() throws Exception {
>         final FailingKeyedPoolableObjectFactory factory = new FailingKeyedPoolableObjectFactory();
>         try {
>
> Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
> URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java?rev=1096444&r1=1096443&r2=1096444&view=diff
> ==============================================================================
> --- commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
(original)
> +++ commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
Mon Apr 25 09:48:08 2011
> @@ -17,6 +17,13 @@
>
>  package org.apache.commons.pool2.impl;
>
> +import static junit.framework.Assert.assertEquals;
> +import static junit.framework.Assert.assertNotNull;
> +import static junit.framework.Assert.assertNotSame;
> +import static junit.framework.Assert.assertSame;
> +import static junit.framework.Assert.assertTrue;
> +import static junit.framework.Assert.fail;
> +
>  import java.io.PrintWriter;
>  import java.io.StringWriter;
>  import java.util.HashMap;
> @@ -30,17 +37,16 @@ import org.apache.commons.pool2.VisitTra
>  import org.apache.commons.pool2.VisitTrackerFactory;
>  import org.apache.commons.pool2.Waiter;
>  import org.apache.commons.pool2.WaiterFactory;
> -import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
> -import org.apache.commons.pool2.impl.GenericObjectPool;
> +import org.junit.After;
> +import org.junit.Before;
> +import org.junit.Ignore;
> +import org.junit.Test;
>
>  /**
>  * @author Rodney Waldhoff
>  * @version $Revision$ $Date$
>  */
>  public class TestGenericKeyedObjectPool extends TestBaseKeyedObjectPool {
> -    public TestGenericKeyedObjectPool(String testName) {
> -        super(testName);
> -    }
>
>     @Override
>     protected KeyedObjectPool<Object,Object> makeEmptyPool(int mincapacity) {
> @@ -87,11 +93,13 @@ public class TestGenericKeyedObjectPool
>     private final Integer one = new Integer(1);
>     private final Integer two = new Integer(2);
>
> +    @Before
>     public void setUp() throws Exception {
> -        super.setUp();
>         pool = new GenericKeyedObjectPool<String,String>(new SimpleFactory<String>());
>     }
>
> +    @Override
> +    @After
>     public void tearDown() throws Exception {
>         super.tearDown();
>         pool.clear();
> @@ -99,6 +107,7 @@ public class TestGenericKeyedObjectPool
>         pool = null;
>     }
>
> +    @Test
>     public void testNegativeMaxActive() throws Exception {
>         pool.setMaxActive(-1);
>         pool.setWhenExhaustedAction(GenericKeyedObjectPool.WHEN_EXHAUSTED_FAIL);
> @@ -107,6 +116,7 @@ public class TestGenericKeyedObjectPool
>         pool.returnObject("",obj);
>     }
>
> +    @Test
>     public void testNumActiveNumIdle2() throws Exception {
>         assertEquals(0,pool.getNumActive());
>         assertEquals(0,pool.getNumIdle());
> @@ -156,6 +166,7 @@ public class TestGenericKeyedObjectPool
>         assertEquals(2,pool.getNumIdle("B"));
>     }
>
> +    @Test
>     public void testMaxIdle() throws Exception {
>         pool.setMaxActive(100);
>         pool.setMaxIdle(8);
> @@ -190,6 +201,7 @@ public class TestGenericKeyedObjectPool
>
>     }
>
> +    @Test
>     public void testMaxActive() throws Exception {
>         pool.setMaxActive(3);
>         pool.setWhenExhaustedAction(GenericKeyedObjectPool.WHEN_EXHAUSTED_FAIL);
> @@ -205,6 +217,7 @@ public class TestGenericKeyedObjectPool
>         }
>     }
>
> +    @Test
>     public void testMaxActiveZero() throws Exception {
>         pool.setMaxActive(0);
>         pool.setWhenExhaustedAction(GenericObjectPool.WHEN_EXHAUSTED_FAIL);
> @@ -216,7 +229,8 @@ public class TestGenericKeyedObjectPool
>             // expected
>         }
>     }
> -
> +
> +    @Test
>     public void testWhenExhaustedGrow() throws Exception {
>         pool.setMaxActive(1);
>         pool.setMaxTotal(1);
> @@ -226,6 +240,7 @@ public class TestGenericKeyedObjectPool
>         }
>     }
>
> +    @Test
>     public void testMaxTotal() throws Exception {
>         pool.setMaxActive(2);
>         pool.setMaxTotal(3);
> @@ -267,6 +282,7 @@ public class TestGenericKeyedObjectPool
>                 pool.getMaxTotal());
>     }
>
> +    @Test
>     public void testMaxTotalZero() throws Exception {
>         pool.setMaxTotal(0);
>         pool.setWhenExhaustedAction(GenericObjectPool.WHEN_EXHAUSTED_FAIL);
> @@ -279,6 +295,11 @@ public class TestGenericKeyedObjectPool
>         }
>     }
>
> +    /*
> +     * FIXME this test is stuck!!!
> +     */
> +    @Test
> +    @Ignore
>     public void testMaxTotalLRU() throws Exception {
>         pool.setMaxActive(2);
>         pool.setMaxTotal(3);
> @@ -328,6 +349,7 @@ public class TestGenericKeyedObjectPool
>         assertSame(o4, o7);
>     }
>
> +    @Test
>     public void testSettersAndGetters() throws Exception {
>         GenericKeyedObjectPool<String,String> pool = new GenericKeyedObjectPool<String,String>(new
SimpleFactory<String>());
>         {
> @@ -385,6 +407,7 @@ public class TestGenericKeyedObjectPool
>         }
>     }
>
> +    @Test
>     public void testEviction() throws Exception {
>         pool.setMaxIdle(500);
>         pool.setMaxActive(500);
> @@ -434,6 +457,7 @@ public class TestGenericKeyedObjectPool
>         assertEquals("Should be zero idle, found " + pool.getNumIdle(""),0,pool.getNumIdle(""));
>     }
>
> +    @Test
>     public void testEviction2() throws Exception {
>         pool.setMaxIdle(500);
>         pool.setMaxActive(500);
> @@ -501,7 +525,8 @@ public class TestGenericKeyedObjectPool
>             }
>         }
>     }
> -
> +
> +    @Test
>     public void testThreaded1() throws Exception {
>         pool.setMaxActive(15);
>         pool.setMaxIdle(15);
> @@ -514,6 +539,7 @@ public class TestGenericKeyedObjectPool
>      * has high latency, testOnReturn is set and there is high incidence of
>      * validation failures.
>      */
> +    @Test
>     public void testMaxTotalInvariant() throws Exception {
>         int maxTotal = 15;
>         SimpleFactory<String> factory = new SimpleFactory<String>();
> @@ -529,6 +555,7 @@ public class TestGenericKeyedObjectPool
>         runTestThreads(5, 10, 50);
>     }
>
> +    @Test
>     public void testMinIdle() throws Exception {
>         pool.setMaxIdle(500);
>         pool.setMinIdle(5);
> @@ -568,6 +595,7 @@ public class TestGenericKeyedObjectPool
>         assertTrue("Should be 10 idle, found " + pool.getNumIdle(),pool.getNumIdle()
== 10);
>     }
>
> +    @Test
>     public void testMinIdleMaxActive() throws Exception {
>         pool.setMaxIdle(500);
>         pool.setMinIdle(5);
> @@ -620,6 +648,7 @@ public class TestGenericKeyedObjectPool
>         assertTrue("Should be 10 idle, found " + pool.getNumIdle(),pool.getNumIdle()
== 10);
>     }
>
> +    @Test
>     public void testMinIdleNoPopulateImmediately() throws Exception {
>         pool.setMaxIdle(500);
>         pool.setMinIdle(5);
> @@ -641,6 +670,7 @@ public class TestGenericKeyedObjectPool
>         assertTrue("Should be 5 idle, found " + pool.getNumIdle(),pool.getNumIdle()
== 5);
>     }
>
> +    @Test
>     public void testMinIdleNoPreparePool() throws Exception {
>         pool.setMaxIdle(500);
>         pool.setMinIdle(5);
> @@ -664,6 +694,7 @@ public class TestGenericKeyedObjectPool
>         assertTrue("Should be 5 idle, found " + pool.getNumIdle(),pool.getNumIdle()
== 5);
>     }
>
> +    @Test
>     public void testFIFO() throws Exception {
>         pool.setLifo(false);
>         final String key = "key";
> @@ -678,7 +709,8 @@ public class TestGenericKeyedObjectPool
>         assertEquals("returned", "r", pool.borrowObject(key));
>         assertEquals("new-4", "key4", pool.borrowObject(key));
>     }
> -
> +
> +    @Test
>     public void testLIFO() throws Exception {
>         pool.setLifo(true);
>         final String key = "key";
> @@ -700,6 +732,7 @@ public class TestGenericKeyedObjectPool
>      *
>      * JIRA: POOL-86
>      */
> +    @Test
>     public void testEvictionOrder() throws Exception {
>         checkEvictionOrder(false);
>         checkEvictionOrder(true);
> @@ -821,6 +854,7 @@ public class TestGenericKeyedObjectPool
>      * Verifies that the evictor visits objects in expected order
>      * and frequency.
>      */
> +    @Test
>     public void testEvictorVisiting() throws Exception {
>         checkEvictorVisiting(true);
>         checkEvictorVisiting(false);
> @@ -982,7 +1016,8 @@ public class TestGenericKeyedObjectPool
>             }
>         }
>     }
> -
> +
> +    @Test
>     public void testConstructors() {
>
>         // Make constructor arguments all different from defaults
> @@ -1246,7 +1281,8 @@ public class TestGenericKeyedObjectPool
>         assertEquals(whenExhaustedAction,pool.getWhenExhaustedAction());
>         assertEquals(lifo, pool.getLifo());
>     }
> -
> +
> +    @Test
>     public void testExceptionOnPassivateDuringReturn() throws Exception {
>         SimpleFactory<String> factory = new SimpleFactory<String>();
>         GenericKeyedObjectPool<String,String> pool = new GenericKeyedObjectPool<String,String>(factory);
> @@ -1256,7 +1292,8 @@ public class TestGenericKeyedObjectPool
>         assertEquals(0,pool.getNumIdle());
>         pool.close();
>     }
> -
> +
> +    @Test
>     public void testExceptionOnDestroyDuringBorrow() throws Exception {
>         SimpleFactory<String> factory = new SimpleFactory<String>();
>         factory.setThrowExceptionOnDestroy(true);
> @@ -1276,7 +1313,8 @@ public class TestGenericKeyedObjectPool
>         assertEquals(1, pool.getNumActive());
>         assertEquals(0, pool.getNumIdle());
>     }
> -
> +
> +    @Test
>     public void testExceptionOnDestroyDuringReturn() throws Exception {
>         SimpleFactory<String> factory = new SimpleFactory<String>();
>         factory.setThrowExceptionOnDestroy(true);
> @@ -1292,7 +1330,8 @@ public class TestGenericKeyedObjectPool
>         assertEquals(1, pool.getNumActive());
>         assertEquals(0, pool.getNumIdle());
>     }
> -
> +
> +    @Test
>     public void testExceptionOnActivateDuringBorrow() throws Exception {
>         SimpleFactory<String> factory = new SimpleFactory<String>();
>         GenericKeyedObjectPool<String,String> pool = new GenericKeyedObjectPool<String,String>(factory);
> @@ -1326,6 +1365,7 @@ public class TestGenericKeyedObjectPool
>         assertEquals(0, pool.getNumIdle());
>     }
>
> +    @Test
>     public void testBlockedKeyDoesNotBlockPool() throws Exception {
>         SimpleFactory<String> factory = new SimpleFactory<String>();
>         GenericKeyedObjectPool<String,String> pool = new GenericKeyedObjectPool<String,String>(factory);
> @@ -1366,6 +1406,7 @@ public class TestGenericKeyedObjectPool
>      * TestSharedPoolDataSource.testMultipleThreads2()
>      * Let's see if the this fails on Continuum too!
>      */
> +    @Test
>     public void testMaxWaitMultiThreaded() throws Exception {
>         final long maxWait = 500; // wait for connection
>         final long holdTime = 2 * maxWait; // how long to hold connection
> @@ -1420,6 +1461,7 @@ public class TestGenericKeyedObjectPool
>     /**
>      * Test case for POOL-180.
>      */
> +    @Test
>     public void testMaxActivePerKeyExceeded() {
>         WaiterFactory<String> factory = new WaiterFactory<String>(0,
20, 0, 0, 0, 0, 8, 5, 0);
>         GenericKeyedObjectPool<String,Waiter> pool = new GenericKeyedObjectPool<String,Waiter>(factory);
>
> Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestStackKeyedObjectPool.java
> URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestStackKeyedObjectPool.java?rev=1096444&r1=1096443&r2=1096444&view=diff
> ==============================================================================
> --- commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestStackKeyedObjectPool.java
(original)
> +++ commons/proper/pool/trunk/src/test/org/apache/commons/pool2/impl/TestStackKeyedObjectPool.java
Mon Apr 25 09:48:08 2011
> @@ -17,6 +17,11 @@
>
>  package org.apache.commons.pool2.impl;
>
> +import static junit.framework.Assert.assertEquals;
> +import static junit.framework.Assert.assertNotNull;
> +import static junit.framework.Assert.assertTrue;
> +import static junit.framework.Assert.fail;
> +
>  import java.util.BitSet;
>  import java.util.HashMap;
>  import java.util.NoSuchElementException;
> @@ -24,16 +29,15 @@ import java.util.NoSuchElementException;
>  import org.apache.commons.pool2.KeyedObjectPool;
>  import org.apache.commons.pool2.KeyedPoolableObjectFactory;
>  import org.apache.commons.pool2.TestBaseKeyedObjectPool;
> -import org.apache.commons.pool2.impl.StackKeyedObjectPool;
> +import org.junit.After;
> +import org.junit.Before;
> +import org.junit.Test;
>
>  /**
>  * @author Rodney Waldhoff
>  * @version $Revision$ $Date$
>  */
>  public class TestStackKeyedObjectPool extends TestBaseKeyedObjectPool {
> -    public TestStackKeyedObjectPool(String testName) {
> -        super(testName);
> -    }
>
>     @Override
>     protected KeyedObjectPool<Object,Object> makeEmptyPool(int mincapacity) {
> @@ -58,9 +62,8 @@ public class TestStackKeyedObjectPool ex
>
>     private StackKeyedObjectPool<Object,Object> pool = null;
>
> -    @Override
> +    @Before
>     public void setUp() throws Exception {
> -        super.setUp();
>         pool = new StackKeyedObjectPool<Object,Object>(
>             new KeyedPoolableObjectFactory<Object,Object>()  {
>                 int counter = 0;
> @@ -74,12 +77,12 @@ public class TestStackKeyedObjectPool ex
>     }
>
>
> -    @Override
> +    @After
>     public void tearDown() throws Exception {
> -        super.tearDown();
>         pool = null;
>     }
>
> +    @Test
>     public void testCloseBug() throws Exception {
>         {
>             Object obj0 = pool.borrowObject("");
> @@ -104,6 +107,7 @@ public class TestStackKeyedObjectPool ex
>         pool.close();
>     }
>
> +    @Test
>     public void testIdleCap() throws Exception {
>         Object[] active = new Object[100];
>         for(int i=0;i<100;i++) {
> @@ -123,6 +127,7 @@ public class TestStackKeyedObjectPool ex
>      * the bottom (oldest) instance in the pool is destroyed to make room for the
newly
>      * returning instance, which is pushed onto the idle object stack.
>      */
> +    @Test
>     public void testRemoveOldest() throws Exception {
>         pool._maxSleeping = 2;
>         Object obj0 = pool.borrowObject("");
> @@ -136,6 +141,7 @@ public class TestStackKeyedObjectPool ex
>         assertEquals("3", pool.borrowObject("")); // New instance created (0 is gone)
>     }
>
> +    @Test
>     public void testPoolWithNullFactory() throws Exception {
>         KeyedObjectPool<String,Integer> pool = new StackKeyedObjectPool<String,Integer>(10);
>         for(int i=0;i<10;i++) {
> @@ -160,6 +166,7 @@ public class TestStackKeyedObjectPool ex
>         pool.clear();
>     }
>
> +    @Test
>     public void testVariousConstructors() throws Exception {
>         {
>             StackKeyedObjectPool<String,Integer> pool = new StackKeyedObjectPool<String,Integer>();
> @@ -188,6 +195,7 @@ public class TestStackKeyedObjectPool ex
>     }
>
>     @Override
> +    @Test
>     public void testToString() throws Exception {
>         StackKeyedObjectPool<Object,Object> pool = new StackKeyedObjectPool<Object,Object>(new
SimpleFactory());
>         assertNotNull(pool.toString());
> @@ -197,6 +205,7 @@ public class TestStackKeyedObjectPool ex
>         assertNotNull(pool.toString());
>     }
>
> +    @Test
>     public void testBorrowFromEmptyPoolWithNullFactory() throws Exception {
>         KeyedObjectPool<String,Object> pool = new StackKeyedObjectPool<String,Object>();
>         try {
> @@ -207,6 +216,7 @@ public class TestStackKeyedObjectPool ex
>         }
>     }
>
> +    @Test
>     public void testSetFactory() throws Exception {
>         KeyedObjectPool<Object,Object> pool = new StackKeyedObjectPool<Object,Object>();
>         try {
> @@ -221,6 +231,7 @@ public class TestStackKeyedObjectPool ex
>         pool.returnObject("x",obj);
>     }
>
> +    @Test
>     public void testCantResetFactoryWithActiveObjects() throws Exception {
>         KeyedObjectPool<Object,Object> pool = new StackKeyedObjectPool<Object,Object>();
>         pool.setFactory(new SimpleFactory());
> @@ -235,6 +246,7 @@ public class TestStackKeyedObjectPool ex
>         }
>     }
>
> +    @Test
>     public void testCanResetFactoryWithoutActiveObjects() throws Exception {
>         KeyedObjectPool<Object,Object> pool = new StackKeyedObjectPool<Object,Object>();
>         {
> @@ -251,6 +263,7 @@ public class TestStackKeyedObjectPool ex
>         }
>     }
>
> +    @Test
>     public void testBorrowReturnWithSometimesInvalidObjects() throws Exception {
>         KeyedObjectPool<Object,Object> pool = new StackKeyedObjectPool<Object,Object>(
>             new KeyedPoolableObjectFactory<Object,Object>() {
>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org


Mime
View raw message