Author: max.andersen(a)jboss.com Date: 2009-05-18 08:14:54 -0400 (Mon, 18 May 2009) New Revision: 16582 Added: branches/Branch_3_2/HibernateExt/tools/lib/jdbc/ branches/Branch_3_2/HibernateExt/tools/lib/jdbc/hsqldb.jar Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/AntHibernateToolTest.java branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/JavaFormatterTest.java branches/Branch_3_2/HibernateExt/tools/src/testsupport/anttest-build.xml branches/Branch_3_2/HibernateExt/tools/src/testsupport/javaformattest-build.xml Log: added missing lib and cleanup code for reliable test runs Added: branches/Branch_3_2/HibernateExt/tools/lib/jdbc/hsqldb.jar =================================================================== (Binary files differ) Property changes on: branches/Branch_3_2/HibernateExt/tools/lib/jdbc/hsqldb.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/AntHibernateToolTest.java =================================================================== --- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/AntHibernateToolTest.java 2009-05-18 02:06:36 UTC (rev 16581) +++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/AntHibernateToolTest.java 2009-05-18 12:14:54 UTC (rev 16582) @@ -33,7 +33,9 @@ super.tearDown(); } protected void setUp() throws Exception { + super.setUp(); configureProject("src/testsupport/anttest-build.xml"); + executeTarget( "cleanup" ); } public void testHbm2DDLLogic() { Modified: branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/JavaFormatterTest.java =================================================================== --- branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/JavaFormatterTest.java 2009-05-18 02:06:36 UTC (rev 16581) +++ branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/ant/JavaFormatterTest.java 2009-05-18 12:14:54 UTC (rev 16582) @@ -30,7 +30,9 @@ super.tearDown(); } protected void setUp() throws Exception { + super.setUp(); configureProject("src/testsupport/javaformattest-build.xml"); + executeTarget( "cleanup" ); } public void testJava() { Modified: branches/Branch_3_2/HibernateExt/tools/src/testsupport/anttest-build.xml =================================================================== --- branches/Branch_3_2/HibernateExt/tools/src/testsupport/anttest-build.xml 2009-05-18 02:06:36 UTC (rev 16581) +++ branches/Branch_3_2/HibernateExt/tools/src/testsupport/anttest-build.xml 2009-05-18 12:14:54 UTC (rev 16582) @@ -17,7 +17,9 @@ </path> - <target name="cleanup" description="task used for ensuring cleanup to be done even in the case of test failure" depends="afterCfg2hbm"/> + <target name="cleanup" description="task used for ensuring cleanup to be done even in the case of test failure" depends="afterCfg2hbm"> + <delete dir="${build.dir}"/> + </target> <target name="testScriptCreation"> Modified: branches/Branch_3_2/HibernateExt/tools/src/testsupport/javaformattest-build.xml =================================================================== --- branches/Branch_3_2/HibernateExt/tools/src/testsupport/javaformattest-build.xml 2009-05-18 02:06:36 UTC (rev 16581) +++ branches/Branch_3_2/HibernateExt/tools/src/testsupport/javaformattest-build.xml 2009-05-18 12:14:54 UTC (rev 16582) @@ -1,7 +1,5 @@ <project name="javaformattest"> - <property name="hibernate-core.jar" location="../../../../hibernate-3.1/hibernate3.jar" /> - <property name="hibernate-core.home" location="../../../../Hibernate3" /> - <property name="hibernate-core.lib.dir" location="${hibernate-core.home}/lib" /> + <property name="hibernate-libs" location="../../lib/testlibs" /> <property name="build.dir" location="../../build/javaformattest" /> <property file="../../etc/hibernate.properties" /> @@ -11,17 +9,16 @@ <pathelement path="../../build/eclipse" /> <pathelement path="../../build/classes" /> - <fileset dir="${hibernate-core.lib.dir}"> + <fileset dir="${hibernate-libs}"> <include name="**/*.jar" /> </fileset> - <pathelement location="${hibernate-core.jar}" /> <pathelement path="../../lib/freemarker.jar" /> <fileset dir="../../lib"> <include name="**/*eclipse*.jar" /> </fileset> - <pathelement path="${hibernate-core.home}\jdbc\hsqldb.jar" /> + <pathelement path="../../../lib/hsqldb.jar" /> </path> <target name="cleanup">