[106963] location of build and tests workspaces not obvioius (or changeable)
diff --git a/tests/org.eclipse.jst.jsp.core.tests/test.xml b/tests/org.eclipse.jst.jsp.core.tests/test.xml index 142fad1..502e3d2 100644 --- a/tests/org.eclipse.jst.jsp.core.tests/test.xml +++ b/tests/org.eclipse.jst.jsp.core.tests/test.xml
@@ -1,12 +1,16 @@ -<?xml version="1.0"?> +<?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}\..\.." /> --> + <!-- 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 @@ -15,10 +19,9 @@ <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> - - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> - + <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. --> @@ -27,25 +30,27 @@ <delete> <fileset dir="${eclipse-home}" - includes="org.eclipse.jst.jsp.core.tests.*xml" /> + includes="${plugin-name}.*xml" /> </delete> + <!-- make directory, in case path doesn't exist yet --> + <mkdir dir="${workspace}" /> + <!-- but delete to make sure fresh contents--> + <delete + dir="${workspace}" + quiet="true" /> + </target> <!-- This target defines the tests that need to be run. --> <target name="suite"> - <property - name="wst-folder" - value="${eclipse-home}/wst_folder" /> - <delete - dir="${wst-folder}" - quiet="true" /> + <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> <property name="data-dir" - value="${wst-folder}" /> + value="${workspace}" /> <property name="plugin-name" value="${plugin-name}" /> @@ -55,16 +60,20 @@ <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}" /> - <property - name="workspace" - value="${eclipse-home}/junitworkspace-${plugin-name}" /> </ant> + + <copy + failonerror="false" + file="${workspace}/.metadata/.log" + tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.log" /> + </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"> + <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> <!-- <delete dir="${workspace}" quiet="true" /> --> </target> @@ -79,7 +88,7 @@ dir="${eclipse-home}"> <property name="includes" - value="org.eclipse.jst.jsp.core.tests.*xml" /> + value="${plugin-name}.*xml" /> <property name="output-file" value="${plugin-name}.xml" />
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/test.xml b/tests/org.eclipse.jst.jsp.tests.encoding/test.xml index 7cc97da..0a35ca0 100644 --- a/tests/org.eclipse.jst.jsp.tests.encoding/test.xml +++ b/tests/org.eclipse.jst.jsp.tests.encoding/test.xml
@@ -1,15 +1,13 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <project name="testsuite" default="run" basedir="."> - - <!-- Configurable Properties --> - - <!-- 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}" /> @@ -21,53 +19,61 @@ <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}" - includes="org.eclipse.jst.jsp.tests.encoding.*xml" /> + includes="${plugin-name}.*xml" /> </delete> + <!-- make directory, in case path doesn't exist yet --> + <mkdir dir="${workspace}" /> + <!-- but delete to make sure fresh contents--> + <delete + dir="${workspace}" + quiet="true" /> + </target> <!-- This target defines the tests that need to be run. --> <target name="suite"> - <property - name="wst-folder" - value="${eclipse-home}/wst_folder" /> - <delete - dir="${wst-folder}" - quiet="true" /> + <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> <property name="data-dir" - value="${wst-folder}" /> + value="${workspace}" /> <property name="plugin-name" - value="org.eclipse.jst.jsp.tests.encoding" /> + value="${plugin-name}" /> <property name="classname" value="org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestSuite" /> <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}" /> - <property - name="workspace" - value="${eclipse-home}/junitworkspace-${plugin-name}" /> + </ant> - </ant> + <copy + failonerror="false" + file="${workspace}/.metadata/.log" + tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.log" /> + </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"> + <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> <!--<delete dir="${workspace}" quiet="true" />--> </target> @@ -82,12 +88,11 @@ dir="${eclipse-home}"> <property name="includes" - value="org.eclipse.jst.jsp.tests.encoding.*xml" /> + value="${plugin-name}.*xml" /> <property name="output-file" value="${plugin-name}.xml" /> </ant> - <!--<emailResults resultsFile="${build-results-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com" /> --> </target> </project> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/test.xml b/tests/org.eclipse.jst.jsp.ui.tests/test.xml index d3b7cde..3c89319 100644 --- a/tests/org.eclipse.jst.jsp.ui.tests/test.xml +++ b/tests/org.eclipse.jst.jsp.ui.tests/test.xml
@@ -1,51 +1,97 @@ -<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}\..\.."/>--> +<?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} --> - <!-- sets the properties plugin-name, and library-file --> - <property name="plugin-name" value="org.eclipse.jst.jsp.ui.tests" /> - <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> + <echo message="basedir ${basedir}" /> + <echo message="eclipse place ${eclipse-home}" /> + <!-- sets the properties plugin-name, and library-file --> + <property + name="plugin-name" + value="org.eclipse.jst.jsp.ui.tests" /> + <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}" + includes="${plugin-name}.*xml" /> + </delete> + <!-- make directory, in case path doesn't exist yet --> + <mkdir dir="${workspace}" /> + <!-- but delete to make sure fresh contents--> + <delete + dir="${workspace}" + quiet="true" /> - <!-- 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"> - <delete> - <fileset dir="${eclipse-home}" includes="org.eclipse.jst.jsp.ui.tests.*xml" /> - </delete> - </target> + </target> - <!-- This target defines the tests that need to be run. --> - <target name="suite"> - <delete dir="${workspace}" quiet="true" /> - <ant target="ui-test" 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.ui.tests.JSPUITestSuite" /> - <property - name="workspace" - value="${eclipse-home}/junitworkspace-${plugin-name}" /> + <!-- This target defines the tests that need to be run. --> + <target name="suite"> - </ant> - </target> + <ant + target="ui-test" + 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.ui.tests.JSPUITestSuite" /> + <property + name="plugin-path" + value="${eclipse-home}/plugins/${plugin-name}" /> + </ant> - <!-- 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"> - <!--<delete dir="${workspace}" quiet="true"/>--> - </target> + <copy + failonerror="false" + file="${workspace}/.metadata/.log" + tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.log" /> - <!-- 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.eclipse.jst.jsp.ui.tests.*xml" /> - <property name="output-file" value="${plugin-name}.xml" /> - </ant> - <!-- <emailResults resultsFile="${build-results-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com" /> --> - </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"> + <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> + <!--<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" + value="${plugin-name}.*xml" /> + <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.core.tests/test.xml b/tests/org.eclipse.wst.css.core.tests/test.xml index 33b2fd4..d1b1fb5 100644 --- a/tests/org.eclipse.wst.css.core.tests/test.xml +++ b/tests/org.eclipse.wst.css.core.tests/test.xml
@@ -1,12 +1,16 @@ -<?xml version="1.0"?> +<?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}\..\.." /> --> + <!-- 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 @@ -15,10 +19,9 @@ <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> - - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> - + <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. --> @@ -27,25 +30,27 @@ <delete> <fileset dir="${eclipse-home}" - includes="org.eclipse.wst.css.core.tests.*xml" /> + includes="${plugin-name}.*xml" /> </delete> + <!-- make directory, in case path doesn't exist yet --> + <mkdir dir="${workspace}" /> + <!-- but delete to make sure fresh contents--> + <delete + dir="${workspace}" + quiet="true" /> + </target> <!-- This target defines the tests that need to be run. --> <target name="suite"> - <property - name="wst-folder" - value="${eclipse-home}/wst_folder" /> - <delete - dir="${wst-folder}" - quiet="true" /> + <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> <property name="data-dir" - value="${wst-folder}" /> + value="${workspace}" /> <property name="plugin-name" value="${plugin-name}" /> @@ -56,12 +61,19 @@ 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" /> + </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"> + <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> <!-- <delete dir="${workspace}" quiet="true" /> --> </target> @@ -76,12 +88,11 @@ dir="${eclipse-home}"> <property name="includes" - value="org.eclipse.wst.css.core.tests.*xml" /> + value="${plugin-name}.*xml" /> <property name="output-file" value="${plugin-name}.xml" /> </ant> - <!-- <emailResults resultsFile="${build-results-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com" /> --> </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 55f0ba1..d62b32b 100644 --- a/tests/org.eclipse.wst.css.tests.encoding/test.xml +++ b/tests/org.eclipse.wst.css.tests.encoding/test.xml
@@ -1,15 +1,13 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <project name="testsuite" default="run" basedir="."> - - <!-- Configurable Properties --> - - <!-- 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}" /> @@ -21,36 +19,41 @@ <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}" - includes="org.eclipse.wst.css.tests.encoding.*xml" /> + includes="${plugin-name}.*xml" /> </delete> + <!-- make directory, in case path doesn't exist yet --> + <mkdir dir="${workspace}" /> + <!-- but delete to make sure fresh contents--> + <delete + dir="${workspace}" + quiet="true" /> + </target> <!-- This target defines the tests that need to be run. --> <target name="suite"> - <property - name="wst-folder" - value="${eclipse-home}/wst_folder" /> - <delete - dir="${wst-folder}" - quiet="true" /> + <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> <property name="data-dir" - value="${wst-folder}" /> + value="${workspace}" /> <property name="plugin-name" - value="org.eclipse.wst.css.tests.encoding" /> + value="${plugin-name}" /> <property name="classname" value="org.eclipse.wst.css.tests.encoding.CSSEncodingTestSuite" /> @@ -58,12 +61,19 @@ 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" /> + </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"> + <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> <!--<delete dir="${workspace}" quiet="true" />--> </target> @@ -78,12 +88,11 @@ dir="${eclipse-home}"> <property name="includes" - value="org.eclipse.wst.css.tests.encoding.*xml" /> + value="${plugin-name}.*xml" /> <property name="output-file" value="${plugin-name}.xml" /> </ant> - <!--<emailResults resultsFile="${build-results-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com" /> --> </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 82dc126..ffacb4f 100644 --- a/tests/org.eclipse.wst.css.ui.tests/test.xml +++ b/tests/org.eclipse.wst.css.ui.tests/test.xml
@@ -1,47 +1,98 @@ -<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}\..\.."/>--> +<?xml version="1.0" encoding="UTF-8"?> - <!-- sets the properties plugin-name, and library-file --> - <property name="plugin-name" value="org.eclipse.wst.css.ui.tests" /> - <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> +<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}" /> - <!-- 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"> - <delete> - <fileset dir="${eclipse-home}" includes="org.eclipse.wst.css.ui.tests.*xml" /> - </delete> - </target> + <!-- sets the properties plugin-name, and library-file --> + <property + name="plugin-name" + value="org.eclipse.wst.css.ui.tests" /> + <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}" + includes="${plugin-name}.*xml" /> + </delete> + <!-- make directory, in case path doesn't exist yet --> + <mkdir dir="${workspace}" /> + <!-- but delete to make sure fresh contents--> + <delete + dir="${workspace}" + quiet="true" /> - <!-- This target defines the tests that need to be run. --> - <target name="suite"> - <delete dir="${workspace}" quiet="true" /> - <ant target="ui-test" 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.ui.tests.CSSUITestSuite" /> - </ant> - </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"> - <!--<delete dir="${workspace}" quiet="true"/>--> - </target> + <!-- This target defines the tests that need to be run. --> + <target name="suite"> - <!-- 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.eclipse.wst.css.ui.tests.*xml" /> - <property name="output-file" value="${plugin-name}.xml" /> - </ant> - <!-- <emailResults resultsFile="${build-results-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com" /> --> - </target> + <ant + target="ui-test" + 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.ui.tests.CSSUITestSuite" /> + <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" /> + + </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"> + <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> + <!--<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" + value="${plugin-name}.*xml" /> + <property + name="output-file" + value="${plugin-name}.xml" /> + </ant> + </target> </project> \ No newline at end of file
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/test.xml b/tests/org.eclipse.wst.dtd.ui.tests/test.xml index 6e19253..1e9c0b3 100644 --- a/tests/org.eclipse.wst.dtd.ui.tests/test.xml +++ b/tests/org.eclipse.wst.dtd.ui.tests/test.xml
@@ -1,12 +1,13 @@ -<?xml version="1.0"?> +<?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}\..\.."/> --> + <!-- The following properties should be passed into this script --> + <!-- ${eclipse-home} --> + <!-- ${buildDirectory} --> + <!-- ${buildLabel} --> <echo message="basedir ${basedir}" /> <echo message="eclipse place ${eclipse-home}" /> @@ -18,7 +19,9 @@ <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. --> @@ -27,25 +30,27 @@ <delete> <fileset dir="${eclipse-home}" - includes="org.eclipse.wst.dtd.ui.tests.*xml" /> + includes="${plugin-name}.*xml" /> </delete> + <!-- make directory, in case path doesn't exist yet --> + <mkdir dir="${workspace}" /> + <!-- but delete to make sure fresh contents--> + <delete + dir="${workspace}" + quiet="true" /> + </target> <!-- This target defines the tests that need to be run. --> <target name="suite"> - <property - name="wst-folder" - value="${eclipse-home}/wst_folder" /> - <delete - dir="${workspace}" - quiet="true" /> + <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}"> <property name="data-dir" - value="${wst-folder}" /> + value="${workspace}" /> <property name="plugin-name" value="${plugin-name}" /> @@ -56,12 +61,19 @@ 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" /> + </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"> + <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> <!--<delete dir="${workspace}" quiet="true"/>--> </target> @@ -76,12 +88,11 @@ dir="${eclipse-home}"> <property name="includes" - value="org.eclipse.wst.dtd.ui.tests.*xml" /> + value="${plugin-name}.*xml" /> <property name="output-file" value="${plugin-name}.xml" /> </ant> - <!-- <emailResults resultsFile="${build-results-home}/${plugin-name}.xml" addresslist="nitind@us.ibm.com,david_williams@us.ibm.com" /> --> </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 9a0a196..60132fa 100644 --- a/tests/org.eclipse.wst.html.core.tests/test.xml +++ b/tests/org.eclipse.wst.html.core.tests/test.xml
@@ -1,12 +1,13 @@ -<?xml version="1.0"?> +<?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}\..\.." /> --> + <!-- The following properties should be passed into this script --> + <!-- ${eclipse-home} --> + <!-- ${buildDirectory} --> + <!-- ${buildLabel} --> <echo message="basedir ${basedir}" /> <echo message="eclipse place ${eclipse-home}" /> @@ -18,7 +19,9 @@ <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. --> @@ -27,25 +30,27 @@ <delete> <fileset dir="${eclipse-home}" - includes="org.eclipse.wst.html.core.tests.*xml" /> + includes="${plugin-name}.*xml" /> </delete> + <!-- make directory, in case path doesn't exist yet --> + <mkdir dir="${workspace}" /> + <!-- but delete to make sure fresh contents--> + <delete + dir="${workspace}" + quiet="true" /> + </target> <!-- This target defines the tests that need to be run. --> <target name="suite"> - <property - name="wst-folder" - value="${eclipse-home}/wst_folder" /> - <delete - dir="${wst-folder}" - quiet="true" /> + <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> <property name="data-dir" - value="${wst-folder}" /> + value="${workspace}" /> <property name="plugin-name" value="${plugin-name}" /> @@ -56,12 +61,19 @@ 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" /> + </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"> + <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> <!--<delete dir="${workspace}" quiet="true" />--> </target> @@ -76,12 +88,11 @@ dir="${eclipse-home}"> <property name="includes" - value="org.eclipse.wst.html.core.tests.*xml" /> + value="${plugin-name}.*xml" /> <property name="output-file" value="${plugin-name}.xml" /> </ant> - <!-- <emailResults resultsFile="${build-results-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com" /> --> </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 772fa96..685d112 100644 --- a/tests/org.eclipse.wst.html.tests.encoding/test.xml +++ b/tests/org.eclipse.wst.html.tests.encoding/test.xml
@@ -1,15 +1,13 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <project name="testsuite" default="run" basedir="."> - - <!-- Configurable Properties --> - - <!-- 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}" /> @@ -21,36 +19,41 @@ <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}" - includes="org.eclipse.wst.html.tests.encoding.*xml" /> + includes="${plugin-name}.*xml" /> </delete> + <!-- make directory, in case path doesn't exist yet --> + <mkdir dir="${workspace}" /> + <!-- but delete to make sure fresh contents--> + <delete + dir="${workspace}" + quiet="true" /> + </target> <!-- This target defines the tests that need to be run. --> <target name="suite"> - <property - name="wst-folder" - value="${eclipse-home}/wst_folder" /> - <delete - dir="${wst-folder}" - quiet="true" /> + <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> <property name="data-dir" - value="${wst-folder}" /> + value="${workspace}" /> <property name="plugin-name" - value="org.eclipse.wst.html.tests.encoding" /> + value="${plugin-name}" /> <property name="classname" value="org.eclipse.wst.html.tests.encoding.HTMLEncodingTestSuite" /> @@ -58,12 +61,19 @@ 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" /> + </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"> + <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> <!--<delete dir="${workspace}" quiet="true" />--> </target> @@ -78,12 +88,11 @@ dir="${eclipse-home}"> <property name="includes" - value="org.eclipse.wst.html.tests.encoding.*xml" /> + value="${plugin-name}.*xml" /> <property name="output-file" value="${plugin-name}.xml" /> </ant> - <!--<emailResults resultsFile="${build-results-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com" /> --> </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 e1e1f3b..e5fffcb 100644 --- a/tests/org.eclipse.wst.html.ui.tests/test.xml +++ b/tests/org.eclipse.wst.html.ui.tests/test.xml
@@ -1,12 +1,13 @@ -<?xml version="1.0"?> +<?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}\..\.." /> --> + <!-- The following properties should be passed into this script --> + <!-- ${eclipse-home} --> + <!-- ${buildDirectory} --> + <!-- ${buildLabel} --> <echo message="basedir ${basedir}" /> <echo message="eclipse place ${eclipse-home}" /> @@ -18,7 +19,9 @@ <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. --> @@ -27,25 +30,27 @@ <delete> <fileset dir="${eclipse-home}" - includes="org.eclipse.wst.html.ui.tests.*xml" /> + includes="${plugin-name}.*xml" /> </delete> + <!-- make directory, in case path doesn't exist yet --> + <mkdir dir="${workspace}" /> + <!-- but delete to make sure fresh contents--> + <delete + dir="${workspace}" + quiet="true" /> + </target> <!-- This target defines the tests that need to be run. --> <target name="suite"> - <property - name="wst-folder" - value="${eclipse-home}/wst_folder" /> - <delete - dir="${wst-folder}" - quiet="true" /> + <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}"> <property name="data-dir" - value="${wst-folder}" /> + value="${workspace}" /> <property name="plugin-name" value="${plugin-name}" /> @@ -56,12 +61,19 @@ 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" /> + </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"> + <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> <!--<delete dir="${workspace}" quiet="true" />--> </target> @@ -76,12 +88,11 @@ dir="${eclipse-home}"> <property name="includes" - value="org.eclipse.wst.html.ui.tests.*xml" /> + value="${plugin-name}.*xml" /> <property name="output-file" value="${plugin-name}.xml" /> </ant> - <!-- <emailResults resultsFile="${build-results-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com" /> --> </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 024ba6d..0333c2b 100644 --- a/tests/org.eclipse.wst.sse.core.tests/test.xml +++ b/tests/org.eclipse.wst.sse.core.tests/test.xml
@@ -1,89 +1,97 @@ -<?xml version="1.0"?> +<?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 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}" /> + <echo message="basedir ${basedir}" /> + <echo message="eclipse place ${eclipse-home}" /> - <!-- sets the properties plugin-name, and library-file --> - <property - name="plugin-name" - value="org.eclipse.wst.sse.core.tests" /> - <property - name="library-file" - value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> - <property - name="workspace" - value="${eclipse-home}/junitworkspace-${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}" - includes="org.eclipse.wst.sse.core.tests.*xml" /> - </delete> - </target> + <!-- sets the properties plugin-name, and library-file --> + <property + name="plugin-name" + value="org.eclipse.wst.sse.core.tests" /> + <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}" + includes="${plugin-name}.*xml" /> + </delete> + <!-- make directory, in case path doesn't exist yet --> + <mkdir dir="${workspace}" /> + <!-- but delete to make sure fresh contents--> + <delete + dir="${workspace}" + quiet="true" /> - <!-- This target defines the tests that need to be run. --> - <target name="suite"> - <property - name="wst-folder" - value="${eclipse-home}/wst_folder" /> - <delete - dir="${wst-folder}" - quiet="true" /> - <ant - target="core-test" - antfile="${library-file}" - dir="${eclipse-home}"> - <property - name="data-dir" - value="${wst-folder}" /> - <property - name="plugin-name" - value="${plugin-name}" /> - <property - name="classname" - value="org.eclipse.wst.sse.core.tests.SSEModelTestSuite" /> - <property - name="plugin-path" - value="${eclipse-home}/plugins/${plugin-name}" /> - </ant> - </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"> - <!--<delete dir="${workspace}" quiet="true" />--> - </target> + <!-- This target defines the tests that need to be run. --> + <target name="suite"> - <!-- 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.eclipse.wst.sse.core.tests.*xml" /> - <property - name="output-file" - value="${plugin-name}.xml" /> - </ant> - <!-- <emailResults resultsFile="${build-results-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com" /> --> - </target> + <ant + target="core-test" + 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.sse.core.tests.SSEModelTestSuite" /> + <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" /> + + </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"> + <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> + <!--<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" + value="${plugin-name}.*xml" /> + <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.ui.tests/test.xml b/tests/org.eclipse.wst.sse.ui.tests/test.xml index 3762379..bf961b9 100644 --- a/tests/org.eclipse.wst.sse.ui.tests/test.xml +++ b/tests/org.eclipse.wst.sse.ui.tests/test.xml
@@ -4,14 +4,14 @@ 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 --> <property name="plugin-name" value="org.eclipse.wst.sse.ui.tests" />
diff --git a/tests/org.eclipse.wst.xml.core.tests/test.xml b/tests/org.eclipse.wst.xml.core.tests/test.xml index bdc6838..874bc35 100644 --- a/tests/org.eclipse.wst.xml.core.tests/test.xml +++ b/tests/org.eclipse.wst.xml.core.tests/test.xml
@@ -1,53 +1,96 @@ -<project name="testsuite" default="run" basedir="."> +<?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}\..\.." /> --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> + <!-- 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 --> - <property name="plugin-name" value="org.eclipse.wst.xml.core.tests" /> - <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> - <property - name="workspace" - value="${eclipse-home}/junitworkspace-${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"> - <delete> - <fileset dir="${eclipse-home}" includes="org.eclipse.wst.xml.core.tests.*xml" /> - </delete> - </target> + <!-- sets the properties plugin-name, and library-file --> + <property + name="plugin-name" + value="org.eclipse.wst.xml.core.tests" /> + <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}" + includes="${plugin-name}.*xml" /> + </delete> + <!-- make directory, in case path doesn't exist yet --> + <mkdir dir="${workspace}" /> + <!-- but delete to make sure fresh contents--> + <delete + dir="${workspace}" + quiet="true" /> - <!-- This target defines the tests that need to be run. --> - <target name="suite"> - <property name="wst-folder" value="${eclipse-home}/wst_folder" /> - <delete dir="${wst-folder}" quiet="true" /> - <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${wst-folder}" /> - <property name="plugin-name" value="${plugin-name}" /> - <property name="classname" value="org.eclipse.wst.xml.core.tests.SSEModelXMLTestSuite" /> - <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}" /> - </ant> - </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"> - <!-- <delete dir="${workspace}" quiet="true" /> --> - </target> + <!-- This target defines the tests that need to be run. --> + <target name="suite"> - <!-- 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.eclipse.wst.xml.core.tests.*xml" /> - <property name="output-file" value="${plugin-name}.xml" /> - </ant> - <!-- <emailResults resultsFile="${build-results-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com" /> --> - </target> + <ant + target="core-test" + 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.core.tests.SSEModelXMLTestSuite" /> + <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" /> + + </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"> + <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> + <!-- <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" + value="${plugin-name}.*xml" /> + <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.tests.encoding/test.xml b/tests/org.eclipse.wst.xml.tests.encoding/test.xml index 6e5a12b..8024f5c 100644 --- a/tests/org.eclipse.wst.xml.tests.encoding/test.xml +++ b/tests/org.eclipse.wst.xml.tests.encoding/test.xml
@@ -1,89 +1,97 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <project - name="testsuite" - default="run" - basedir="."> + 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}\..\.." /> --> - <!-- Configurable Properties --> + <echo message="basedir ${basedir}" /> + <echo message="eclipse place ${eclipse-home}" /> - <!-- 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.wst.xml.tests.encoding" /> + <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}" + includes="${plugin-name}.*xml" /> + </delete> + <!-- make directory, in case path doesn't exist yet --> + <mkdir dir="${workspace}" /> + <!-- but delete to make sure fresh contents--> + <delete + dir="${workspace}" + quiet="true" /> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> + </target> - <!-- sets the properties plugin-name, and library-file --> - <property - name="plugin-name" - value="org.eclipse.wst.xml.tests.encoding" /> - <property - name="library-file" - value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> + <!-- This target defines the tests that need to be run. --> + <target name="suite"> - <!-- 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"> - <delete> - <fileset - dir="${eclipse-home}" - includes="org.eclipse.wst.xml.tests.encoding.*xml" /> - </delete> - </target> + <ant + target="core-test" + 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.tests.encoding.EncodingTestSuite" /> + <property + name="plugin-path" + value="${eclipse-home}/plugins/${plugin-name}" /> + </ant> - <!-- This target defines the tests that need to be run. --> - <target name="suite"> - <property - name="wst-folder" - value="${eclipse-home}/wst_folder" /> - <delete - dir="${wst-folder}" - quiet="true" /> - <ant - target="core-test" - antfile="${library-file}" - dir="${eclipse-home}"> - <property - name="data-dir" - value="${wst-folder}" /> - <property - name="plugin-name" - value="org.eclipse.wst.xml.tests.encoding" /> - <property - name="classname" - value="org.eclipse.wst.xml.tests.encoding.EncodingTestSuite" /> - <property - name="plugin-path" - value="${eclipse-home}/plugins/${plugin-name}" /> - </ant> - </target> + <copy + failonerror="false" + file="${workspace}/.metadata/.log" + tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.log" /> - <!-- 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"> - <!--<delete dir="${workspace}" quiet="true" />--> - </target> + </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.eclipse.wst.xml.tests.encoding.*xml" /> - <property - name="output-file" - value="${plugin-name}.xml" /> - </ant> - <!--<emailResults resultsFile="${build-results-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com" /> --> - </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"> + <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> + <!--<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" + value="${plugin-name}.*xml" /> + <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.ui.tests/test.xml b/tests/org.eclipse.wst.xml.ui.tests/test.xml index e47fef0..f321016 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/test.xml +++ b/tests/org.eclipse.wst.xml.ui.tests/test.xml
@@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <project name="testsuite" @@ -18,33 +18,38 @@ <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}" - includes="org.eclipse.wst.xml.ui.tests.*xml" /> + includes="${plugin-name}.*xml" /> </delete> + <!-- make directory, in case path doesn't exist yet --> + <mkdir dir="${workspace}" /> + <!-- but delete to make sure fresh contents--> + <delete + dir="${workspace}" + quiet="true" /> + </target> <!-- This target defines the tests that need to be run. --> <target name="suite"> - <property - name="wst-folder" - value="${eclipse-home}/wst_folder" /> - <delete - dir="${wst-folder}" - quiet="true" /> + <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}"> <property name="data-dir" - value="${wst-folder}" /> + value="${workspace}" /> <property name="plugin-name" value="${plugin-name}" /> @@ -55,12 +60,19 @@ 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" /> + </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"> + <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> <!-- <delete dir="${workspace}" quiet="true" />--> </target> @@ -75,7 +87,7 @@ dir="${eclipse-home}"> <property name="includes" - value="org.eclipse.wst.xml.ui.tests.*xml" /> + value="${plugin-name}.*xml" /> <property name="output-file" value="${plugin-name}.xml" />
diff --git a/tests/org.eclipse.wst.xml.validation.tests/test.xml b/tests/org.eclipse.wst.xml.validation.tests/test.xml index 795fb1e..73ff17d 100644 --- a/tests/org.eclipse.wst.xml.validation.tests/test.xml +++ b/tests/org.eclipse.wst.xml.validation.tests/test.xml
@@ -1,96 +1,98 @@ -<?xml version="1.0"?> +<?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} --> - <!-- Configurable Properties --> + <echo message="basedir ${basedir}" /> + <echo message="eclipse place ${eclipse-home}" /> - <!-- sets the properties eclipse-home, and library-file --> - <property - name="plugin-name" - value="org.eclipse.wst.xml.validation.tests" /> + <!-- sets the properties plugin-name, and library-file --> + <property + name="plugin-name" + value="org.eclipse.wst.sse.ui.tests" /> + <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}" + includes="${plugin-name}.*xml" /> + </delete> + <!-- make directory, in case path doesn't exist yet --> + <mkdir dir="${workspace}" /> + <!-- but delete to make sure fresh contents--> + <delete + dir="${workspace}" + quiet="true" /> - <!-- End Configurable Properties --> + </target> - <!-- 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}\..\.." /> - <property - name="bvtworkspace" - value="${basedir}" /> - <property - name="library-file" - value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> - <property - name="workspace-folder" - value="${bvtworkspace}/${plugin-name}" /> + <!-- This target defines the tests that need to be run. --> + <target name="suite"> - <!-- 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.eclipse.wst.xml.validation.tests.*.xml" /> - </delete> - </target> + <ant + target="ui-test" + 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.sse.ui.tests.SSEUITestSuite" /> + <property + name="plugin-path" + value="${eclipse-home}/plugins/${plugin-name}" /> + </ant> - <!-- This target defines the tests that need to be run. --> - <target name="suite"> + <copy + failonerror="false" + file="${workspace}/.metadata/.log" + tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.log" /> - <!-- Start with clean data workspace --> - <delete - dir="${workspace-folder}" - quiet="true" /> + </target> - <ant - target="core-test" - antfile="${library-file}" - dir="${eclipse-home}"> - <property - name="data-dir" - value="${workspace-folder}" /> - <property - name="plugin-name" - value="${plugin-name}" /> - <property - name="classname" - value="org.eclipse.wst.xml.validation.tests.internal.AllXMLTests" /> - </ant> + <!-- 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> - </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="${plugin-name}.*xml" /> + <property + name="output-file" + value="${plugin-name}.xml" /> + </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"> - <delete - dir="${workspace-folder}" - 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" - value="org.eclipse.wst.xml.validation.tests*.xml" /> - <property - name="output-file" - value="${plugin-name}.xml" /> - </ant> - </target> - -</project> +</project> \ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/test.xml b/tests/org.eclipse.wst.xsd.validation.tests/test.xml index c5d8fd0..bffbd1f 100644 --- a/tests/org.eclipse.wst.xsd.validation.tests/test.xml +++ b/tests/org.eclipse.wst.xsd.validation.tests/test.xml
@@ -1,34 +1,28 @@ -<?xml version="1.0"?> +<?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} --> - <!-- Configurable Properties --> + <echo message="basedir ${basedir}" /> + <echo message="eclipse place ${eclipse-home}" /> - <!-- sets the properties eclipse-home, and library-file --> + <!-- sets the properties plugin-name, and library-file --> <property name="plugin-name" value="org.eclipse.wst.xsd.validation.tests" /> - <!-- End Configurable Properties --> - - <!-- 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}\..\.." /> - <property - name="bvtworkspace" - value="${basedir}" /> <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> <property - name="workspace-folder" - value="${bvtworkspace}/${plugin-name}" /> - + 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. --> @@ -37,42 +31,51 @@ <delete> <fileset dir="${eclipse-home}" - includes="org.eclipse.wst.xsd.validation.tests.*.xml" /> + includes="${plugin-name}.*xml" /> </delete> + <!-- make directory, in case path doesn't exist yet --> + <mkdir dir="${workspace}" /> + <!-- but delete to make sure fresh contents--> + <delete + dir="${workspace}" + quiet="true" /> + </target> <!-- This target defines the tests that need to be run. --> <target name="suite"> - <!-- Start with clean data workspace --> - <delete - dir="${workspace-folder}" - quiet="true" /> - <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> <property name="data-dir" - value="${workspace-folder}" /> + value="${workspace}" /> <property name="plugin-name" value="${plugin-name}" /> <property name="classname" value="org.eclipse.wst.xsd.validation.tests.internal.AllXSDTests" /> + <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" /> + </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"> - <delete - dir="${workspace-folder}" - quiet="true" /> + <!-- usually no need to delete workspace until next run, and leaving it allows inspection --> + <!--<delete dir="${workspace}" quiet="true"/>--> </target> <!-- This target runs the test suite. Any actions that need to happen --> @@ -86,7 +89,7 @@ dir="${eclipse-home}"> <property name="includes" - value="org.eclipse.wst.xsd.validation.tests*.xml" /> + value="${plugin-name}.*xml" /> <property name="output-file" value="${plugin-name}.xml" />