commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r901944 - in /commons/proper/pool/trunk: ./ src/test/org/apache/commons/pool/ src/test/org/apache/commons/pool/impl/
Date Fri, 22 Jan 2010 00:27:05 GMT
Author: sebb
Date: Fri Jan 22 00:27:04 2010
New Revision: 901944

URL: http://svn.apache.org/viewvc?rev=901944&view=rev
Log:
Remove TestAll classes and suite() methods

Removed:
    commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestAll.java
    commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestAll.java
Modified:
    commons/proper/pool/trunk/build.xml
    commons/proper/pool/trunk/pom.xml
    commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestBaseKeyedObjectPool.java
    commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestBaseKeyedPoolableObjectFactory.java
    commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestBaseObjectPool.java
    commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestBasePoolableObjectFactory.java
    commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestPoolUtils.java
    commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPool.java
    commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPoolFactory.java
    commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestGenericObjectPool.java
    commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestGenericObjectPoolFactory.java
    commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestSoftRefOutOfMemory.java
    commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestSoftReferenceObjectPool.java
    commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPool.java
    commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPoolFactory.java
    commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestStackObjectPool.java
    commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestStackObjectPoolFactory.java

Modified: commons/proper/pool/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/build.xml?rev=901944&r1=901943&r2=901944&view=diff
==============================================================================
--- commons/proper/pool/trunk/build.xml (original)
+++ commons/proper/pool/trunk/build.xml Fri Jan 22 00:27:04 2010
@@ -52,7 +52,6 @@
       <property name="dist.dir" value="${basedir}/dist"/>
       <property name="dist.jar" value="${dist.dir}/${name}.jar"/>
 
-      <property name="test.entry" value="org.apache.commons.pool.TestAll"/>
       <property name="test.failonerror" value="true" /> 
      
       <property name="javadoc.dir" value="${dist.dir}/docs/api"/>
@@ -138,7 +137,19 @@
           <pathelement location="${build.test-classes.dir}" /> 
           <pathelement path="${classpath}" /> 
         </classpath>
-        <test name="${test.entry}"/>
+        <!-- If test.entry is defined, run a single test, otherwise run all valid tests
-->
+        <test name="${test.entry}" if="test.entry"/>
+        <batchtest todir="${build.dir}/ant-reports" unless="test.entry">
+          <fileset dir="${src.test.dir}">
+            <include name="**/Test*.java"/>
+            <exclude name="org/apache/commons/pool/impl/TestSoftRefOutOfMemory.java"/>
+          	<!-- abstract classes -->
+          	<exclude name="**/TestObjectPool.java"/>
+            <exclude name="**/TestObjectPoolFactory.java"/>
+            <exclude name="**/TestKeyedObjectPool.java"/>
+            <exclude name="**/TestKeyedObjectPoolFactory.java"/>
+          </fileset>
+        </batchtest>
       </junit>
    </target>
 

Modified: commons/proper/pool/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/pom.xml?rev=901944&r1=901943&r2=901944&view=diff
==============================================================================
--- commons/proper/pool/trunk/pom.xml (original)
+++ commons/proper/pool/trunk/pom.xml Fri Jan 22 00:27:04 2010
@@ -157,23 +157,13 @@
           <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
               <includes>
