commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sandy...@apache.org
Subject svn commit: r422028 - in /jakarta/commons/proper/pool/trunk: project.xml src/test/org/apache/commons/pool/TestKeyedObjectPoolFactory.java src/test/org/apache/commons/pool/TestObjectPoolFactory.java
Date Fri, 14 Jul 2006 20:29:13 GMT
Author: sandymac
Date: Fri Jul 14 13:29:12 2006
New Revision: 422028

URL: http://svn.apache.org/viewvc?rev=422028&view=rev
Log:
Better fix for POOL-82 reverted Test[Keyed]ObjectPoolFactory sources and
updated the project.xml to only include the correct unit tests and
include previously missed unit tests.

Modified:
    jakarta/commons/proper/pool/trunk/project.xml
    jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestKeyedObjectPoolFactory.java
    jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestObjectPoolFactory.java

Modified: jakarta/commons/proper/pool/trunk/project.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/pool/trunk/project.xml?rev=422028&r1=422027&r2=422028&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/project.xml (original)
+++ jakarta/commons/proper/pool/trunk/project.xml Fri Jul 14 13:29:12 2006
@@ -260,12 +260,50 @@
     <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
     <unitTest>
       <includes>
-        <include>org/apache/commons/pool/Test*Factory.java</include>
         <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/Test*Pool.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>org/apache/commons/pool/composite/TestFifoLender.java</include>
+        <include>org/apache/commons/pool/composite/TestIdleEvictorLender.java</include>
+        <include>org/apache/commons/pool/composite/TestInvalidEvictorLender.java</include>
+        <include>org/apache/commons/pool/composite/TestLifoLender.java</include>
+        <include>org/apache/commons/pool/composite/TestNullLender.java</include>
+        <include>org/apache/commons/pool/composite/TestSoftLender.java</include>
+
+        <include>org/apache/commons/pool/composite/TestFailManager.java</include>
+        <include>org/apache/commons/pool/composite/TestGrowManager.java</include>
+        <include>org/apache/commons/pool/composite/TestIdleLimitManager.java</include>
+        <include>org/apache/commons/pool/composite/TestFailLimitManager.java</include>
+        <include>org/apache/commons/pool/composite/TestWaitLimitManager.java</include>
+
+        <include>org/apache/commons/pool/composite/TestNullTracker.java</include>
+        <include>org/apache/commons/pool/composite/TestReferenceTracker.java</include>
+        <include>org/apache/commons/pool/composite/TestDebugTracker.java</include>
+        <include>org/apache/commons/pool/composite/TestSimpleTracker.java</include>
+        <include>org/apache/commons/pool/composite/TestCompositeObjectPool.java</include>
+        <include>org/apache/commons/pool/composite/TestCompositeKeyedObjectPool.java</include>
+        <include>org/apache/commons/pool/composite/TestCompositeKeyedObjectPool2.java</include>
+        <include>org/apache/commons/pool/composite/TestCompositeKeyedObjectPoolFactory.java</include>
       </includes>
+<!--
+      <excludes>
+        <exclude>org/apache/commons/pool/TestObjectPoolFactory.java</exclude>
+      </excludes>
+-->
     </unitTest>
 
     <resources>

Modified: jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestKeyedObjectPoolFactory.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestKeyedObjectPoolFactory.java?rev=422028&r1=422027&r2=422028&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestKeyedObjectPoolFactory.java
(original)
+++ jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestKeyedObjectPoolFactory.java
Fri Jul 14 13:29:12 2006
@@ -24,8 +24,8 @@
  * @author Sandy McArthur
  * @version $Revision$ $Date$
  */
-public class TestKeyedObjectPoolFactory extends TestCase {
-    public TestKeyedObjectPoolFactory(final String name) {
+public abstract class TestKeyedObjectPoolFactory extends TestCase {
+    protected TestKeyedObjectPoolFactory(final String name) {
         super(name);
     }
 
@@ -39,9 +39,7 @@
     /**
      * @throws UnsupportedOperationException when this is unsupported by this KeyedPoolableObjectFactory
type.
      */
-    protected KeyedObjectPoolFactory makeFactory(KeyedPoolableObjectFactory objectFactory)
throws UnsupportedOperationException{
-        throw new UnsupportedOperationException("Subclass needs to override makeFactory method.");
-    }
+    protected abstract KeyedObjectPoolFactory makeFactory(KeyedPoolableObjectFactory objectFactory)
throws UnsupportedOperationException;
 
     protected static KeyedPoolableObjectFactory createObjectFactory() {
         return PoolUtils.adapt(new MethodCallPoolableObjectFactory());

Modified: jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestObjectPoolFactory.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestObjectPoolFactory.java?rev=422028&r1=422027&r2=422028&view=diff
==============================================================================
--- jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestObjectPoolFactory.java
(original)
+++ jakarta/commons/proper/pool/trunk/src/test/org/apache/commons/pool/TestObjectPoolFactory.java
Fri Jul 14 13:29:12 2006
@@ -24,8 +24,8 @@
  * @author Sandy McArthur
  * @version $Revision$ $Date$
  */
-public class TestObjectPoolFactory extends TestCase {
-    public TestObjectPoolFactory(final String name) {
+public abstract class TestObjectPoolFactory extends TestCase {
+    protected TestObjectPoolFactory(final String name) {
         super(name);
     }
 
@@ -39,9 +39,7 @@
     /**
      * @throws UnsupportedOperationException when this is unsupported by this PoolableObjectFactory
type.
      */
-    protected ObjectPoolFactory makeFactory(PoolableObjectFactory objectFactory) throws UnsupportedOperationException
{
-        throw new UnsupportedOperationException("Subclass needs to override makeFactory method.");
-    }
+    protected abstract ObjectPoolFactory makeFactory(PoolableObjectFactory objectFactory)
throws UnsupportedOperationException;
 
     public void testCreatePool() throws Exception {
         final ObjectPoolFactory factory;



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


Mime
View raw message