/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 * 
 *      http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.commons.dbcp;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.commons.dbcp.datasources.TestFactory;
import org.apache.commons.dbcp.datasources.TestPerUserPoolDataSource;
import org.apache.commons.dbcp.datasources.TestSharedPoolDataSource;
import org.apache.commons.dbcp.managed.TestBasicManagedDataSource;
import org.apache.commons.dbcp.managed.TestManagedDataSource;
import org.apache.commons.dbcp.managed.TestManagedDataSourceInTx;
import org.apache.commons.jocl.TestJOCLContentHandler;

/**
 * @author Rodney Waldhoff
 * @version $Revision$ $Date$
 */
public class TestAll extends TestCase {
    public TestAll(String testName) {
        super(testName);
    }

    public static Test suite() {
        TestSuite suite = new TestSuite();
        suite.addTest(TestAbandonedObjectPool.suite());
        suite.addTest(TestManual.suite());
        suite.addTest(TestJOCLed.suite());
        suite.addTest(TestBasicDataSourceFactory.suite());
        suite.addTest(TestBasicDataSource.suite());
        suite.addTest(TestAbandonedBasicDataSource.suite());
        suite.addTest(TestPStmtPoolingBasicDataSource.suite());
        suite.addTest(TestDelegatingConnection.suite());
        suite.addTest(TestDelegatingStatement.suite());
        suite.addTest(TestDelegatingPreparedStatement.suite());
        suite.addTest(TestPoolableConnection.suite());
        suite.addTest(TestSharedPoolDataSource.suite());
        suite.addTest(TestPerUserPoolDataSource.suite());
        suite.addTest(TestFactory.suite());
        suite.addTest(TestJOCLContentHandler.suite());
        suite.addTest(TestPoolingDataSource.suite());
        suite.addTest(TestJndi.suite());
        suite.addTest(TestBasicManagedDataSource.suite());
        suite.addTest(TestManagedDataSource.suite());
        suite.addTest(TestManagedDataSourceInTx.suite());
        return suite;
    }

    public static void main(String args[]) {
        String[] testCaseName = { TestAll.class.getName() };
        junit.textui.TestRunner.main(testCaseName);
    }
}

@@ -985,16 +985,161 @@
 actory;%0A
+import org.apache.commons.dbcp.datasources.TestInstanceKeyDataSource;%0Aimport org.apache.commons.dbcp.datasources.TestKeyedCPDSConnectionFactory;%0A
 import o
@@ -1771,16 +1771,38 @@
 uite();%0A
+        // o.a.c.dbcp%0A
         
@@ -1832,18 +1832,23 @@
 oned
-ObjectPool
+BasicDataSource
 .sui
@@ -1884,13 +1884,26 @@
 Test
-Manua
+AbandonedObjectPoo
 l.su
@@ -1940,14 +1940,23 @@
 Test
-JOCLed
+BasicDataSource
 .sui
@@ -2033,41 +2033,88 @@
     
-suite.addTest(TestBasicDataSource
+// TestConnectionPool is abstract%0A        suite.addTest(TestDelegatingConnection
 .sui
@@ -2150,32 +2150,35 @@
 Test
-AbandonedBasicDataSource
+DelegatingPreparedStatement
 .sui
@@ -2214,35 +2214,27 @@
 Test
-PStmtPoolingBasicDataSource
+DelegatingStatement
 .sui
@@ -2266,36 +2266,20 @@
 est(Test
-DelegatingConnection
+Jndi
 .suite()
@@ -2307,35 +2307,22 @@
 est(Test
-DelegatingStatement
+JOCLed
 .suite()
@@ -2354,35 +2354,14 @@
 Test
-DelegatingPreparedStatement
+Manual
 .sui
@@ -2444,34 +2444,31 @@
 addTest(Test
-Shared
 Pool
+ing
 DataSource.s
@@ -2507,127 +2507,282 @@
 estP
-erUserPoolDataSource.suite());%0A        suite.addTest(TestFactory.suite());%0A        suite.addTest(TestJOCLContentHandler
+StmtPooling.suite());%0A        suite.addTest(TestPStmtPoolingBasicDataSource.suite());%0A        // o.a.c.dbcp.datasources%0A        suite.addTest(TestFactory.suite());%0A        suite.addTest(TestInstanceKeyDataSource.suite());%0A        suite.addTest(TestKeyedCPDSConnectionFactory
 .sui
@@ -2807,38 +2807,42 @@
 te.addTest(TestP
+erUserP
 ool
-ing
 DataSource.suite
@@ -2868,38 +2868,84 @@
 addTest(Test
-Jndi.suite());
+SharedPoolDataSource.suite());%0A        // o.a.c.dbcp.managed
 %0A        sui
@@ -3096,32 +3096,109 @@
 eInTx.suite());%0A
+        // o.a.c.jocl%0A        suite.addTest(TestJOCLContentHandler.suite());%0A
         return s

Order tests alphabetically so I can find the missing ones (Continuum finds 405, this only used to run 400). Add the 5 missing tests.