-		        <include>org/apache/commons/pool/TestBaseObjectPool.java</include>
-		        <include>org/apache/commons/pool/TestBaseKeyedObjectPool.java</include>
-		        <include>org/apache/commons/pool/TestBasePoolableObjectFactory.java</include>
-		        <include>org/apache/commons/pool/TestBaseKeyedPoolableObjectFactory.java</include>
-		        <include>org/apache/commons/pool/TestPoolUtils.java</include>
-		
-		        <include>org/apache/commons/pool/impl/TestStackObjectPool.java</include>
-		        <include>org/apache/commons/pool/impl/TestStackKeyedObjectPool.java</include>
-		        <include>org/apache/commons/pool/impl/TestGenericObjectPool.java</include>
-		        <include>org/apache/commons/pool/impl/TestGenericKeyedObjectPool.java</include>
-		        <include>org/apache/commons/pool/impl/TestSoftReferenceObjectPool.java</include>
-		        <!--<include>org/apache/commons/pool/impl/TestSoftRefOutOfMemory.java</include>-->
-		        <include>org/apache/commons/pool/impl/TestGenericObjectPoolFactory.java</include>
-		        <include>org/apache/commons/pool/impl/TestStackObjectPoolFactory.java</include>
-		        <include>org/apache/commons/pool/impl/TestGenericKeyedObjectPoolFactory.java</include>
-		        <include>org/apache/commons/pool/impl/TestStackKeyedObjectPoolFactory.java</include>
+		        <include>**/Test*.java</include>
 		      </includes>
