attempt to improve JUnit logging
diff --git a/tests/org.eclipse.jst.jsp.core.tests/test.xml b/tests/org.eclipse.jst.jsp.core.tests/test.xml index 502e3d2..99c4331 100644 --- a/tests/org.eclipse.jst.jsp.core.tests/test.xml +++ b/tests/org.eclipse.jst.jsp.core.tests/test.xml
@@ -1,37 +1,54 @@ <?xml version="1.0" encoding="UTF-8"?> <project - name="testsuite" - default="run" - basedir="."> + name="testsuite" + default="run" + basedir="."> + <!-- The following properties should be passed into this script --> <!-- ${eclipse-home} --> <!-- ${buildDirectory} --> <!-- ${buildLabel} --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> + <!-- should be little need to change what's above --> + + <property + name="plugin-name" + value="org.eclipse.jst.jsp.core.tests" /> + <property + name="classname" + value="org.eclipse.jst.jsp.core.tests.JSPCoreTestSuite" /> + <property + name="testType" + value="core-test" /> - <!-- sets the properties plugin-name, and library-file --> - <property - name="plugin-name" - value="org.eclipse.jst.jsp.core.tests" /> - <property - name="library-file" - value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> + <!-- should be little need to change what's below --> + + <echo message="basedir: ${basedir}" /> + <echo message="eclipse-home: ${eclipse-home}" /> + <echo message="buildDirectory: ${buildDirectory}" /> + <echo message="plugin-name: ${plugin-name}" /> + <echo message="classname: ${classname}" /> + <echo message="testType ${testType}" /> + + + <property + name="library-file" + value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> <property name="workspace" value="${eclipse-home}/junitworkspaces/${plugin-name}" /> - <!-- 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}" + + <!-- 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="${plugin-name}.*xml" /> - </delete> + </delete> <!-- make directory, in case path doesn't exist yet --> <mkdir dir="${workspace}" /> <!-- but delete to make sure fresh contents--> @@ -39,60 +56,60 @@ dir="${workspace}" quiet="true" /> - </target> + </target> - <!-- This target defines the tests that need to be run. --> - <target name="suite"> + <!-- This target defines the tests that need to be run. --> + <target name="suite"> - <ant - target="core-test" - antfile="${library-file}" - dir="${eclipse-home}"> - <property - name="data-dir" + <ant + target="${testType}" + antfile="${library-file}" + dir="${eclipse-home}"> + <property + name="data-dir" value="${workspace}" /> - <property - name="plugin-name" - value="${plugin-name}" /> - <property - name="classname" - value="org.eclipse.jst.jsp.core.tests.JSPCoreTestSuite" /> - <property - name="plugin-path" - value="${eclipse-home}/plugins/${plugin-name}" /> - </ant> + <property + name="plugin-name" + value="${plugin-name}" /> + <property + name="classname" + value="${classname}" /> + <property + name="plugin-path" + value="${eclipse-home}/plugins/${plugin-name}" /> + </ant> <copy failonerror="false" file="${workspace}/.metadata/.log" - tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.log" /> + tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" /> - </target> + </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"> + <!-- 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"> <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> - <!-- <delete dir="${workspace}" quiet="true" /> --> - </target> + <!-- <delete dir="${workspace}" quiet="true" /> --> + </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" + <!-- 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="${plugin-name}.*xml" /> - <property - name="output-file" - value="${plugin-name}.xml" /> - </ant> - </target> + <property + name="output-file" + value="${plugin-name}.xml" /> + </ant> + </target> </project> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/test.xml b/tests/org.eclipse.jst.jsp.tests.encoding/test.xml index 0a35ca0..0ece155 100644 --- a/tests/org.eclipse.jst.jsp.tests.encoding/test.xml +++ b/tests/org.eclipse.jst.jsp.tests.encoding/test.xml
@@ -4,27 +4,45 @@ name="testsuite" default="run" basedir="."> + <!-- The following properties should be passed into this script --> <!-- ${eclipse-home} --> <!-- ${buildDirectory} --> <!-- ${buildLabel} --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> - - <!-- sets the properties plugin-name, and library-file --> - <property + <!-- should be little need to change what's above --> + + <property name="plugin-name" value="org.eclipse.jst.jsp.tests.encoding" /> + <property + name="classname" + value="org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestSuite" /> + <property + name="testType" + value="core-test" /> + + <!-- should be little need to change what's below --> + + <echo message="basedir: ${basedir}" /> + <echo message="eclipse-home: ${eclipse-home}" /> + <echo message="buildDirectory: ${buildDirectory}" /> + <echo message="plugin-name: ${plugin-name}" /> + <echo message="classname: ${classname}" /> + <echo message="testType ${testType}" /> + + <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> <property name="workspace" value="${eclipse-home}/junitworkspaces/${plugin-name}" /> + <!-- 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> @@ -45,7 +63,7 @@ <target name="suite"> <ant - target="core-test" + target="${testType}" antfile="${library-file}" dir="${eclipse-home}"> <property @@ -56,7 +74,7 @@ value="${plugin-name}" /> <property name="classname" - value="org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestSuite" /> + value="${classname}" /> <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}" /> @@ -65,7 +83,7 @@ <copy failonerror="false" file="${workspace}/.metadata/.log" - tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.log" /> + tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" /> </target>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/test.xml b/tests/org.eclipse.jst.jsp.ui.tests/test.xml index 3c89319..0b6ad65 100644 --- a/tests/org.eclipse.jst.jsp.ui.tests/test.xml +++ b/tests/org.eclipse.jst.jsp.ui.tests/test.xml
@@ -1,26 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> + <project name="testsuite" default="run" basedir="."> + <!-- The following properties should be passed into this script --> <!-- ${eclipse-home} --> <!-- ${buildDirectory} --> <!-- ${buildLabel} --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> - - <!-- sets the properties plugin-name, and library-file --> + <!-- should be little need to change what's above --> + <property name="plugin-name" value="org.eclipse.jst.jsp.ui.tests" /> <property + name="classname" + value="org.eclipse.jst.jsp.ui.tests.JSPUITestSuite" /> + <property + name="testType" + value="ui-test" /> + + <!-- should be little need to change what's below --> + + <echo message="basedir: ${basedir}" /> + <echo message="eclipse-home: ${eclipse-home}" /> + <echo message="buildDirectory: ${buildDirectory}" /> + <echo message="plugin-name: ${plugin-name}" /> + <echo message="classname: ${classname}" /> + <echo message="testType ${testType}" /> + + + <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> <property name="workspace" value="${eclipse-home}/junitworkspaces/${plugin-name}" /> + <!-- 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. --> @@ -44,7 +62,7 @@ <target name="suite"> <ant - target="ui-test" + target="${testType}" antfile="${library-file}" dir="${eclipse-home}"> <property @@ -55,7 +73,7 @@ value="${plugin-name}" /> <property name="classname" - value="org.eclipse.jst.jsp.ui.tests.JSPUITestSuite" /> + value="${classname}" /> <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}" /> @@ -64,7 +82,7 @@ <copy failonerror="false" file="${workspace}/.metadata/.log" - tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.log" /> + tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" /> </target> @@ -73,7 +91,7 @@ <!-- delete temporary files that have been created. --> <target name="cleanup"> <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> - <!--<delete dir="${workspace}" quiet="true"/>--> + <!-- <delete dir="${workspace}" quiet="true" /> --> </target> <!-- This target runs the test suite. Any actions that need to happen -->
diff --git a/tests/org.eclipse.wst.css.core.tests/test.xml b/tests/org.eclipse.wst.css.core.tests/test.xml index d1b1fb5..d653a3d 100644 --- a/tests/org.eclipse.wst.css.core.tests/test.xml +++ b/tests/org.eclipse.wst.css.core.tests/test.xml
@@ -1,37 +1,54 @@ <?xml version="1.0" encoding="UTF-8"?> <project - name="testsuite" - default="run" - basedir="."> + name="testsuite" + default="run" + basedir="."> + <!-- The following properties should be passed into this script --> <!-- ${eclipse-home} --> <!-- ${buildDirectory} --> <!-- ${buildLabel} --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> - - <!-- sets the properties plugin-name, and library-file --> + <!-- should be little need to change what's above --> + <property name="plugin-name" value="org.eclipse.wst.css.core.tests" /> - <property - name="library-file" - value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> + <property + name="classname" + value="org.eclipse.wst.css.core.tests.CSSCoreTestSuite" /> + <property + name="testType" + value="core-test" /> + + <!-- should be little need to change what's below --> + + <echo message="basedir: ${basedir}" /> + <echo message="eclipse-home: ${eclipse-home}" /> + <echo message="buildDirectory: ${buildDirectory}" /> + <echo message="plugin-name: ${plugin-name}" /> + <echo message="classname: ${classname}" /> + <echo message="testType ${testType}" /> + + + <property + name="library-file" + value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> <property name="workspace" value="${eclipse-home}/junitworkspaces/${plugin-name}" /> - <!-- 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}" + + <!-- 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="${plugin-name}.*xml" /> - </delete> + </delete> <!-- make directory, in case path doesn't exist yet --> <mkdir dir="${workspace}" /> <!-- but delete to make sure fresh contents--> @@ -39,60 +56,60 @@ dir="${workspace}" quiet="true" /> - </target> + </target> - <!-- This target defines the tests that need to be run. --> - <target name="suite"> + <!-- This target defines the tests that need to be run. --> + <target name="suite"> - <ant - target="core-test" - antfile="${library-file}" - dir="${eclipse-home}"> - <property - name="data-dir" + <ant + target="${testType}" + antfile="${library-file}" + dir="${eclipse-home}"> + <property + name="data-dir" value="${workspace}" /> - <property - name="plugin-name" - value="${plugin-name}" /> - <property - name="classname" - value="org.eclipse.wst.css.core.tests.CSSCoreTestSuite" /> - <property - name="plugin-path" - value="${eclipse-home}/plugins/${plugin-name}" /> - </ant> + <property + name="plugin-name" + value="${plugin-name}" /> + <property + name="classname" + value="${classname}" /> + <property + name="plugin-path" + value="${eclipse-home}/plugins/${plugin-name}" /> + </ant> <copy failonerror="false" file="${workspace}/.metadata/.log" - tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.log" /> + tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" /> - </target> + </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"> + <!-- 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"> <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> - <!-- <delete dir="${workspace}" quiet="true" /> --> - </target> + <!-- <delete dir="${workspace}" quiet="true" /> --> + </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" + <!-- 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="${plugin-name}.*xml" /> - <property - name="output-file" - value="${plugin-name}.xml" /> - </ant> - </target> + <property + name="output-file" + value="${plugin-name}.xml" /> + </ant> + </target> </project> \ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/test.xml b/tests/org.eclipse.wst.css.tests.encoding/test.xml index d62b32b..8d65337 100644 --- a/tests/org.eclipse.wst.css.tests.encoding/test.xml +++ b/tests/org.eclipse.wst.css.tests.encoding/test.xml
@@ -1,37 +1,54 @@ <?xml version="1.0" encoding="UTF-8"?> <project - name="testsuite" - default="run" - basedir="."> + name="testsuite" + default="run" + basedir="."> + <!-- The following properties should be passed into this script --> <!-- ${eclipse-home} --> <!-- ${buildDirectory} --> <!-- ${buildLabel} --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> + <!-- should be little need to change what's above --> - <!-- sets the properties plugin-name, and library-file --> - <property - name="plugin-name" - value="org.eclipse.wst.css.tests.encoding" /> - <property - name="library-file" - value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> + <property + name="plugin-name" + value="org.eclipse.wst.css.tests.encoding" /> + <property + name="classname" + value="org.eclipse.wst.css.tests.encoding.CSSEncodingTestSuite" /> + <property + name="testType" + value="core-test" /> + + <!-- should be little need to change what's below --> + + <echo message="basedir: ${basedir}" /> + <echo message="eclipse-home: ${eclipse-home}" /> + <echo message="buildDirectory: ${buildDirectory}" /> + <echo message="plugin-name: ${plugin-name}" /> + <echo message="classname: ${classname}" /> + <echo message="testType ${testType}" /> + + + <property + name="library-file" + value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> <property name="workspace" value="${eclipse-home}/junitworkspaces/${plugin-name}" /> - <!-- 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"> + + <!-- 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}" + <delete> + <fileset + dir="${eclipse-home}" includes="${plugin-name}.*xml" /> - </delete> + </delete> <!-- make directory, in case path doesn't exist yet --> <mkdir dir="${workspace}" /> <!-- but delete to make sure fresh contents--> @@ -39,60 +56,60 @@ dir="${workspace}" quiet="true" /> - </target> + </target> - <!-- This target defines the tests that need to be run. --> - <target name="suite"> + <!-- This target defines the tests that need to be run. --> + <target name="suite"> - <ant - target="core-test" - antfile="${library-file}" - dir="${eclipse-home}"> - <property - name="data-dir" + <ant + target="${testType}" + antfile="${library-file}" + dir="${eclipse-home}"> + <property + name="data-dir" value="${workspace}" /> - <property - name="plugin-name" + <property + name="plugin-name" value="${plugin-name}" /> - <property - name="classname" - value="org.eclipse.wst.css.tests.encoding.CSSEncodingTestSuite" /> - <property - name="plugin-path" - value="${eclipse-home}/plugins/${plugin-name}" /> - </ant> + <property + name="classname" + value="${classname}" /> + <property + name="plugin-path" + value="${eclipse-home}/plugins/${plugin-name}" /> + </ant> <copy failonerror="false" file="${workspace}/.metadata/.log" - tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.log" /> + tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" /> - </target> + </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"> + <!-- 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"> <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> - <!--<delete dir="${workspace}" quiet="true" />--> - </target> + <!-- <delete dir="${workspace}" quiet="true" /> --> + </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" + <!-- 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="${plugin-name}.*xml" /> - <property - name="output-file" - value="${plugin-name}.xml" /> - </ant> - </target> + <property + name="output-file" + value="${plugin-name}.xml" /> + </ant> + </target> </project> \ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.ui.tests/test.xml b/tests/org.eclipse.wst.css.ui.tests/test.xml index ffacb4f..f55274d 100644 --- a/tests/org.eclipse.wst.css.ui.tests/test.xml +++ b/tests/org.eclipse.wst.css.ui.tests/test.xml
@@ -4,24 +4,41 @@ name="testsuite" default="run" basedir="."> + <!-- The following properties should be passed into this script --> <!-- ${eclipse-home} --> <!-- ${buildDirectory} --> <!-- ${buildLabel} --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> + <!-- should be little need to change what's above --> - <!-- sets the properties plugin-name, and library-file --> <property name="plugin-name" value="org.eclipse.wst.css.ui.tests" /> <property + name="classname" + value="org.eclipse.wst.css.ui.tests.CSSUITestSuite" /> + <property + name="testType" + value="ui-test" /> + + <!-- should be little need to change what's below --> + + <echo message="basedir: ${basedir}" /> + <echo message="eclipse-home: ${eclipse-home}" /> + <echo message="buildDirectory: ${buildDirectory}" /> + <echo message="plugin-name: ${plugin-name}" /> + <echo message="classname: ${classname}" /> + <echo message="testType ${testType}" /> + + + <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> <property name="workspace" value="${eclipse-home}/junitworkspaces/${plugin-name}" /> + <!-- 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. --> @@ -45,7 +62,7 @@ <target name="suite"> <ant - target="ui-test" + target="${testType}" antfile="${library-file}" dir="${eclipse-home}"> <property @@ -56,16 +73,16 @@ value="${plugin-name}" /> <property name="classname" - value="org.eclipse.wst.css.ui.tests.CSSUITestSuite" /> + value="${classname}" /> <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}" /> - </ant> + </ant> <copy failonerror="false" file="${workspace}/.metadata/.log" - tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.log" /> + tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" /> </target> @@ -74,7 +91,7 @@ <!-- delete temporary files that have been created. --> <target name="cleanup"> <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> - <!--<delete dir="${workspace}" quiet="true"/>--> + <!-- <delete dir="${workspace}" quiet="true" /> --> </target> <!-- This target runs the test suite. Any actions that need to happen -->
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/test.xml b/tests/org.eclipse.wst.dtd.ui.tests/test.xml index 1e9c0b3..9cbf4b6 100644 --- a/tests/org.eclipse.wst.dtd.ui.tests/test.xml +++ b/tests/org.eclipse.wst.dtd.ui.tests/test.xml
@@ -1,37 +1,54 @@ <?xml version="1.0" encoding="UTF-8"?> <project - name="testsuite" - default="run" - basedir="."> + name="testsuite" + default="run" + basedir="."> + <!-- The following properties should be passed into this script --> <!-- ${eclipse-home} --> <!-- ${buildDirectory} --> <!-- ${buildLabel} --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> + <!-- should be little need to change what's above --> - <!-- sets the properties plugin-name, and library-file --> <property name="plugin-name" value="org.eclipse.wst.dtd.ui.tests" /> - <property - name="library-file" - value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> + <property + name="classname" + value="org.eclipse.wst.dtd.ui.tests.DTDUITestSuite" /> + <property + name="testType" + value="ui-test" /> + + <!-- should be little need to change what's below --> + + <echo message="basedir: ${basedir}" /> + <echo message="eclipse-home: ${eclipse-home}" /> + <echo message="buildDirectory: ${buildDirectory}" /> + <echo message="plugin-name: ${plugin-name}" /> + <echo message="classname: ${classname}" /> + <echo message="testType ${testType}" /> + + + <property + name="library-file" + value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> <property name="workspace" value="${eclipse-home}/junitworkspaces/${plugin-name}" /> - <!-- 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}" + + <!-- 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="${plugin-name}.*xml" /> - </delete> + </delete> <!-- make directory, in case path doesn't exist yet --> <mkdir dir="${workspace}" /> <!-- but delete to make sure fresh contents--> @@ -39,60 +56,60 @@ dir="${workspace}" quiet="true" /> - </target> + </target> - <!-- This target defines the tests that need to be run. --> - <target name="suite"> + <!-- This target defines the tests that need to be run. --> + <target name="suite"> - <ant - target="ui-test" - antfile="${library-file}" - dir="${eclipse-home}"> - <property - name="data-dir" + <ant + target="${testType}" + antfile="${library-file}" + dir="${eclipse-home}"> + <property + name="data-dir" value="${workspace}" /> - <property - name="plugin-name" - value="${plugin-name}" /> - <property - name="classname" - value="org.eclipse.wst.dtd.ui.tests.DTDUITestSuite" /> - <property - name="plugin-path" - value="${eclipse-home}/plugins/${plugin-name}" /> - </ant> + <property + name="plugin-name" + value="${plugin-name}" /> + <property + name="classname" + value="${classname}" /> + <property + name="plugin-path" + value="${eclipse-home}/plugins/${plugin-name}" /> + </ant> <copy failonerror="false" file="${workspace}/.metadata/.log" - tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.log" /> + tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" /> - </target> + </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"> + <!-- 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"> <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> - <!--<delete dir="${workspace}" quiet="true"/>--> - </target> + <!-- <delete dir="${workspace}" quiet="true" /> --> + </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" + <!-- 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="${plugin-name}.*xml" /> - <property - name="output-file" - value="${plugin-name}.xml" /> - </ant> - </target> + <property + name="output-file" + value="${plugin-name}.xml" /> + </ant> + </target> </project> \ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/test.xml b/tests/org.eclipse.wst.html.core.tests/test.xml index 60132fa..4692926 100644 --- a/tests/org.eclipse.wst.html.core.tests/test.xml +++ b/tests/org.eclipse.wst.html.core.tests/test.xml
@@ -1,37 +1,54 @@ <?xml version="1.0" encoding="UTF-8"?> <project - name="testsuite" - default="run" - basedir="."> + name="testsuite" + default="run" + basedir="."> + <!-- The following properties should be passed into this script --> <!-- ${eclipse-home} --> <!-- ${buildDirectory} --> <!-- ${buildLabel} --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> + <!-- should be little need to change what's above --> - <!-- sets the properties plugin-name, and library-file --> <property name="plugin-name" value="org.eclipse.wst.html.core.tests" /> - <property - name="library-file" - value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> + <property + name="classname" + value="org.eclipse.wst.html.core.tests.HTMLCoreTestSuite" /> + <property + name="testType" + value="core-test" /> + + <!-- should be little need to change what's below --> + + <echo message="basedir: ${basedir}" /> + <echo message="eclipse-home: ${eclipse-home}" /> + <echo message="buildDirectory: ${buildDirectory}" /> + <echo message="plugin-name: ${plugin-name}" /> + <echo message="classname: ${classname}" /> + <echo message="testType ${testType}" /> + + + <property + name="library-file" + value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> <property name="workspace" value="${eclipse-home}/junitworkspaces/${plugin-name}" /> - <!-- 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}" + + <!-- 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="${plugin-name}.*xml" /> - </delete> + </delete> <!-- make directory, in case path doesn't exist yet --> <mkdir dir="${workspace}" /> <!-- but delete to make sure fresh contents--> @@ -39,60 +56,60 @@ dir="${workspace}" quiet="true" /> - </target> + </target> - <!-- This target defines the tests that need to be run. --> - <target name="suite"> + <!-- This target defines the tests that need to be run. --> + <target name="suite"> - <ant - target="core-test" - antfile="${library-file}" - dir="${eclipse-home}"> - <property - name="data-dir" + <ant + target="${testType}" + antfile="${library-file}" + dir="${eclipse-home}"> + <property + name="data-dir" value="${workspace}" /> - <property - name="plugin-name" - value="${plugin-name}" /> - <property - name="classname" - value="org.eclipse.wst.html.core.tests.HTMLCoreTestSuite" /> - <property - name="plugin-path" - value="${eclipse-home}/plugins/${plugin-name}" /> - </ant> + <property + name="plugin-name" + value="${plugin-name}" /> + <property + name="classname" + value="${classname}" /> + <property + name="plugin-path" + value="${eclipse-home}/plugins/${plugin-name}" /> + </ant> <copy failonerror="false" file="${workspace}/.metadata/.log" - tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.log" /> + tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" /> - </target> + </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"> + <!-- 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"> <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> - <!--<delete dir="${workspace}" quiet="true" />--> - </target> + <!-- <delete dir="${workspace}" quiet="true" /> --> + </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" + <!-- 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="${plugin-name}.*xml" /> - <property - name="output-file" - value="${plugin-name}.xml" /> - </ant> - </target> + <property + name="output-file" + value="${plugin-name}.xml" /> + </ant> + </target> </project> \ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.tests.encoding/test.xml b/tests/org.eclipse.wst.html.tests.encoding/test.xml index 685d112..fbbf772 100644 --- a/tests/org.eclipse.wst.html.tests.encoding/test.xml +++ b/tests/org.eclipse.wst.html.tests.encoding/test.xml
@@ -1,37 +1,54 @@ <?xml version="1.0" encoding="UTF-8"?> <project - name="testsuite" - default="run" - basedir="."> + name="testsuite" + default="run" + basedir="."> + <!-- The following properties should be passed into this script --> <!-- ${eclipse-home} --> <!-- ${buildDirectory} --> <!-- ${buildLabel} --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> + <!-- should be little need to change what's above --> - <!-- sets the properties plugin-name, and library-file --> <property name="plugin-name" value="org.eclipse.wst.html.tests.encoding" /> - <property - name="library-file" - value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> + <property + name="classname" + value="org.eclipse.wst.html.tests.encoding.HTMLEncodingTestSuite" /> + <property + name="testType" + value="core-test" /> + + <!-- should be little need to change what's below --> + + <echo message="basedir: ${basedir}" /> + <echo message="eclipse-home: ${eclipse-home}" /> + <echo message="buildDirectory: ${buildDirectory}" /> + <echo message="plugin-name: ${plugin-name}" /> + <echo message="classname: ${classname}" /> + <echo message="testType ${testType}" /> + + + <property + name="library-file" + value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> <property name="workspace" value="${eclipse-home}/junitworkspaces/${plugin-name}" /> - <!-- 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"> + + <!-- 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}" + <delete> + <fileset + dir="${eclipse-home}" includes="${plugin-name}.*xml" /> - </delete> + </delete> <!-- make directory, in case path doesn't exist yet --> <mkdir dir="${workspace}" /> <!-- but delete to make sure fresh contents--> @@ -39,60 +56,60 @@ dir="${workspace}" quiet="true" /> - </target> + </target> - <!-- This target defines the tests that need to be run. --> - <target name="suite"> + <!-- This target defines the tests that need to be run. --> + <target name="suite"> - <ant - target="core-test" - antfile="${library-file}" - dir="${eclipse-home}"> - <property - name="data-dir" + <ant + target="${testType}" + antfile="${library-file}" + dir="${eclipse-home}"> + <property + name="data-dir" value="${workspace}" /> - <property - name="plugin-name" + <property + name="plugin-name" value="${plugin-name}" /> - <property - name="classname" - value="org.eclipse.wst.html.tests.encoding.HTMLEncodingTestSuite" /> - <property - name="plugin-path" - value="${eclipse-home}/plugins/${plugin-name}" /> - </ant> + <property + name="classname" + value="${classname}" /> + <property + name="plugin-path" + value="${eclipse-home}/plugins/${plugin-name}" /> + </ant> <copy failonerror="false" file="${workspace}/.metadata/.log" - tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.log" /> + tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" /> - </target> + </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"> + <!-- 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"> <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> - <!--<delete dir="${workspace}" quiet="true" />--> - </target> + <!-- <delete dir="${workspace}" quiet="true" /> --> + </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" + <!-- 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="${plugin-name}.*xml" /> - <property - name="output-file" - value="${plugin-name}.xml" /> - </ant> - </target> + <property + name="output-file" + value="${plugin-name}.xml" /> + </ant> + </target> </project> \ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.ui.tests/test.xml b/tests/org.eclipse.wst.html.ui.tests/test.xml index e5fffcb..2ba6ac2 100644 --- a/tests/org.eclipse.wst.html.ui.tests/test.xml +++ b/tests/org.eclipse.wst.html.ui.tests/test.xml
@@ -1,37 +1,53 @@ <?xml version="1.0" encoding="UTF-8"?> <project - name="testsuite" - default="run" - basedir="."> + name="testsuite" + default="run" + basedir="."> + <!-- The following properties should be passed into this script --> <!-- ${eclipse-home} --> <!-- ${buildDirectory} --> <!-- ${buildLabel} --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> - - <!-- sets the properties plugin-name, and library-file --> + <!-- should be little need to change what's above --> <property name="plugin-name" value="org.eclipse.wst.html.ui.tests" /> - <property - name="library-file" - value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> + <property + name="classname" + value="org.eclipse.wst.html.ui.tests.HTMLUITestSuite" /> + <property + name="testType" + value="ui-test" /> + + <!-- should be little need to change what's below --> + + <echo message="basedir: ${basedir}" /> + <echo message="eclipse-home: ${eclipse-home}" /> + <echo message="buildDirectory: ${buildDirectory}" /> + <echo message="plugin-name: ${plugin-name}" /> + <echo message="classname: ${classname}" /> + <echo message="testType ${testType}" /> + + + <property + name="library-file" + value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> <property name="workspace" value="${eclipse-home}/junitworkspaces/${plugin-name}" /> - <!-- 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}" + + <!-- 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="${plugin-name}.*xml" /> - </delete> + </delete> <!-- make directory, in case path doesn't exist yet --> <mkdir dir="${workspace}" /> <!-- but delete to make sure fresh contents--> @@ -39,60 +55,60 @@ dir="${workspace}" quiet="true" /> - </target> + </target> - <!-- This target defines the tests that need to be run. --> - <target name="suite"> + <!-- This target defines the tests that need to be run. --> + <target name="suite"> - <ant - target="ui-test" - antfile="${library-file}" - dir="${eclipse-home}"> - <property - name="data-dir" + <ant + target="${testType}" + antfile="${library-file}" + dir="${eclipse-home}"> + <property + name="data-dir" value="${workspace}" /> - <property - name="plugin-name" - value="${plugin-name}" /> - <property - name="classname" - value="org.eclipse.wst.html.ui.tests.HTMLUITestSuite" /> - <property - name="plugin-path" - value="${eclipse-home}/plugins/${plugin-name}" /> - </ant> + <property + name="plugin-name" + value="${plugin-name}" /> + <property + name="classname" + value="${classname}" /> + <property + name="plugin-path" + value="${eclipse-home}/plugins/${plugin-name}" /> + </ant> <copy failonerror="false" file="${workspace}/.metadata/.log" - tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.log" /> + tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" /> - </target> + </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"> + <!-- 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"> <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> - <!--<delete dir="${workspace}" quiet="true" />--> - </target> + <!-- <delete dir="${workspace}" quiet="true" /> --> + </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" + <!-- 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="${plugin-name}.*xml" /> - <property - name="output-file" - value="${plugin-name}.xml" /> - </ant> - </target> + <property + name="output-file" + value="${plugin-name}.xml" /> + </ant> + </target> </project> \ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/test.xml b/tests/org.eclipse.wst.sse.core.tests/test.xml index 0333c2b..b8e3cbe 100644 --- a/tests/org.eclipse.wst.sse.core.tests/test.xml +++ b/tests/org.eclipse.wst.sse.core.tests/test.xml
@@ -4,23 +4,40 @@ 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}\..\.." /> --> + + <!-- The following properties should be passed into this script --> + <!-- ${eclipse-home} --> + <!-- ${buildDirectory} --> + <!-- ${buildLabel} --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> - - <!-- sets the properties plugin-name, and library-file --> + <!-- should be little need to change what's above --> <property name="plugin-name" value="org.eclipse.wst.sse.core.tests" /> <property + name="classname" + value="org.eclipse.wst.sse.core.tests.SSEModelTestSuite" /> + <property + name="testType" + value="core-test" /> + + <!-- should be little need to change what's below --> + + <echo message="basedir: ${basedir}" /> + <echo message="eclipse-home: ${eclipse-home}" /> + <echo message="buildDirectory: ${buildDirectory}" /> + <echo message="plugin-name: ${plugin-name}" /> + <echo message="classname: ${classname}" /> + <echo message="testType ${testType}" /> + + + <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> <property name="workspace" value="${eclipse-home}/junitworkspaces/${plugin-name}" /> + <!-- 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. --> @@ -44,7 +61,7 @@ <target name="suite"> <ant - target="core-test" + target="${testType}" antfile="${library-file}" dir="${eclipse-home}"> <property @@ -55,7 +72,7 @@ value="${plugin-name}" /> <property name="classname" - value="org.eclipse.wst.sse.core.tests.SSEModelTestSuite" /> + value="${classname}" /> <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}" /> @@ -64,7 +81,7 @@ <copy failonerror="false" file="${workspace}/.metadata/.log" - tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.log" /> + tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" /> </target> @@ -73,7 +90,7 @@ <!-- delete temporary files that have been created. --> <target name="cleanup"> <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> - <!--<delete dir="${workspace}" quiet="true" />--> + <!-- <delete dir="${workspace}" quiet="true" /> --> </target> <!-- This target runs the test suite. Any actions that need to happen -->
diff --git a/tests/org.eclipse.wst.sse.ui.tests/test.xml b/tests/org.eclipse.wst.sse.ui.tests/test.xml index bf961b9..ce65ee0 100644 --- a/tests/org.eclipse.wst.sse.ui.tests/test.xml +++ b/tests/org.eclipse.wst.sse.ui.tests/test.xml
@@ -4,23 +4,42 @@ name="testsuite" default="run" basedir="."> - <!-- The following properties should be passed into this script --> - <!-- ${eclipse-home} --> - <!-- ${buildDirectory} --> - <!-- ${buildLabel} --> + + <!-- The following properties should be passed into this script --> + <!-- ${eclipse-home} --> + <!-- ${buildDirectory} --> + <!-- ${buildLabel} --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> + <!-- should be little need to change what's above --> + <property name="plugin-name" value="org.eclipse.wst.sse.ui.tests" /> <property + name="classname" + value="org.eclipse.wst.sse.ui.tests.SSEUITestSuite" /> + <property + name="testType" + value="ui-test" /> + + <!-- should be little need to change what's below --> + + <echo message="basedir: ${basedir}" /> + <echo message="eclipse-home: ${eclipse-home}" /> + <echo message="buildDirectory: ${buildDirectory}" /> + <echo message="plugin-name: ${plugin-name}" /> + <echo message="classname: ${classname}" /> + <echo message="testType ${testType}" /> + + + <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> <property name="workspace" value="${eclipse-home}/junitworkspaces/${plugin-name}" /> + <!-- 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. --> @@ -44,7 +63,7 @@ <target name="suite"> <ant - target="ui-test" + target="${testType}" antfile="${library-file}" dir="${eclipse-home}"> <property @@ -55,7 +74,7 @@ value="${plugin-name}" /> <property name="classname" - value="org.eclipse.wst.sse.ui.tests.SSEUITestSuite" /> + value="${classname}" /> <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}" /> @@ -64,7 +83,7 @@ <copy failonerror="false" file="${workspace}/.metadata/.log" - tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.log" /> + tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" /> </target> @@ -73,7 +92,7 @@ <!-- delete temporary files that have been created. --> <target name="cleanup"> <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> - <!--<delete dir="${workspace}" quiet="true"/>--> + <!-- <delete dir="${workspace}" quiet="true" /> --> </target> <!-- This target runs the test suite. Any actions that need to happen -->
diff --git a/tests/org.eclipse.wst.xml.core.tests/test.xml b/tests/org.eclipse.wst.xml.core.tests/test.xml index 874bc35..d021aae 100644 --- a/tests/org.eclipse.wst.xml.core.tests/test.xml +++ b/tests/org.eclipse.wst.xml.core.tests/test.xml
@@ -1,25 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> + <project name="testsuite" default="run" basedir="."> + + <!-- The following properties should be passed into this script --> + <!-- ${eclipse-home} --> + <!-- ${buildDirectory} --> + <!-- ${buildLabel} --> - <!-- 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}\..\.." /> --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> - - <!-- sets the properties plugin-name, and library-file --> + <!-- should be little need to change what's above --> + <property name="plugin-name" value="org.eclipse.wst.xml.core.tests" /> <property + name="classname" + value="org.eclipse.wst.xml.core.tests.SSEModelXMLTestSuite" /> + <property + name="testType" + value="core-test" /> + + <!-- should be little need to change what's below --> + + <echo message="basedir: ${basedir}" /> + <echo message="eclipse-home: ${eclipse-home}" /> + <echo message="buildDirectory: ${buildDirectory}" /> + <echo message="plugin-name: ${plugin-name}" /> + <echo message="classname: ${classname}" /> + <echo message="testType ${testType}" /> + + + <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> <property name="workspace" value="${eclipse-home}/junitworkspaces/${plugin-name}" /> + <!-- 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. --> @@ -43,7 +62,7 @@ <target name="suite"> <ant - target="core-test" + target="${testType}" antfile="${library-file}" dir="${eclipse-home}"> <property @@ -54,7 +73,7 @@ value="${plugin-name}" /> <property name="classname" - value="org.eclipse.wst.xml.core.tests.SSEModelXMLTestSuite" /> + value="${classname}" /> <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}" /> @@ -63,7 +82,7 @@ <copy failonerror="false" file="${workspace}/.metadata/.log" - tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.log" /> + tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" /> </target>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/test.xml b/tests/org.eclipse.wst.xml.tests.encoding/test.xml index 8024f5c..f801a7f 100644 --- a/tests/org.eclipse.wst.xml.tests.encoding/test.xml +++ b/tests/org.eclipse.wst.xml.tests.encoding/test.xml
@@ -4,23 +4,41 @@ 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}\..\.." /> --> + + <!-- The following properties should be passed into this script --> + <!-- ${eclipse-home} --> + <!-- ${buildDirectory} --> + <!-- ${buildLabel} --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> + <!-- should be little need to change what's above --> - <!-- sets the properties plugin-name, and library-file --> <property name="plugin-name" value="org.eclipse.wst.xml.tests.encoding" /> <property + name="classname" + value="org.eclipse.wst.xml.tests.encoding.EncodingTestSuite" /> + <property + name="testType" + value="core-test" /> + + <!-- should be little need to change what's below --> + + <echo message="basedir: ${basedir}" /> + <echo message="eclipse-home: ${eclipse-home}" /> + <echo message="buildDirectory: ${buildDirectory}" /> + <echo message="plugin-name: ${plugin-name}" /> + <echo message="classname: ${classname}" /> + <echo message="testType ${testType}" /> + + + <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> <property name="workspace" value="${eclipse-home}/junitworkspaces/${plugin-name}" /> + <!-- 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. --> @@ -44,7 +62,7 @@ <target name="suite"> <ant - target="core-test" + target="${testType}" antfile="${library-file}" dir="${eclipse-home}"> <property @@ -55,7 +73,7 @@ value="${plugin-name}" /> <property name="classname" - value="org.eclipse.wst.xml.tests.encoding.EncodingTestSuite" /> + value="${classname}" /> <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}" /> @@ -64,7 +82,7 @@ <copy failonerror="false" file="${workspace}/.metadata/.log" - tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.log" /> + tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" /> </target> @@ -73,7 +91,7 @@ <!-- delete temporary files that have been created. --> <target name="cleanup"> <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> - <!--<delete dir="${workspace}" quiet="true" />--> + <!-- <delete dir="${workspace}" quiet="true" /> --> </target> <!-- This target runs the test suite. Any actions that need to happen -->
diff --git a/tests/org.eclipse.wst.xml.ui.tests/test.xml b/tests/org.eclipse.wst.xml.ui.tests/test.xml index f321016..d928e35 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/test.xml +++ b/tests/org.eclipse.wst.xml.ui.tests/test.xml
@@ -1,36 +1,53 @@ <?xml version="1.0" encoding="UTF-8"?> <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}\..\.." />--> + name="testsuite" + default="run" + basedir="."> + + <!-- The following properties should be passed into this script --> + <!-- ${eclipse-home} --> + <!-- ${buildDirectory} --> + <!-- ${buildLabel} --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> - - <!-- sets the properties plugin-name, and library-file --> + <!-- should be little need to change what's above --> <property name="plugin-name" value="org.eclipse.wst.xml.ui.tests" /> - <property - name="library-file" - value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> + <property + name="classname" + value="org.eclipse.wst.xml.ui.tests.XMLUITestSuite" /> + <property + name="testType" + value="ui-test" /> + + <!-- should be little need to change what's below --> + + <echo message="basedir: ${basedir}" /> + <echo message="eclipse-home: ${eclipse-home}" /> + <echo message="buildDirectory: ${buildDirectory}" /> + <echo message="plugin-name: ${plugin-name}" /> + <echo message="classname: ${classname}" /> + <echo message="testType ${testType}" /> + + + <property + name="library-file" + value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> <property name="workspace" value="${eclipse-home}/junitworkspaces/${plugin-name}" /> - <!-- 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"> + + <!-- 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}" + <delete> + <fileset + dir="${eclipse-home}" includes="${plugin-name}.*xml" /> - </delete> + </delete> <!-- make directory, in case path doesn't exist yet --> <mkdir dir="${workspace}" /> <!-- but delete to make sure fresh contents--> @@ -38,60 +55,60 @@ dir="${workspace}" quiet="true" /> - </target> + </target> - <!-- This target defines the tests that need to be run. --> - <target name="suite"> + <!-- This target defines the tests that need to be run. --> + <target name="suite"> - <ant - target="ui-test" - antfile="${library-file}" - dir="${eclipse-home}"> - <property - name="data-dir" + <ant + target="${testType}" + antfile="${library-file}" + dir="${eclipse-home}"> + <property + name="data-dir" value="${workspace}" /> - <property - name="plugin-name" - value="${plugin-name}" /> - <property - name="classname" - value="org.eclipse.wst.xml.ui.tests.XMLUITestSuite" /> - <property - name="plugin-path" - value="${eclipse-home}/plugins/${plugin-name}" /> - </ant> + <property + name="plugin-name" + value="${plugin-name}" /> + <property + name="classname" + value="${classname}" /> + <property + name="plugin-path" + value="${eclipse-home}/plugins/${plugin-name}" /> + </ant> <copy failonerror="false" file="${workspace}/.metadata/.log" - tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.log" /> + tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" /> - </target> + </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"> + <!-- 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"> <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> - <!-- <delete dir="${workspace}" quiet="true" />--> - </target> + <!-- <delete dir="${workspace}" quiet="true" /> --> + </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" + <!-- 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="${plugin-name}.*xml" /> - <property - name="output-file" - value="${plugin-name}.xml" /> - </ant> - </target> + <property + name="output-file" + value="${plugin-name}.xml" /> + </ant> + </target> </project> \ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/test.xml b/tests/org.eclipse.wst.xml.validation.tests/test.xml index 73ff17d..bea3313 100644 --- a/tests/org.eclipse.wst.xml.validation.tests/test.xml +++ b/tests/org.eclipse.wst.xml.validation.tests/test.xml
@@ -4,24 +4,41 @@ name="testsuite" default="run" basedir="."> + <!-- The following properties should be passed into this script --> <!-- ${eclipse-home} --> <!-- ${buildDirectory} --> <!-- ${buildLabel} --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> - - <!-- sets the properties plugin-name, and library-file --> + <!-- should be little need to change what's above --> + <property name="plugin-name" - value="org.eclipse.wst.sse.ui.tests" /> + value="org.eclipse.wst.xml.validation.tests" /> + <property + name="classname" + value="org.eclipse.wst.xml.validation.tests.internal.AllXMLTests" /> + <property + name="testType" + value="core-test" /> + + <!-- should be little need to change what's below --> + + <echo message="basedir: ${basedir}" /> + <echo message="eclipse-home: ${eclipse-home}" /> + <echo message="buildDirectory: ${buildDirectory}" /> + <echo message="plugin-name: ${plugin-name}" /> + <echo message="classname: ${classname}" /> + <echo message="testType ${testType}" /> + + <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> <property name="workspace" value="${eclipse-home}/junitworkspaces/${plugin-name}" /> + <!-- 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. --> @@ -45,7 +62,7 @@ <target name="suite"> <ant - target="ui-test" + target="${testType}" antfile="${library-file}" dir="${eclipse-home}"> <property @@ -56,7 +73,7 @@ value="${plugin-name}" /> <property name="classname" - value="org.eclipse.wst.sse.ui.tests.SSEUITestSuite" /> + value="${classname}" /> <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}" /> @@ -65,7 +82,7 @@ <copy failonerror="false" file="${workspace}/.metadata/.log" - tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.log" /> + tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" /> </target> @@ -74,7 +91,7 @@ <!-- delete temporary files that have been created. --> <target name="cleanup"> <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> - <!--<delete dir="${workspace}" quiet="true"/>--> + <!-- <delete dir="${workspace}" quiet="true" /> --> </target> <!-- This target runs the test suite. Any actions that need to happen -->
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/test.xml b/tests/org.eclipse.wst.xsd.validation.tests/test.xml index bffbd1f..46130ee 100644 --- a/tests/org.eclipse.wst.xsd.validation.tests/test.xml +++ b/tests/org.eclipse.wst.xsd.validation.tests/test.xml
@@ -1,22 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> <project - name="testsuite" - default="run" - basedir="."> + name="testsuite" + default="run" + basedir="."> + <!-- The following properties should be passed into this script --> <!-- ${eclipse-home} --> <!-- ${buildDirectory} --> <!-- ${buildLabel} --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> - - <!-- sets the properties plugin-name, and library-file --> + <!-- should be little need to change what's above --> + <property name="plugin-name" value="org.eclipse.wst.xsd.validation.tests" /> + <property + name="classname" + value="org.eclipse.wst.xsd.validation.tests.internal.AllXSDTests" /> + <property + name="testType" + value="core-test" /> + + <!-- should be little need to change what's below --> <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />