You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2014/04/14 00:07:43 UTC
svn commit: r1587109 - in
/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2: ./
cpdsadapter/ datasources/ managed/
Author: sebb
Date: Sun Apr 13 22:07:42 2014
New Revision: 1587109
URL: http://svn.apache.org/r1587109
Log:
Remove redundant Test suite() methods
Modified:
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestJndi.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolableConnection.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestFactory.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestDataSourceXAConnectionFactory.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java Sun Apr 13 22:07:42 2014
@@ -27,9 +27,6 @@ import java.sql.Statement;
import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
import org.junit.Assert;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
* TestSuite for BasicDataSource with abandoned connection trace enabled
*
@@ -41,10 +38,6 @@ public class TestAbandonedBasicDataSourc
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestAbandonedBasicDataSource.class);
- }
-
@Override
public void setUp() throws Exception {
super.setUp();
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java Sun Apr 13 22:07:42 2014
@@ -26,9 +26,6 @@ import java.util.concurrent.atomic.Atomi
import javax.sql.DataSource;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
* TestSuite for BasicDataSource
*
@@ -40,10 +37,6 @@ public class TestBasicDataSource extends
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestBasicDataSource.class);
- }
-
@Override
protected Connection getConnection() throws Exception {
return ds.getConnection();
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java Sun Apr 13 22:07:42 2014
@@ -20,9 +20,7 @@ package org.apache.commons.dbcp2;
import java.sql.Connection;
import java.util.Properties;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* TestSuite for BasicDataSourceFactory
@@ -35,10 +33,6 @@ public class TestBasicDataSourceFactory
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestBasicDataSourceFactory.class);
- }
-
public void testNoProperties() throws Exception {
Properties properties = new Properties();
BasicDataSource ds = BasicDataSourceFactory.createDataSource(properties);
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java Sun Apr 13 22:07:42 2014
@@ -20,9 +20,7 @@ package org.apache.commons.dbcp2;
import java.sql.CallableStatement;
import java.sql.Connection;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* @version $Revision$ $Date$
@@ -32,10 +30,6 @@ public class TestDelegatingCallableState
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestDelegatingCallableStatement.class);
- }
-
private DelegatingConnection<Connection> conn = null;
private Connection delegateConn = null;
private DelegatingCallableStatement stmt = null;
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java Sun Apr 13 22:07:42 2014
@@ -21,10 +21,7 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
/**
@@ -36,10 +33,6 @@ public class TestDelegatingConnection ex
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestDelegatingConnection.class);
- }
-
private DelegatingConnection<? extends Connection> conn = null;
private Connection delegateConn = null;
private Connection delegateConn2 = null;
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java Sun Apr 13 22:07:42 2014
@@ -20,9 +20,7 @@ package org.apache.commons.dbcp2;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Test suite for {@link DelegatingDatabaseMetaData}.
@@ -32,10 +30,6 @@ public class TestDelegatingDatabaseMetaD
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestDelegatingDatabaseMetaData.class);
- }
-
private DelegatingConnection<Connection> conn = null;
private Connection delegateConn = null;
private DelegatingDatabaseMetaData meta = null;
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java Sun Apr 13 22:07:42 2014
@@ -20,9 +20,7 @@ package org.apache.commons.dbcp2;
import java.sql.Connection;
import java.sql.PreparedStatement;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* @author Rodney Waldhoff
@@ -34,10 +32,6 @@ public class TestDelegatingPreparedState
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestDelegatingPreparedStatement.class);
- }
-
private DelegatingConnection<Connection> conn = null;
private Connection delegateConn = null;
private DelegatingPreparedStatement stmt = null;
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java Sun Apr 13 22:07:42 2014
@@ -22,9 +22,7 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* @author Rodney Waldhoff
@@ -36,10 +34,6 @@ public class TestDelegatingStatement ext
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestDelegatingStatement.class);
- }
-
private DelegatingConnection<Connection> conn = null;
private Connection delegateConn = null;
private DelegatingStatement stmt = null;
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java Sun Apr 13 22:07:42 2014
@@ -24,9 +24,7 @@ import javax.sql.DataSource;
import org.apache.commons.pool2.impl.GenericObjectPool;
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* This test *must* execute before all other tests to be effective as it tests
@@ -41,10 +39,6 @@ public class TestDriverManagerConnection
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestDriverManagerConnectionFactory.class);
- }
-
public void testDriverManagerInit() throws Exception {
System.setProperty("jdbc.drivers",
"org.apache.commons.dbcp2.TesterDriver");
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestJndi.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestJndi.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestJndi.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestJndi.java Sun Apr 13 22:07:42 2014
@@ -24,10 +24,7 @@ import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.sql.DataSource;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.dbcp2.datasources.SharedPoolDataSource;
import org.apache.commons.dbcp2.datasources.PerUserPoolDataSource;
@@ -59,10 +56,6 @@ public class TestJndi extends TestCase {
super(name);
}
- public static Test suite() {
- return new TestSuite(TestJndi.class);
- }
-
/**
* Test BasicDatsource bind and lookup
*
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java Sun Apr 13 22:07:42 2014
@@ -26,9 +26,7 @@ import java.sql.SQLException;
import javax.management.ObjectName;
import javax.sql.DataSource;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.apache.commons.pool2.ObjectPool;
import org.apache.commons.pool2.impl.GenericObjectPool;
@@ -46,10 +44,6 @@ public class TestPStmtPooling extends Te
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestPStmtPooling.class);
- }
-
public void testStmtPool() throws Exception {
DriverManager.registerDriver(new TesterDriver());
ConnectionFactory connFactory = new DriverManagerConnectionFactory(
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java Sun Apr 13 22:07:42 2014
@@ -22,9 +22,6 @@ import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.sql.Statement;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
* TestSuite for BasicDataSource with prepared statement pooling enabled
*
@@ -36,10 +33,6 @@ public class TestPStmtPoolingBasicDataSo
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestPStmtPoolingBasicDataSource.class);
- }
-
@Override
public void setUp() throws Exception {
super.setUp();
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolableConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolableConnection.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolableConnection.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolableConnection.java Sun Apr 13 22:07:42 2014
@@ -19,10 +19,7 @@ package org.apache.commons.dbcp2;
import java.sql.Connection;
import java.sql.SQLException;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.pool2.ObjectPool;
import org.apache.commons.pool2.impl.GenericObjectPool;
import org.junit.Assert;
@@ -36,10 +33,6 @@ public class TestPoolableConnection exte
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestPoolableConnection.class);
- }
-
private ObjectPool<PoolableConnection> pool = null;
@Override
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java Sun Apr 13 22:07:42 2014
@@ -20,9 +20,6 @@ package org.apache.commons.dbcp2;
import java.sql.Connection;
import java.util.Properties;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.commons.pool2.impl.GenericObjectPool;
import org.junit.Assert;
@@ -36,10 +33,6 @@ public class TestPoolingDataSource exten
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestPoolingDataSource.class);
- }
-
@Override
protected Connection getConnection() throws Exception {
return ds.getConnection();
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java Sun Apr 13 22:07:42 2014
@@ -27,9 +27,6 @@ import java.sql.SQLException;
import javax.sql.DataSource;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.commons.pool2.ObjectPool;
import org.apache.commons.pool2.impl.GenericObjectPool;
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
@@ -46,10 +43,6 @@ public class TestPoolingDriver extends T
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestPoolingDriver.class);
- }
-
@Override
protected Connection getConnection() throws Exception {
return DriverManager.getConnection("jdbc:apache:commons:dbcp:test");
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java Sun Apr 13 22:07:42 2014
@@ -28,9 +28,7 @@ import javax.sql.DataSource;
import org.apache.commons.dbcp2.datasources.SharedPoolDataSource;
import org.junit.Assert;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Tests for DriverAdapterCPDS
@@ -42,10 +40,6 @@ public class TestDriverAdapterCPDS exten
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestDriverAdapterCPDS.class);
- }
-
private DriverAdapterCPDS pcds;
@Override
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java Sun Apr 13 22:07:42 2014
@@ -22,10 +22,7 @@ import java.sql.SQLException;
import javax.sql.PooledConnection;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS;
import org.apache.commons.pool2.impl.GenericObjectPool;
@@ -41,10 +38,6 @@ public class TestCPDSConnectionFactory e
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestCPDSConnectionFactory.class);
- }
-
@Override
public void setUp() throws Exception {
cpds = new ConnectionPoolDataSourceProxy(new DriverAdapterCPDS());
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestFactory.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestFactory.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestFactory.java Sun Apr 13 22:07:42 2014
@@ -27,9 +27,7 @@ import javax.naming.Reference;
import javax.naming.StringRefAddr;
import javax.naming.spi.ObjectFactory;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* @author Dirk Verbeeck
@@ -40,10 +38,6 @@ public class TestFactory extends TestCas
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestFactory.class);
- }
-
// Bugzilla Bug 24082: bug in InstanceKeyDataSourceFactory
// There's a fatal bug in InstanceKeyDataSourceFactory that means you can't
// instantiate more than one factory.
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java Sun Apr 13 22:07:42 2014
@@ -20,10 +20,7 @@ package org.apache.commons.dbcp2.datasou
import java.sql.Connection;
import java.sql.SQLException;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS;
/**
@@ -34,11 +31,6 @@ public class TestInstanceKeyDataSource e
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestInstanceKeyDataSource.class);
- }
-
-
@Override
public void setUp() throws Exception {
}
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java Sun Apr 13 22:07:42 2014
@@ -22,10 +22,7 @@ import java.sql.SQLException;
import javax.sql.PooledConnection;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS;
import org.apache.commons.pool2.KeyedObjectPool;
@@ -42,10 +39,6 @@ public class TestKeyedCPDSConnectionFact
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestKeyedCPDSConnectionFactory.class);
- }
-
@Override
public void setUp() throws Exception {
cpds = new ConnectionPoolDataSourceProxy(new DriverAdapterCPDS());
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java Sun Apr 13 22:07:42 2014
@@ -29,9 +29,6 @@ import java.sql.Statement;
import javax.sql.DataSource;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.commons.dbcp2.TestConnectionPool;
import org.apache.commons.dbcp2.TesterDriver;
import org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS;
@@ -46,10 +43,6 @@ public class TestPerUserPoolDataSource e
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestPerUserPoolDataSource.class);
- }
-
@Override
protected Connection getConnection() throws SQLException {
return ds.getConnection("foo","bar");
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java Sun Apr 13 22:07:42 2014
@@ -26,9 +26,6 @@ import java.util.ArrayList;
import javax.sql.DataSource;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.commons.dbcp2.DelegatingStatement;
import org.apache.commons.dbcp2.TestConnectionPool;
import org.apache.commons.dbcp2.TesterDriver;
@@ -44,10 +41,6 @@ public class TestSharedPoolDataSource ex
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestSharedPoolDataSource.class);
- }
-
@Override
protected Connection getConnection() throws Exception {
return ds.getConnection("foo","bar");
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java Sun Apr 13 22:07:42 2014
@@ -21,8 +21,6 @@ import java.sql.SQLException;
import org.apache.commons.dbcp2.BasicDataSource;
import org.apache.commons.dbcp2.TestBasicDataSource;
import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
-import junit.framework.Test;
-import junit.framework.TestSuite;
/**
* TestSuite for BasicManagedDataSource
@@ -32,10 +30,6 @@ public class TestBasicManagedDataSource
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestBasicManagedDataSource.class);
- }
-
@Override
protected BasicDataSource createDataSource() throws Exception {
BasicManagedDataSource basicManagedDataSource = new BasicManagedDataSource();
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestDataSourceXAConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestDataSourceXAConnectionFactory.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestDataSourceXAConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestDataSourceXAConnectionFactory.java Sun Apr 13 22:07:42 2014
@@ -28,9 +28,6 @@ import java.util.concurrent.atomic.Atomi
import javax.sql.XAConnection;
import javax.sql.XADataSource;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.commons.dbcp2.TestBasicDataSource;
import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
@@ -44,10 +41,6 @@ public class TestDataSourceXAConnectionF
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestDataSourceXAConnectionFactory.class);
- }
-
protected BasicManagedDataSource bmds;
public AtomicInteger closeCounter = new AtomicInteger();
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java Sun Apr 13 22:07:42 2014
@@ -17,9 +17,6 @@
*/
package org.apache.commons.dbcp2.managed;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.commons.dbcp2.ConnectionFactory;
import org.apache.commons.dbcp2.DelegatingConnection;
import org.apache.commons.dbcp2.DriverConnectionFactory;
@@ -48,10 +45,6 @@ public class TestManagedDataSource exten
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestManagedDataSource.class);
- }
-
@Override
protected Connection getConnection() throws Exception {
return ds.getConnection();
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java?rev=1587109&r1=1587108&r2=1587109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java Sun Apr 13 22:07:42 2014
@@ -27,9 +27,6 @@ import java.sql.Statement;
import java.sql.ResultSet;
import java.sql.PreparedStatement;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import javax.transaction.Transaction;
/**
@@ -44,10 +41,6 @@ public class TestManagedDataSourceInTx e
super(testName);
}
- public static Test suite() {
- return new TestSuite(TestManagedDataSourceInTx.class);
- }
-
@Override
public void setUp() throws Exception {
super.setUp();