Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormtaal2006-09-08 20:31:25 +0000
committermtaal2006-09-08 20:31:25 +0000
commit7964af94cde3fb0c153e429716185410efa46029 (patch)
treefefd8dc6941ced82b71422b1773725b0ad701e6b
parent2b981930a0e4e02fdf32fb202055f1472503f887 (diff)
downloadorg.eclipse.emf.teneo-7964af94cde3fb0c153e429716185410efa46029.tar.gz
org.eclipse.emf.teneo-7964af94cde3fb0c153e429716185410efa46029.tar.xz
org.eclipse.emf.teneo-7964af94cde3fb0c153e429716185410efa46029.zip
Updated test.xml
-rw-r--r--tests/org.eclipse.emf.teneo.tests-feature/feature.xml10
-rw-r--r--tests/org.eclipse.emf.teneo.tests/src/org/eclipse/emf/teneo/tests/AllTests.java5
-rw-r--r--tests/org.eclipse.emf.teneo.tests/test_copy.xml65
3 files changed, 73 insertions, 7 deletions
diff --git a/tests/org.eclipse.emf.teneo.tests-feature/feature.xml b/tests/org.eclipse.emf.teneo.tests-feature/feature.xml
index 304a84ad0..8d8d33950 100644
--- a/tests/org.eclipse.emf.teneo.tests-feature/feature.xml
+++ b/tests/org.eclipse.emf.teneo.tests-feature/feature.xml
@@ -40,31 +40,31 @@ http://www.eclipse.org/legal/epl-v10.html
version="3.1.0"/>
<plugin
- id="org.eclipse.emf.teneo.commontest"
+ id="org.eclipse.emf.teneo.tests"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
- id="org.eclipse.emf.teneo.hibernate.libraries"
+ id="org.eclipse.emf.teneo.commontest"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
- id="org.eclipse.emf.teneo.hibernate.test"
+ id="org.eclipse.emf.teneo.hibernate.libraries"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
- id="org.eclipse.emf.teneo.jpox.libraries"
+ id="org.eclipse.emf.teneo.hibernate.test"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
- id="org.eclipse.emf.teneo.jpox.test"
+ id="org.eclipse.emf.teneo.jpox.libraries"
download-size="0"
install-size="0"
version="0.0.0"/>
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 4d4285f5e..6f114038c 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.9 2006/09/08 19:53:44 mtaal Exp $
+ * $Id: AllTests.java,v 1.10 2006/09/08 20:31:25 mtaal Exp $
*/
package org.eclipse.emf.teneo.tests;
@@ -23,12 +23,13 @@ import junit.framework.TestSuite;
* Runs all tests.
*
* @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class AllTests {
public static Test suite() {
TestSuite suite = new TestSuite("Dummy Test");
+ suite.addTest(org.eclipse.emf.teneo.jpox.test.AllTests.suite());
return suite;
}
diff --git a/tests/org.eclipse.emf.teneo.tests/test_copy.xml b/tests/org.eclipse.emf.teneo.tests/test_copy.xml
new file mode 100644
index 000000000..e5b75d658
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.tests/test_copy.xml
@@ -0,0 +1,65 @@
+<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>
+</project> \ No newline at end of file

Back to the top