+              <excludes>
+                <!-- nested classes are not handled properly by Surefire -->
+                <exclude>**/Test*$*.java</exclude>
+		        <exclude>org/apache/commons/pool/impl/TestSoftRefOutOfMemory.java</exclude>
+              </excludes>
             </configuration>
           </plugin>
         <plugin>

Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestBaseKeyedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestBaseKeyedObjectPool.java?rev=901944&r1=901943&r2=901944&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestBaseKeyedObjectPool.java
(original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestBaseKeyedObjectPool.java
Fri Jan 22 00:27:04 2010
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.pool;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
 
 /**
  * @author Rodney Waldhoff
@@ -71,11 +69,6 @@
         throw new UnsupportedOperationException("BaseKeyedObjectPool isn't a complete implementation.");
     }
 
-    public static Test suite() {
-        return new TestSuite(TestBaseKeyedObjectPool.class);
-    }
-
-    // tests
     public void setUp() throws Exception {
         super.setUp();
     }

Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestBaseKeyedPoolableObjectFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestBaseKeyedPoolableObjectFactory.java?rev=901944&r1=901943&r2=901944&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestBaseKeyedPoolableObjectFactory.java
(original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestBaseKeyedPoolableObjectFactory.java
Fri Jan 22 00:27:04 2010
@@ -16,9 +16,7 @@
  */
 package org.apache.commons.pool;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * @author Rodney Waldhoff
@@ -29,11 +27,6 @@
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestBaseKeyedPoolableObjectFactory.class);
-    }
-    
-    // tests
     public void testDefaultMethods() throws Exception {
         KeyedPoolableObjectFactory factory = new BaseKeyedPoolableObjectFactory() { 
             public Object makeObject(Object key) throws Exception {

Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestBaseObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestBaseObjectPool.java?rev=901944&r1=901943&r2=901944&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestBaseObjectPool.java (original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestBaseObjectPool.java Fri
Jan 22 00:27:04 2010
@@ -16,8 +16,6 @@
  */
 package org.apache.commons.pool;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
 
 /**
  * @author Rodney Waldhoff
@@ -31,10 +29,6 @@
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestBaseObjectPool.class);
-    }
-    
     protected ObjectPool makeEmptyPool(int mincapacity) {
         if (this.getClass() != TestBaseObjectPool.class) {
             fail("Subclasses of TestBaseObjectPool must reimplement this method.");

Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestBasePoolableObjectFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestBasePoolableObjectFactory.java?rev=901944&r1=901943&r2=901944&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestBasePoolableObjectFactory.java
(original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestBasePoolableObjectFactory.java
Fri Jan 22 00:27:04 2010
@@ -16,9 +16,7 @@
  */
 package org.apache.commons.pool;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * @author Rodney Waldhoff
@@ -29,11 +27,6 @@
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestBasePoolableObjectFactory.class);
-    }
-    
-    // tests
     public void testDefaultMethods() throws Exception {
         PoolableObjectFactory factory = new BasePoolableObjectFactory() { 
             public Object makeObject() throws Exception {

Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestPoolUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestPoolUtils.java?rev=901944&r1=901943&r2=901944&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestPoolUtils.java (original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestPoolUtils.java Fri Jan
22 00:27:04 2010
@@ -17,26 +17,24 @@
 
 package org.apache.commons.pool;
 
-import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import java.lang.reflect.Proxy;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
-import java.util.List;
+import java.lang.reflect.Proxy;
 import java.util.ArrayList;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.TimerTask;
+import java.util.Arrays;
 import java.util.Collection;
-import java.util.Map;
+import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TimerTask;
+
+import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
 
-import org.apache.commons.pool.impl.GenericObjectPool;
 import org.apache.commons.pool.impl.GenericKeyedObjectPool;
+import org.apache.commons.pool.impl.GenericObjectPool;
 
 /**
  * Unit tests for {@link PoolUtils}.
@@ -55,10 +53,6 @@
     /** Sleep time to let the minIdle tests run CHECK_COUNT times. */
     private static final int CHECK_SLEEP_PERIOD = CHECK_PERIOD * (CHECK_COUNT - 1) + CHECK_PERIOD
/ 2;
 
-    public static Test suite() {
-        return new TestSuite(TestPoolUtils.class);
-    }
-
     public void testJavaBeanInstantiation() {
         new PoolUtils();
     }

Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPool.java?rev=901944&r1=901943&r2=901944&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPool.java
(original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPool.java
Fri Jan 22 00:27:04 2010
@@ -17,20 +17,18 @@
 
 package org.apache.commons.pool.impl;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.commons.pool.KeyedObjectPool;
-import org.apache.commons.pool.KeyedPoolableObjectFactory;
-import org.apache.commons.pool.TestBaseKeyedObjectPool;
-import org.apache.commons.pool.VisitTracker;
-import org.apache.commons.pool.VisitTrackerFactory;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.NoSuchElementException;
 import java.util.Random;
 
+import org.apache.commons.pool.KeyedObjectPool;
+import org.apache.commons.pool.KeyedPoolableObjectFactory;
+import org.apache.commons.pool.TestBaseKeyedObjectPool;
+import org.apache.commons.pool.VisitTracker;
+import org.apache.commons.pool.VisitTrackerFactory;
+
 /**
  * @author Rodney Waldhoff
  * @version $Revision$ $Date$
@@ -40,10 +38,6 @@
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestGenericKeyedObjectPool.class);
-    }
-
     protected KeyedObjectPool makeEmptyPool(int mincapacity) {
         GenericKeyedObjectPool pool = new GenericKeyedObjectPool(
             new KeyedPoolableObjectFactory()  {

Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPoolFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPoolFactory.java?rev=901944&r1=901943&r2=901944&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPoolFactory.java
(original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestGenericKeyedObjectPoolFactory.java
Fri Jan 22 00:27:04 2010
@@ -17,11 +17,9 @@
 
 package org.apache.commons.pool.impl;
 
-import org.apache.commons.pool.TestKeyedObjectPoolFactory;
 import org.apache.commons.pool.KeyedObjectPoolFactory;
 import org.apache.commons.pool.KeyedPoolableObjectFactory;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.apache.commons.pool.TestKeyedObjectPoolFactory;
 
 /**
  * Tests for {@link GenericKeyedObjectPoolFactory}.
@@ -34,10 +32,6 @@
         super(name);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestGenericKeyedObjectPoolFactory.class);
-    }
-
     protected KeyedObjectPoolFactory makeFactory(final KeyedPoolableObjectFactory objectFactory)
{
         return new GenericKeyedObjectPoolFactory(objectFactory);
     }

Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestGenericObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestGenericObjectPool.java?rev=901944&r1=901943&r2=901944&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestGenericObjectPool.java
(original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestGenericObjectPool.java
Fri Jan 22 00:27:04 2010
@@ -17,19 +17,17 @@
 
 package org.apache.commons.pool.impl;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import java.util.NoSuchElementException;
+import java.util.Random;
+
 import org.apache.commons.pool.BasePoolableObjectFactory;
 import org.apache.commons.pool.ObjectPool;
-import org.apache.commons.pool.PoolableObjectFactory;
 import org.apache.commons.pool.PoolUtils;
+import org.apache.commons.pool.PoolableObjectFactory;
 import org.apache.commons.pool.TestBaseObjectPool;
 import org.apache.commons.pool.VisitTracker;
 import org.apache.commons.pool.VisitTrackerFactory;
 
-import java.util.NoSuchElementException;
-import java.util.Random;
-
 /**
  * @author Rodney Waldhoff
  * @author Dirk Verbeeck
@@ -41,10 +39,6 @@
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestGenericObjectPool.class);
-    }
-
     protected ObjectPool makeEmptyPool(int mincap) {
        GenericObjectPool pool = new GenericObjectPool(new SimpleFactory());
        pool.setMaxActive(mincap);

Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestGenericObjectPoolFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestGenericObjectPoolFactory.java?rev=901944&r1=901943&r2=901944&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestGenericObjectPoolFactory.java
(original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestGenericObjectPoolFactory.java
Fri Jan 22 00:27:04 2010
@@ -17,14 +17,12 @@
 
 package org.apache.commons.pool.impl;
 
-import org.apache.commons.pool.TestObjectPoolFactory;
+import java.util.NoSuchElementException;
+
+import org.apache.commons.pool.MethodCallPoolableObjectFactory;
 import org.apache.commons.pool.ObjectPoolFactory;
 import org.apache.commons.pool.PoolableObjectFactory;
-import org.apache.commons.pool.MethodCallPoolableObjectFactory;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import java.util.NoSuchElementException;
+import org.apache.commons.pool.TestObjectPoolFactory;
 
 /**
  * Tests for {@link GenericObjectPoolFactory}.
@@ -37,10 +35,6 @@
         super(name);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestGenericObjectPoolFactory.class);
-    }
-
     protected ObjectPoolFactory makeFactory(final PoolableObjectFactory objectFactory) throws
UnsupportedOperationException {
         return new GenericObjectPoolFactory(objectFactory);
     }

Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestSoftRefOutOfMemory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestSoftRefOutOfMemory.java?rev=901944&r1=901943&r2=901944&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestSoftRefOutOfMemory.java
(original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestSoftRefOutOfMemory.java
Fri Jan 22 00:27:04 2010
@@ -17,15 +17,15 @@
 
 package org.apache.commons.pool.impl;
 
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.apache.commons.pool.BasePoolableObjectFactory;
-import org.apache.commons.pool.PoolableObjectFactory;
-
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
+import junit.framework.TestCase;
+
+import org.apache.commons.pool.BasePoolableObjectFactory;
+import org.apache.commons.pool.PoolableObjectFactory;
+
 /**
  * @author Dirk Verbeeck
  * @author Sandy McArthur
@@ -38,10 +38,6 @@
         super(testName);
     }
 
-    public static TestSuite suite() {
-        return new TestSuite(TestSoftRefOutOfMemory.class);
-    }
-
     public void tearDown() throws Exception {
         if (pool != null) {
             pool.close();

Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestSoftReferenceObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestSoftReferenceObjectPool.java?rev=901944&r1=901943&r2=901944&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestSoftReferenceObjectPool.java
(original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestSoftReferenceObjectPool.java
Fri Jan 22 00:27:04 2010
@@ -17,9 +17,6 @@
 
 package org.apache.commons.pool.impl;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.pool.ObjectPool;
 import org.apache.commons.pool.PoolableObjectFactory;
 import org.apache.commons.pool.TestBaseObjectPool;
@@ -34,10 +31,6 @@
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestSoftReferenceObjectPool.class);
-    }
-
     protected ObjectPool makeEmptyPool(int cap) {
         return new SoftReferenceObjectPool(
             new PoolableObjectFactory()  {

Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPool.java?rev=901944&r1=901943&r2=901944&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPool.java
(original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPool.java
Fri Jan 22 00:27:04 2010
@@ -21,9 +21,6 @@
 import java.util.HashMap;
 import java.util.NoSuchElementException;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.commons.pool.KeyedObjectPool;
 import org.apache.commons.pool.KeyedPoolableObjectFactory;
 import org.apache.commons.pool.TestBaseKeyedObjectPool;
@@ -37,10 +34,6 @@
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestStackKeyedObjectPool.class);
-    }
-
     protected KeyedObjectPool makeEmptyPool(int mincapacity) {
         StackKeyedObjectPool pool = new StackKeyedObjectPool(new SimpleFactory(),mincapacity);
         return pool;

Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPoolFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPoolFactory.java?rev=901944&r1=901943&r2=901944&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPoolFactory.java
(original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestStackKeyedObjectPoolFactory.java
Fri Jan 22 00:27:04 2010
@@ -17,11 +17,9 @@
 
 package org.apache.commons.pool.impl;
 
-import org.apache.commons.pool.TestKeyedObjectPoolFactory;
 import org.apache.commons.pool.KeyedObjectPoolFactory;
 import org.apache.commons.pool.KeyedPoolableObjectFactory;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.apache.commons.pool.TestKeyedObjectPoolFactory;
 
 /**
  * Tests for {@link StackKeyedObjectPoolFactory}.
@@ -34,10 +32,6 @@
         super(name);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestStackKeyedObjectPoolFactory.class);
-    }
-
     protected KeyedObjectPoolFactory makeFactory(final KeyedPoolableObjectFactory objectFactory)
throws UnsupportedOperationException {
         return new StackKeyedObjectPoolFactory(objectFactory);
     }

Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestStackObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestStackObjectPool.java?rev=901944&r1=901943&r2=901944&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestStackObjectPool.java
(original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestStackObjectPool.java
Fri Jan 22 00:27:04 2010
@@ -17,17 +17,15 @@
 
 package org.apache.commons.pool.impl;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.commons.pool.ObjectPool;
-import org.apache.commons.pool.PoolableObjectFactory;
-import org.apache.commons.pool.TestBaseObjectPool;
-
 import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.List;
 import java.util.NoSuchElementException;
 
+import org.apache.commons.pool.ObjectPool;
+import org.apache.commons.pool.PoolableObjectFactory;
+import org.apache.commons.pool.TestBaseObjectPool;
+
 /**
  * @author Rodney Waldhoff
  * @author Dirk Verbeeck
@@ -39,10 +37,6 @@
         super(testName);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestStackObjectPool.class);
-    }
-
     protected ObjectPool makeEmptyPool(int mincap) {
         return new StackObjectPool(new SimpleFactory());
     }

Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestStackObjectPoolFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestStackObjectPoolFactory.java?rev=901944&r1=901943&r2=901944&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestStackObjectPoolFactory.java
(original)
+++ commons/proper/pool/trunk/src/test/org/apache/commons/pool/impl/TestStackObjectPoolFactory.java
Fri Jan 22 00:27:04 2010
@@ -17,12 +17,10 @@
 
 package org.apache.commons.pool.impl;
 
-import org.apache.commons.pool.TestObjectPoolFactory;
+import org.apache.commons.pool.MethodCallPoolableObjectFactory;
 import org.apache.commons.pool.ObjectPoolFactory;
 import org.apache.commons.pool.PoolableObjectFactory;
-import org.apache.commons.pool.MethodCallPoolableObjectFactory;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.apache.commons.pool.TestObjectPoolFactory;
 
 /**
  * Tests for {@link StackObjectPoolFactory}.
@@ -35,10 +33,6 @@
         super(name);
     }
 
-    public static Test suite() {
-        return new TestSuite(TestStackObjectPoolFactory.class);
-    }
-
     protected ObjectPoolFactory makeFactory(final PoolableObjectFactory objectFactory) throws
UnsupportedOperationException {
         return new StackObjectPoolFactory(objectFactory);
     }



Mime
View raw message