Author: bayard
Date: Thu Jul 5 17:57:18 2007
New Revision: 553680
URL: http://svn.apache.org/viewvc?view=rev&rev=553680
Log:
Fixing the build to include all the tests as per BEANUTILS-287. Also fixing the
build.properties.sample so it's easier to use for the default maven user (ie:
it looks by default in the .maven repository)
Modified:
jakarta/commons/proper/beanutils/trunk/build.properties.sample
jakarta/commons/proper/beanutils/trunk/build.xml
Modified: jakarta/commons/proper/beanutils/trunk/build.properties.sample
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/build.properties.sample?view=diff&rev=553680&r1=553679&r2=553680
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/build.properties.sample (original)
+++ jakarta/commons/proper/beanutils/trunk/build.properties.sample Thu Jul 5
17:57:18 2007
@@ -13,14 +13,20 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# Repository base path
+repository=${user.home}/.maven/repository
+
# The pathname of the collections classes JAR file
-commons-collections.jar = commons-collections.jar
+commons-collections.home=${repository}/commons-collections/jars
+commons-collections.jar=${commons-collections.home}/commons-collections-3.2.jar
# The pathname of the Commons Logging JAR file
-commons-logging.jar = commons-logging.jar
+commons-logging.home=${repository}/commons-logging/jars
+commons-logging.jar=${commons-logging.home}/commons-logging-1.1.jar
# The pathname of the "junit.jar" JAR file
-junit.jar = junit.jar
+junit.home=${repository}/junit/jars
+junit.jar=${junit.home}/junit-3.8.1.jar
# Configuration Example for Commons Logging in maven
maven.junit.fork=true
Modified: jakarta/commons/proper/beanutils/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/build.xml?view=diff&rev=553680&r1=553679&r2=553680
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/build.xml (original)
+++ jakarta/commons/proper/beanutils/trunk/build.xml Thu Jul 5 17:57:18 2007
@@ -253,341 +253,17 @@
<!-- ========== Unit Test Targets ========================================= -->
- <target name="test" depends="compile.tests,
- test.basic.dynabean,
- test.wrap.dynabean,
- test.dyna.property,
- test.property,
- test.dyna.bean,
- test.bean,
- test.convert,
- test.method,
- test.dyna.result,
- test.dyna.row,
- test.locale.convert,
- test.converters,
- test.beanification,
- test.lazy.dynaclass,
- test.lazy.dynabean,
- test.lazy.dynamap,
- test.lazy.dynalist,
- test.dynabean.mapdecorator,
- test.dynaproperty,
- test.indexed.properties,
- test.mapped.properties
- "
+ <target name="test" depends="compile.tests"
description="Run all unit test cases">
- </target>
-
-
- <target name="test.basic.dynabean" depends="compile.tests">
- <echo message="Running BasicDynaBean tests ..."/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="org.apache.commons.logging.LogFactory"
- value="${test.factory}"/>
- <sysproperty key="org.apache.commons.logging.Log"
- value="${test.log}"/>
- <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
- value="${test.level}"/>
- <arg value="org.apache.commons.beanutils.BasicDynaBeanTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test.wrap.dynabean" depends="compile.tests">
- <echo message="Running WrapDynaBean tests ..."/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="org.apache.commons.logging.LogFactory"
- value="${test.factory}"/>
- <sysproperty key="org.apache.commons.logging.Log"
- value="${test.log}"/>
- <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
- value="${test.level}"/>
- <arg value="org.apache.commons.beanutils.WrapDynaBeanTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test.dyna.property" depends="compile.tests">
- <echo message="Running DynaBean PropertyUtils tests ..."/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="org.apache.commons.logging.LogFactory"
- value="${test.factory}"/>
- <sysproperty key="org.apache.commons.logging.Log"
- value="${test.log}"/>
- <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
- value="${test.level}"/>
- <arg value="org.apache.commons.beanutils.DynaPropertyUtilsTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test.property" depends="compile.tests">
- <echo message="Running PropertyUtils tests ..."/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="org.apache.commons.logging.LogFactory"
- value="${test.factory}"/>
- <sysproperty key="org.apache.commons.logging.Log"
- value="${test.log}"/>
- <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
- value="${test.level}"/>
- <arg value="org.apache.commons.beanutils.PropertyUtilsTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test.dyna.bean" depends="compile.tests">
- <echo message="Running DynaBean BeanUtils tests ..."/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="org.apache.commons.logging.LogFactory"
- value="${test.factory}"/>
- <sysproperty key="org.apache.commons.logging.Log"
- value="${test.log}"/>
- <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
- value="${test.level}"/>
- <arg value="org.apache.commons.beanutils.DynaBeanUtilsTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test.bean" depends="compile.tests">
- <echo message="Running BeanUtils tests ..."/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="org.apache.commons.logging.LogFactory"
- value="${test.factory}"/>
- <sysproperty key="org.apache.commons.logging.Log"
- value="${test.log}"/>
- <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
- value="${test.level}"/>
- <arg value="org.apache.commons.beanutils.BeanUtilsTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test.convert" depends="compile.tests">
- <echo message="Running ConvertUtils tests ..."/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="org.apache.commons.logging.LogFactory"
- value="${test.factory}"/>
- <sysproperty key="org.apache.commons.logging.Log"
- value="${test.log}"/>
- <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
- value="${test.level}"/>
- <arg value="org.apache.commons.beanutils.ConvertUtilsTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test.method" depends="compile.tests">
- <echo message="Running MethodUtils tests ..."/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="org.apache.commons.logging.LogFactory"
- value="${test.factory}"/>
- <sysproperty key="org.apache.commons.logging.Log"
- value="${test.log}"/>
- <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
- value="${test.level}"/>
- <arg value="org.apache.commons.beanutils.MethodUtilsTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test.dyna.result" depends="compile.tests">
- <echo message="Running DynaBean ResultSet tests ..."/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="org.apache.commons.logging.LogFactory"
- value="${test.factory}"/>
- <sysproperty key="org.apache.commons.logging.Log"
- value="${test.log}"/>
- <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
- value="${test.level}"/>
- <arg value="org.apache.commons.beanutils.DynaResultSetTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test.dyna.row" depends="compile.tests">
- <echo message="Running DynaBean RowSet tests ..."/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="org.apache.commons.logging.LogFactory"
- value="${test.factory}"/>
- <sysproperty key="org.apache.commons.logging.Log"
- value="${test.log}"/>
- <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
- value="${test.level}"/>
- <arg value="org.apache.commons.beanutils.DynaRowSetTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test.locale.convert" depends="compile.tests">
- <echo message="Running Locale converters tests ..."/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="org.apache.commons.logging.LogFactory"
- value="${test.factory}"/>
- <sysproperty key="org.apache.commons.logging.Log"
- value="${test.log}"/>
- <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
- value="${test.level}"/>
- <arg value="org.apache.commons.beanutils.locale.LocaleConvertTestSuite"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
-
- <target name="test.converters" depends="compile.tests">
- <echo message="Running Converters tests ..."/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="org.apache.commons.logging.LogFactory"
- value="${test.factory}"/>
- <sysproperty key="org.apache.commons.logging.Log"
- value="${test.log}"/>
- <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
- value="${test.level}"/>
- <arg value="org.apache.commons.beanutils.converters.ConverterTestSuite"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test.lazy.dynaclass" depends="compile.tests">
- <echo message="Running LazyDynaClass tests ..."/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="org.apache.commons.logging.LogFactory"
- value="${test.factory}"/>
- <sysproperty key="org.apache.commons.logging.Log"
- value="${test.log}"/>
- <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
- value="${test.level}"/>
- <arg value="org.apache.commons.beanutils.LazyDynaClassTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test.lazy.dynamap" depends="compile.tests">
- <echo message="Running LazyDynaMap tests ..."/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="org.apache.commons.logging.LogFactory"
- value="${test.factory}"/>
- <sysproperty key="org.apache.commons.logging.Log"
- value="${test.log}"/>
- <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
- value="${test.level}"/>
- <arg value="org.apache.commons.beanutils.LazyDynaMapTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test.lazy.dynalist" depends="compile.tests">
- <echo message="Running LazyDynaList tests ..."/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="org.apache.commons.logging.LogFactory"
- value="${test.factory}"/>
- <sysproperty key="org.apache.commons.logging.Log"
- value="${test.log}"/>
- <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
- value="${test.level}"/>
- <arg value="org.apache.commons.beanutils.LazyDynaListTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test.dynabean.mapdecorator" depends="compile.tests">
- <echo message="Running DynaBeanMapDecorator tests ..."/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="org.apache.commons.logging.LogFactory"
- value="${test.factory}"/>
- <sysproperty key="org.apache.commons.logging.Log"
- value="${test.log}"/>
- <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
- value="${test.level}"/>
- <arg value="org.apache.commons.beanutils.DynaBeanMapDecoratorTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test.beanification" depends="compile.tests">
- <echo message="Running Beanification tests ..."/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <arg value="org.apache.commons.beanutils.BeanificationTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test.lazy.dynabean" depends="compile.tests">
- <echo message="Running LazyDynaBean tests ..."/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="org.apache.commons.logging.LogFactory"
- value="${test.factory}"/>
- <sysproperty key="org.apache.commons.logging.Log"
- value="${test.log}"/>
- <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
- value="${test.level}"/>
- <arg value="org.apache.commons.beanutils.LazyDynaBeanTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test.dynaproperty" depends="compile.tests">
- <echo message="Running DynaProperty tests ..."/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="org.apache.commons.logging.LogFactory"
- value="${test.factory}"/>
- <sysproperty key="org.apache.commons.logging.Log"
- value="${test.log}"/>
- <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
- value="${test.level}"/>
- <arg value="org.apache.commons.beanutils.DynaPropertyTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test.indexed.properties" depends="compile.tests">
- <echo message="Running Indexed Property tests ..."/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="org.apache.commons.logging.LogFactory"
- value="${test.factory}"/>
- <sysproperty key="org.apache.commons.logging.Log"
- value="${test.log}"/>
- <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
- value="${test.level}"/>
- <arg value="org.apache.commons.beanutils.IndexedPropertyTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test.mapped.properties" depends="compile.tests">
- <echo message="Running Mapped Property tests ..."/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="org.apache.commons.logging.LogFactory"
- value="${test.factory}"/>
- <sysproperty key="org.apache.commons.logging.Log"
- value="${test.log}"/>
- <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
- value="${test.level}"/>
- <arg value="org.apache.commons.beanutils.MappedPropertyTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
+ <junit printsummary="true" showoutput="true" fork="yes"
haltonfailure="${test.failonerror}">
+ <classpath refid="test.classpath"/>
+ <batchtest>
+ <fileset dir="${test.home}">
+ <include name="**/*TestCase.java"/>
+ <exclude name="**/*MemoryTestCase.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
</target>
<!-- ========== Microbenchmark Cases =====================================
-->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
