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 2010/01/18 00:08:27 UTC
svn commit: r900241 - in /commons/proper/dbcp/trunk: build-1.3.xml build.xml
pom-1.3.xml pom.xml src/test/org/apache/commons/dbcp/TestAll.java
Author: sebb
Date: Sun Jan 17 23:08:26 2010
New Revision: 900241
URL: http://svn.apache.org/viewvc?rev=900241&view=rev
Log:
Simplify test invocation
Removed:
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestAll.java
Modified:
commons/proper/dbcp/trunk/build-1.3.xml
commons/proper/dbcp/trunk/build.xml
commons/proper/dbcp/trunk/pom-1.3.xml
commons/proper/dbcp/trunk/pom.xml
Modified: commons/proper/dbcp/trunk/build-1.3.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/build-1.3.xml?rev=900241&r1=900240&r2=900241&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/build-1.3.xml (original)
+++ commons/proper/dbcp/trunk/build-1.3.xml Sun Jan 17 23:08:26 2010
@@ -208,6 +208,7 @@
<target name="test" depends="compile-test" description="runs (junit) unit tests">
<echo message="${classpath}"/>
+ <mkdir dir="${build.dir}/ant-reports"/>
<junit printsummary="true" showoutput="true" fork="yes" haltonfailure="${test.failonerror}">
<classpath>
<pathelement location="${build.classes.dir}" />
@@ -215,7 +216,15 @@
<pathelement path="${classpath}" />
</classpath>
<formatter type="plain" usefile="false" />
- <test name="${test.entry}"/>
+ <batchtest todir="${build.dir}/ant-reports">
+ <fileset dir="${src.test.dir}">
+ <include name="**/*Test*.java"/>
+ <!-- Test support files -->
+ <exclude name="**/Tester*.java"/>
+ <!-- Ant JUnit does not handle abstract classes -->
+ <exclude name="**/TestConnectionPool.java"/>
+ </fileset>
+ </batchtest>
</junit>
</target>
Modified: commons/proper/dbcp/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/build.xml?rev=900241&r1=900240&r2=900241&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/build.xml (original)
+++ commons/proper/dbcp/trunk/build.xml Sun Jan 17 23:08:26 2010
@@ -224,14 +224,23 @@
<target name="test" depends="compile-test" description="runs (junit) unit tests">
<echo message="${classpath}"/>
+ <mkdir dir="${build.dir}/ant-reports"/>
<junit printsummary="true" showoutput="true" fork="yes" haltonfailure="${test.failonerror}">
<classpath>
<pathelement location="${build.classes.dir}" />
<pathelement location="${build.test-classes.dir}" />
<pathelement path="${classpath}" />
</classpath>
- <formatter type="plain" usefile="false" />
- <test name="${test.entry}"/>
+ <formatter type="plain" usefile="true" />
+ <batchtest todir="${build.dir}/ant-reports">
+ <fileset dir="${src.test.dir}">
+ <include name="**/*Test*.java"/>
+ <!-- Test support files -->
+ <exclude name="**/Tester*.java"/>
+ <!-- Ant JUnit does not handle abstract classes -->
+ <exclude name="**/TestConnectionPool.java"/>
+ </fileset>
+ </batchtest>
</junit>
</target>
Modified: commons/proper/dbcp/trunk/pom-1.3.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom-1.3.xml?rev=900241&r1=900240&r2=900241&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/pom-1.3.xml (original)
+++ commons/proper/dbcp/trunk/pom-1.3.xml Sun Jan 17 23:08:26 2010
@@ -261,37 +261,12 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<reportFormat>plain</reportFormat>
- <includes>
- <include>org/apache/commons/dbcp/TestAbandonedObjectPool.java</include>
- <include>org/apache/commons/jocl/TestJOCLContentHandler.java</include>
- <include>org/apache/commons/dbcp/TestDelegatingConnection.java</include>
- <include>org/apache/commons/dbcp/TestPoolableConnection.java</include>
- <include>org/apache/commons/dbcp/TestDelegatingPreparedStatement.java</include>
- <include>org/apache/commons/dbcp/TestDelegatingStatement.java</include>
- <include>org/apache/commons/dbcp/TestJOCLed.java</include>
- <include>org/apache/commons/dbcp/TestManual.java</include>
-
- <include>org/apache/commons/dbcp/TestBasicDataSourceFactory.java</include>
- <include>org/apache/commons/dbcp/TestBasicDataSource.java</include>
- <include>org/apache/commons/dbcp/TestAbandonedBasicDataSource.java</include>
- <include>org/apache/commons/dbcp/TestPStmtPooling.java</include>
- <include>org/apache/commons/dbcp/TestPStmtPoolingBasicDataSource.java</include>
- <include>org/apache/commons/dbcp/TestPoolingDataSource.java</include>
- <include>org/apache/commons/dbcp/TestJndi.java</include>
-
- <include>org/apache/commons/dbcp/cpdsadapter/TestDriverAdapterCPDS.java</include>
-
- <include>org/apache/commons/dbcp/datasources/TestFactory.java</include>
- <include>org/apache/commons/dbcp/datasources/TestCPDSConnectionFactory.java</include>
- <include>org/apache/commons/dbcp/datasources/TestKeyedCPDSConnectionFactory.java</include>
- <include>org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java</include>
- <include>org/apache/commons/dbcp/datasources/TestSharedPoolDataSource.java</include>
- <include>org/apache/commons/dbcp/datasources/TestInstanceKeyDataSource.java</include>
-
- <include>org/apache/commons/dbcp/managed/TestBasicManagedDataSource.java</include>
- <include>org/apache/commons/dbcp/managed/TestManagedDataSource.java</include>
- <include>org/apache/commons/dbcp/managed/TestManagedDataSourceInTx.java</include>
- </includes>
+ <excludes>
+ <!-- Test support files -->
+ <exclude>**/Tester*.java</exclude>
+ <!-- Exclude nested classes which Surefire cannot handle -->
+ <exclude>**/Test*$*.java</exclude>
+ </excludes>
</configuration>
</plugin>
<plugin>
Modified: commons/proper/dbcp/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom.xml?rev=900241&r1=900240&r2=900241&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/pom.xml (original)
+++ commons/proper/dbcp/trunk/pom.xml Sun Jan 17 23:08:26 2010
@@ -247,40 +247,12 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<reportFormat>plain</reportFormat>
- <includes>
- <include>org/apache/commons/dbcp/TestDriverManagerConnectionFactory.java</include>
- <include>org/apache/commons/dbcp/TestAbandonedObjectPool.java</include>
- <include>org/apache/commons/jocl/TestJOCLContentHandler.java</include>
- <include>org/apache/commons/dbcp/TestDelegatingCallableStatement.java</include>
- <include>org/apache/commons/dbcp/TestDelegatingConnection.java</include>
- <include>org/apache/commons/dbcp/TestDelegatingDatabaseMetaData.java</include>
- <include>org/apache/commons/dbcp/TestPoolableConnection.java</include>
- <include>org/apache/commons/dbcp/TestDelegatingPreparedStatement.java</include>
- <include>org/apache/commons/dbcp/TestDelegatingStatement.java</include>
- <include>org/apache/commons/dbcp/TestJOCLed.java</include>
- <include>org/apache/commons/dbcp/TestManual.java</include>
-
- <include>org/apache/commons/dbcp/TestBasicDataSourceFactory.java</include>
- <include>org/apache/commons/dbcp/TestBasicDataSource.java</include>
- <include>org/apache/commons/dbcp/TestAbandonedBasicDataSource.java</include>
- <include>org/apache/commons/dbcp/TestPStmtPooling.java</include>
- <include>org/apache/commons/dbcp/TestPStmtPoolingBasicDataSource.java</include>
- <include>org/apache/commons/dbcp/TestPoolingDataSource.java</include>
- <include>org/apache/commons/dbcp/TestJndi.java</include>
-
- <include>org/apache/commons/dbcp/cpdsadapter/TestDriverAdapterCPDS.java</include>
-
- <include>org/apache/commons/dbcp/datasources/TestFactory.java</include>
- <include>org/apache/commons/dbcp/datasources/TestCPDSConnectionFactory.java</include>
- <include>org/apache/commons/dbcp/datasources/TestKeyedCPDSConnectionFactory.java</include>
- <include>org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java</include>
- <include>org/apache/commons/dbcp/datasources/TestSharedPoolDataSource.java</include>
- <include>org/apache/commons/dbcp/datasources/TestInstanceKeyDataSource.java</include>
-
- <include>org/apache/commons/dbcp/managed/TestBasicManagedDataSource.java</include>
- <include>org/apache/commons/dbcp/managed/TestManagedDataSource.java</include>
- <include>org/apache/commons/dbcp/managed/TestManagedDataSourceInTx.java</include>
- </includes>
+ <excludes>
+ <!-- Test support files -->
+ <exclude>**/Tester*.java</exclude>
+ <!-- Exclude nested classes which Surefire cannot handle -->
+ <exclude>**/Test*$*.java</exclude>
+ </excludes>
</configuration>
</plugin>
<plugin>