Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormtaal2006-09-08 21:18:43 +0000
committermtaal2006-09-08 21:18:43 +0000
commit59fe07acdfc57d41445a5a629f1466cd75f3c79f (patch)
tree9a160975edb22cea2d0e6313712a9e1a61be2c49
parentb7317212f30d168c5f1d9e37122b19407001e974 (diff)
downloadorg.eclipse.emf.teneo-59fe07acdfc57d41445a5a629f1466cd75f3c79f.tar.gz
org.eclipse.emf.teneo-59fe07acdfc57d41445a5a629f1466cd75f3c79f.tar.xz
org.eclipse.emf.teneo-59fe07acdfc57d41445a5a629f1466cd75f3c79f.zip
Updated
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/test_old.xml (renamed from tests/org.eclipse.emf.teneo.hibernate.test/test.xml)0
-rw-r--r--tests/org.eclipse.emf.teneo.tests-feature/feature.xml9
-rw-r--r--tests/org.eclipse.emf.teneo.tests/src/org/eclipse/emf/teneo/tests/AllTests.java8
-rw-r--r--tests/org.eclipse.emf.teneo.tests/test.xml110
4 files changed, 56 insertions, 71 deletions
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/test.xml b/tests/org.eclipse.emf.teneo.hibernate.test/test_old.xml
index fd7337129..fd7337129 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/test.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/test_old.xml
diff --git a/tests/org.eclipse.emf.teneo.tests-feature/feature.xml b/tests/org.eclipse.emf.teneo.tests-feature/feature.xml
index f1fc2aadd..48e3e1cc5 100644
--- a/tests/org.eclipse.emf.teneo.tests-feature/feature.xml
+++ b/tests/org.eclipse.emf.teneo.tests-feature/feature.xml
@@ -43,7 +43,8 @@ http://www.eclipse.org/legal/epl-v10.html
id="org.eclipse.emf.teneo.tests"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"
+ unpack="false"/>
<plugin
id="org.eclipse.emf.teneo.commontest"
@@ -61,7 +62,8 @@ http://www.eclipse.org/legal/epl-v10.html
id="org.eclipse.emf.teneo.hibernate.test"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"
+ unpack="false"/>
<plugin
id="org.eclipse.emf.teneo.jpox.libraries"
@@ -73,6 +75,7 @@ http://www.eclipse.org/legal/epl-v10.html
id="org.eclipse.emf.teneo.jpox.test"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"
+ unpack="false"/>
</feature>
diff --git a/tests/org.eclipse.emf.teneo.tests/src/org/eclipse/emf/teneo/tests/AllTests.java b/tests/org.eclipse.emf.teneo.tests/src/org/eclipse/emf/teneo/tests/AllTests.java
index 6f114038c..47f162228 100644
--- a/tests/org.eclipse.emf.teneo.tests/src/org/eclipse/emf/teneo/tests/AllTests.java
+++ b/tests/org.eclipse.emf.teneo.tests/src/org/eclipse/emf/teneo/tests/AllTests.java
@@ -11,7 +11,7 @@
* Martin Taal
* </copyright>
*
- * $Id: AllTests.java,v 1.10 2006/09/08 20:31:25 mtaal Exp $
+ * $Id: AllTests.java,v 1.11 2006/09/08 21:18:43 mtaal Exp $
*/
package org.eclipse.emf.teneo.tests;
@@ -23,13 +23,13 @@ import junit.framework.TestSuite;
* Runs all tests.
*
* @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public class AllTests {
public static Test suite() {
- TestSuite suite = new TestSuite("Dummy Test");
- suite.addTest(org.eclipse.emf.teneo.jpox.test.AllTests.suite());
+ TestSuite suite = new TestSuite("Hibernate Test");
+ suite.addTest(org.eclipse.emf.teneo.hibernate.test.AllTests.suite());
return suite;
}
diff --git a/tests/org.eclipse.emf.teneo.tests/test.xml b/tests/org.eclipse.emf.teneo.tests/test.xml
index e5b75d658..70f49c9a2 100644
--- a/tests/org.eclipse.emf.teneo.tests/test.xml
+++ b/tests/org.eclipse.emf.teneo.tests/test.xml
@@ -1,65 +1,47 @@
-<project name="Automated Testing for Teneo" default="all" basedir="." >
-
- <!--properties file containing the plugin directory name including version number-->
- <property file="test.properties" />
-
- <!--properties file containing other test flags and options -->
- <property file="testing.properties" />
-
- <!--default directory where test-eclipse will be installed-->
- <property name="install" value="${basedir}/target" />
-
- <!--name that can be added to report name to identify which platform tests results come from-->
- <property name="platform" value="" />
-
- <!-- The root of the eclipse installation -->
- <property name="eclipse-home" value="${install}/eclipse" />
-
- <!-- The directory that will contain the xml and html results from the tests that are run -->
- <property name="results" value="${basedir}/results" />
-
- <target name="init">
- </target>
-
- <target name="setup" if="clean" description="Reinstall the test Eclipse installation if specified by user">
- </target>
-
- <target name="runtests" depends="setup" description="Runs ant on the test.xml for a specified plugin. Requires a property value setting for testPlugin only if test.properties is not available. The property testPlugin represents a directory name made up of the plugin id and plugin version. This directory must contain a valid test.xml.">
- <tstamp><format property="runtests-starttime" pattern="HH:mm:ss"/></tstamp>
- <echo message="Start: [${runtests-starttime}]"/>
- <ant antfile="${eclipse-home}/plugins/${testPlugin}/test.xml" dir="${eclipse-home}" />
- <copy file="${eclipse-home}/${report}.xml" tofile="${results}/xml/${report}_${platform}.xml" verbose="true"/>
- <tstamp><format property="runtests-endtime" pattern="HH:mm:ss"/></tstamp>
- <echo message="Done: [${runtests-endtime}]"/>
- </target>
-
- <target name="runtests_this" depends="setup" description="Runs ant on the test.xml for a specified plugin. Requires a property value setting for testPlugin only if test.properties is not available. The property testPlugin represents a directory name made up of the plugin id and plugin version. This directory must contain a valid test.xml.">
- <tstamp><format property="runtests-starttime" pattern="HH:mm:ss"/></tstamp>
- <echo message="Start: [${runtests-starttime}]"/>
- <ant antfile="${eclipse-home}/plugins/${testPlugin}/test_this.xml" dir="${eclipse-home}" />
- <copy file="${eclipse-home}/${report}.xml" tofile="${results}/xml/${report}_${platform}.xml" verbose="true"/>
- <tstamp><format property="runtests-endtime" pattern="HH:mm:ss"/></tstamp>
- <echo message="Done: [${runtests-endtime}]"/>
- </target>
-
- <target name="teneo" description="Runs the test.xml of the test plugins">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.emf.teneo.hibernate.test}" />
- <param name="report" value="org.eclipse.emf.teneo.hibernate.test" />
- </antcall>
-
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.emf.teneo.jpox.test}" />
- <param name="report" value="org.eclipse.emf.teneo.jpox.test" />
- </antcall>
-
- <antcall target="runtests_this">
- <param name="testPlugin" value="${org.eclipse.emf.teneo.tests}" />
- <param name="report" value="org.eclipse.emf.teneo.tests" />
- </antcall>
- </target>
-
- <target name="all">
- <antcall target="teneo" />
- </target>
+<?xml version="1.0"?>
+
+<project name="testsuite" default="run" basedir=".">
+ <!-- The property ${eclipse-home} should be passed into this script -->
+ <!-- Set a meaningful default value for when it is not. -->
+ <property name="eclipse-home" value="${basedir}\..\.."/>
+
+ <!-- sets the properties plugin-name, and library-file -->
+ <property name="plugin-name" value="org.eclipse.emf.teneo.tests"/>
+ <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
+
+ <!-- This target holds all initialization code that needs to be done for -->
+ <!-- all tests that are to be run. Initialization for individual tests -->
+ <!-- should be done within the body of the suite target. -->
+ <target name="init">
+ <tstamp/>
+ <delete>
+ <fileset dir="${eclipse-home}" includes="org*.xml"/>
+ </delete>
+ </target>
+
+ <!-- This target defines the tests that need to be run. -->
+ <target name="suite">
+ <property name="emf-folder" value="${eclipse-home}/emf_folder"/>
+ <delete dir="${emf-folder}" quiet="true"/>
+ <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="data-dir" value="${emf-folder}"/>
+ <property name="plugin-name" value="${plugin-name}"/>
+ <property name="classname" value="org.eclipse.emf.teneo.tests.AllTests"/>
+ </ant>
+ </target>
+
+ <!-- This target holds code to cleanup the testing environment after -->
+ <!-- after all of the tests have been run. You can use this target to -->
+ <!-- delete temporary files that have been created. -->
+ <target name="cleanup">
+ </target>
+
+ <!-- This target runs the test suite. Any actions that need to happen -->
+ <!-- after all the tests have been run should go here. -->
+ <target name="run" depends="init,suite,cleanup">
+ <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="includes" value="org*.xml"/>
+ <property name="output-file" value="${plugin-name}.xml"/>
+ </ant>
+ </target>
</project> \ No newline at end of file

Back to the top