correct branch root contents
diff --git a/tests/org.eclipse.wst.html.ui.tests/.classpath b/tests/org.eclipse.wst.html.ui.tests/.classpath index ce73933..751c8f2 100644 --- a/tests/org.eclipse.wst.html.ui.tests/.classpath +++ b/tests/org.eclipse.wst.html.ui.tests/.classpath
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath>
diff --git a/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF index e247780..04516c2 100644 --- a/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.html.ui.tests; singleton:=true -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 1.0.0.qualifier Bundle-ClassPath: htmluitests.jar Bundle-Activator: org.eclipse.wst.html.ui.tests.HTMLUITestsPlugin Bundle-Vendor: %Bundle-Vendor.0 @@ -18,10 +18,9 @@ org.eclipse.wst.xml.core, org.eclipse.wst.sse.core, org.eclipse.ui.workbench.texteditor, - org.junit;bundle-version="[3.8.0,4.0.0)", + org.junit, org.eclipse.ui.views, org.eclipse.core.runtime, org.eclipse.core.resources, com.ibm.icu Eclipse-LazyStart: true -Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.html.ui.tests/about.html b/tests/org.eclipse.wst.html.ui.tests/about.html index 73db36e..4ec5989 100644 --- a/tests/org.eclipse.wst.html.ui.tests/about.html +++ b/tests/org.eclipse.wst.html.ui.tests/about.html
@@ -10,7 +10,7 @@ <H3>About This Content</H3> -<P>June 06, 2007</P> +<P>May 2, 2006</P> <H3>License</H3>
diff --git a/tests/org.eclipse.wst.html.ui.tests/build.properties b/tests/org.eclipse.wst.html.ui.tests/build.properties index 5610d30..a23f581 100644 --- a/tests/org.eclipse.wst.html.ui.tests/build.properties +++ b/tests/org.eclipse.wst.html.ui.tests/build.properties
@@ -1,10 +1,10 @@ ############################################################################### -# Copyright (c) 2004, 2006 IBM Corporation and others. +# Copyright (c) 2004 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html -# +# # Contributors: # IBM Corporation - initial API and implementation ###############################################################################
diff --git a/tests/org.eclipse.wst.html.ui.tests/plugin.properties b/tests/org.eclipse.wst.html.ui.tests/plugin.properties index ed966bb..ec61822 100644 --- a/tests/org.eclipse.wst.html.ui.tests/plugin.properties +++ b/tests/org.eclipse.wst.html.ui.tests/plugin.properties
@@ -1,13 +1,3 @@ -############################################################################### -# Copyright (c) 2005, 2006 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### # properties file for org.eclipse.wst.html.ui.tests Bundle-Vendor.0 = Eclipse.org Bundle-Name.0 = Structured Source Editor for HTML Tests
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUIPreferencesTest.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUIPreferencesTest.java index bdad09e..2a662af 100644 --- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUIPreferencesTest.java +++ b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUIPreferencesTest.java
@@ -70,7 +70,7 @@ IPreferenceStore store = HTMLUIPlugin.getDefault().getPreferenceStore(); pluginGetDefaultPreference(store, HTMLUIPreferenceNames.AUTO_PROPOSE, Boolean.toString(true)); - pluginGetDefaultPreference(store, HTMLUIPreferenceNames.AUTO_PROPOSE_CODE, "<="); + pluginGetDefaultPreference(store, HTMLUIPreferenceNames.AUTO_PROPOSE_CODE, "<"); } private void pluginGetDefaultPreference(IPreferenceStore store, String prefKey, String expected) {
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestSuite.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestSuite.java index ad8564f..3353690 100644 --- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestSuite.java +++ b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestSuite.java
@@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. + * Copyright (c) 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -31,4 +31,4 @@ // addTest(new SSEModelTestSuite()); } -} +} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/Logger.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/Logger.java index ddf14df..c5c53ac 100644 --- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/Logger.java +++ b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/Logger.java
@@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. + * Copyright (c) 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -141,4 +141,4 @@ public static void trace(String category, String message) { _trace(category, message, null); } -} +} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/TestEditorConfigurationHTML.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/TestEditorConfigurationHTML.java index 3881762..b3378d4 100644 --- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/TestEditorConfigurationHTML.java +++ b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/TestEditorConfigurationHTML.java
@@ -1,14 +1,15 @@ -/******************************************************************************* +/* * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Common Public License v1.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * http://www.eclipse.org/legal/cpl-v10.html + * * Contributors: * IBM - Initial API and implementation * Jens Lukowski/Innoopract - initial renaming/restructuring - *******************************************************************************/ + * + */ package org.eclipse.wst.html.ui.tests; import junit.framework.TestCase;
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/VerifyEditorPlugin.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/VerifyEditorPlugin.java index 5c7b94b..f3a0bbf 100644 --- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/VerifyEditorPlugin.java +++ b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/VerifyEditorPlugin.java
@@ -1,13 +1,12 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ +/***************************************************************************** + * Copyright (c) 2004 IBM Corporation and others. All rights reserved. This + * program and the accompanying materials are made available under the terms + * of the Eclipse Public License v1.0 which accompanies this distribution, and + * is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: IBM Corporation - initial API and implementation + * + ****************************************************************************/ package org.eclipse.wst.html.ui.tests; import junit.framework.TestCase;
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/TestViewerConfigurationHTML.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/TestViewerConfigurationHTML.java index 2473bad..319721f 100644 --- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/TestViewerConfigurationHTML.java +++ b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/TestViewerConfigurationHTML.java
@@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2005, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ package org.eclipse.wst.html.ui.tests.viewer; import junit.framework.TestCase;
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/ViewerTestHTML.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/ViewerTestHTML.java index 4ab2114..54b9892 100644 --- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/ViewerTestHTML.java +++ b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/ViewerTestHTML.java
@@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. + * Copyright (c) 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -493,4 +493,4 @@ } } -} +} \ 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 2ba6ac2..e1e1f3b 100644 --- a/tests/org.eclipse.wst.html.ui.tests/test.xml +++ b/tests/org.eclipse.wst.html.ui.tests/test.xml
@@ -1,114 +1,87 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0"?> <project - name="testsuite" - default="run" - basedir="."> - - <!-- The following properties should be passed into this script --> - <!-- ${eclipse-home} --> - <!-- ${buildDirectory} --> - <!-- ${buildLabel} --> + 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}\..\.." /> --> - <!-- should be little need to change what's above --> + <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.html.ui.tests" /> - <property - name="classname" - value="org.eclipse.wst.html.ui.tests.HTMLUITestSuite" /> - <property - name="testType" - value="ui-test" /> + <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 --> + <!-- 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.ui.tests.*xml" /> + </delete> + </target> - <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}" /> + <!-- 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}" /> + <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> + </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> - <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" /> - - </target> - - <!-- This target defines the tests that need to be run. --> - <target name="suite"> - - <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="${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}.consolelog.txt" /> - - </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> + <!-- 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.html.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> </project> \ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/.classpath b/tests/org.eclipse.wst.xml.ui.tests/.classpath index e2bdc16..a995846 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/.classpath +++ b/tests/org.eclipse.wst.xml.ui.tests/.classpath
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con"> <accessrules> <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
diff --git a/tests/org.eclipse.wst.xml.ui.tests/.cvsignore b/tests/org.eclipse.wst.xml.ui.tests/.cvsignore index 7c7ccdb..7fb0a7b 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/.cvsignore +++ b/tests/org.eclipse.wst.xml.ui.tests/.cvsignore
@@ -3,4 +3,3 @@ build.xml temp.folder xmluitests.jar -javaCompiler.xmluitests.jar.args
diff --git a/tests/org.eclipse.wst.xml.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.ui.tests/META-INF/MANIFEST.MF index a7b46a6..f7d4f9e 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.xml.ui.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.wst.xml.ui.tests; singleton:=true -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 1.0.0.qualifier Bundle-ClassPath: xmluitests.jar Bundle-Activator: org.eclipse.wst.xml.ui.tests.XMLUITestsPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin -Export-Package: org.eclipse.wst.xml.ui.internal.validation;x-internal:=true, - org.eclipse.wst.xml.ui.tests, +Export-Package: org.eclipse.wst.xml.ui.tests, org.eclipse.wst.xml.ui.tests.breakpoints, org.eclipse.wst.xml.ui.tests.viewer Require-Bundle: org.eclipse.ui, @@ -17,7 +16,7 @@ org.eclipse.wst.sse.ui, org.eclipse.ui.workbench.texteditor, org.eclipse.ui.ide, - org.junit;bundle-version="[3.8.0,4.0.0)", + org.junit, org.eclipse.wst.sse.core, org.eclipse.ui.views, org.eclipse.core.resources, @@ -26,4 +25,3 @@ org.eclipse.wst.validation, com.ibm.icu Eclipse-LazyStart: true -Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.xml.ui.tests/about.html b/tests/org.eclipse.wst.xml.ui.tests/about.html index 73db36e..4ec5989 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/about.html +++ b/tests/org.eclipse.wst.xml.ui.tests/about.html
@@ -10,7 +10,7 @@ <H3>About This Content</H3> -<P>June 06, 2007</P> +<P>May 2, 2006</P> <H3>License</H3>
diff --git a/tests/org.eclipse.wst.xml.ui.tests/build.properties b/tests/org.eclipse.wst.xml.ui.tests/build.properties index 4d50253..15cc63c 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/build.properties +++ b/tests/org.eclipse.wst.xml.ui.tests/build.properties
@@ -1,10 +1,10 @@ ############################################################################### -# Copyright (c) 2004, 2006 IBM Corporation and others. +# Copyright (c) 2004 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html -# +# # Contributors: # IBM Corporation - initial API and implementation ############################################################################### @@ -14,8 +14,7 @@ META-INF/,\ plugin.properties,\ about.html,\ - testresources/,\ - icons/ + testresources/ jars.compile.order = xmluitests.jar source.xmluitests.jar = src/ output.xmluitests.jar = bin/
diff --git a/tests/org.eclipse.wst.xml.ui.tests/plugin.properties b/tests/org.eclipse.wst.xml.ui.tests/plugin.properties index 6053dd5..521f083 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/plugin.properties +++ b/tests/org.eclipse.wst.xml.ui.tests/plugin.properties
@@ -1,10 +1,10 @@ ############################################################################### -# Copyright (c) 2005, 2006 IBM Corporation and others. +# Copyright (c) 2005 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html -# +# # Contributors: # IBM Corporation - initial API and implementation ###############################################################################
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/Logger.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/Logger.java index 2871e3a..b942520 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/Logger.java +++ b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/Logger.java
@@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. + * Copyright (c) 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -141,4 +141,4 @@ public static void trace(String category, String message) { _trace(category, message, null); } -} +} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestEditorConfigurationXML.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestEditorConfigurationXML.java index 259d6aa..6cc9034 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestEditorConfigurationXML.java +++ b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestEditorConfigurationXML.java
@@ -1,14 +1,15 @@ -/******************************************************************************* +/* * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Common Public License v1.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * + * http://www.eclipse.org/legal/cpl-v10.html + * * Contributors: * IBM - Initial API and implementation * Jens Lukowski/Innoopract - initial renaming/restructuring - *******************************************************************************/ + * + */ package org.eclipse.wst.xml.ui.tests; import junit.framework.TestCase;
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestOpenEditorXML.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestOpenEditorXML.java index 4175fde..b88d308 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestOpenEditorXML.java +++ b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestOpenEditorXML.java
@@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2005, 2006 IBM Corporation and others. + * Copyright (c) 2005 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/VerifyEditorPlugin.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/VerifyEditorPlugin.java index f15e411..c697fbe 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/VerifyEditorPlugin.java +++ b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/VerifyEditorPlugin.java
@@ -1,13 +1,12 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ +/***************************************************************************** + * Copyright (c) 2004 IBM Corporation and others. All rights reserved. This + * program and the accompanying materials are made available under the terms + * of the Eclipse Public License v1.0 which accompanies this distribution, and + * is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: IBM Corporation - initial API and implementation + * + ****************************************************************************/ package org.eclipse.wst.xml.ui.tests; import junit.framework.TestCase;
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUIPreferencesTest.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUIPreferencesTest.java index d912c93..068526a 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUIPreferencesTest.java +++ b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUIPreferencesTest.java
@@ -70,7 +70,7 @@ IPreferenceStore store = XMLUIPlugin.getDefault().getPreferenceStore(); pluginGetDefaultPreference(store, XMLUIPreferenceNames.AUTO_PROPOSE, Boolean.toString(true)); - pluginGetDefaultPreference(store, XMLUIPreferenceNames.AUTO_PROPOSE_CODE, "<="); + pluginGetDefaultPreference(store, XMLUIPreferenceNames.AUTO_PROPOSE_CODE, "<"); pluginGetDefaultPreference(store, XMLUIPreferenceNames.USE_INFERRED_GRAMMAR, Boolean.toString(true)); }
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestSuite.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestSuite.java index 7ef45d5..ea626df 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestSuite.java +++ b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestSuite.java
@@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. + * Copyright (c) 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -37,4 +37,4 @@ addTestSuite(TestReconcilerXML.class); addTestSuite(TestSourceValidationFramework.class); } -} +} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/BreakpointErrorProvider.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/BreakpointErrorProvider.java index 91c7bbf..0bfc2d4 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/BreakpointErrorProvider.java +++ b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/BreakpointErrorProvider.java
@@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. + * Copyright (c) 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -61,4 +61,4 @@ public void setSourceEditingTextTools(ISourceEditingTextTools tool) { fTool = tool; } -} +} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/EnableWarningAction.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/EnableWarningAction.java index 46a7f66..9062cce 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/EnableWarningAction.java +++ b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/EnableWarningAction.java
@@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. + * Copyright (c) 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -111,4 +111,4 @@ else setText("Enable Breakpoint Errors"); } -} +} \ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/TestViewerConfigurationXML.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/TestViewerConfigurationXML.java index 3fa89bd..ab3223a 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/TestViewerConfigurationXML.java +++ b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/TestViewerConfigurationXML.java
@@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2005, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ package org.eclipse.wst.xml.ui.tests.viewer; import junit.framework.TestCase;
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/ViewerTestXML.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/ViewerTestXML.java index 3398345..6cd7431 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/ViewerTestXML.java +++ b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/ViewerTestXML.java
@@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. + * Copyright (c) 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -497,4 +497,4 @@ } } -} +} \ 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 d928e35..e47fef0 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/test.xml +++ b/tests/org.eclipse.wst.xml.ui.tests/test.xml
@@ -1,114 +1,85 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0"?> <project - name="testsuite" - default="run" - basedir="."> - - <!-- The following properties should be passed into this script --> - <!-- ${eclipse-home} --> - <!-- ${buildDirectory} --> - <!-- ${buildLabel} --> + 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}\..\.." />--> - <!-- should be little need to change what's above --> + <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.ui.tests" /> - <property - name="classname" - value="org.eclipse.wst.xml.ui.tests.XMLUITestSuite" /> - <property - name="testType" - value="ui-test" /> + <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 --> + <!-- 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.ui.tests.*xml" /> + </delete> + </target> - <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}" /> + <!-- 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}" /> + <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> + </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> - <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" /> - - </target> - - <!-- This target defines the tests that need to be run. --> - <target name="suite"> - - <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="${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}.consolelog.txt" /> - - </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> + <!-- 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.ui.tests.*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.validation.tests/.classpath b/tests/org.eclipse.wst.xml.validation.tests/.classpath index 76c6027..1d8baf7 100644 --- a/tests/org.eclipse.wst.xml.validation.tests/.classpath +++ b/tests/org.eclipse.wst.xml.validation.tests/.classpath
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con"> <accessrules> <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/.cvsignore b/tests/org.eclipse.wst.xml.validation.tests/.cvsignore index 42e94a0..2c9b88d 100644 --- a/tests/org.eclipse.wst.xml.validation.tests/.cvsignore +++ b/tests/org.eclipse.wst.xml.validation.tests/.cvsignore
@@ -2,4 +2,3 @@ temp.folder build.xml validatexmltests.jar -javaCompiler.validatexmltests.jar.args
diff --git a/tests/org.eclipse.wst.xml.validation.tests/about.html b/tests/org.eclipse.wst.xml.validation.tests/about.html index 73db36e..4ec5989 100644 --- a/tests/org.eclipse.wst.xml.validation.tests/about.html +++ b/tests/org.eclipse.wst.xml.validation.tests/about.html
@@ -10,7 +10,7 @@ <H3>About This Content</H3> -<P>June 06, 2007</P> +<P>May 2, 2006</P> <H3>License</H3>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/build.properties b/tests/org.eclipse.wst.xml.validation.tests/build.properties index 70b0b16..4b89c52 100644 --- a/tests/org.eclipse.wst.xml.validation.tests/build.properties +++ b/tests/org.eclipse.wst.xml.validation.tests/build.properties
@@ -1,18 +1,7 @@ -############################################################################### -# Copyright (c) 2005, 2006 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### bin.includes = test.xml,\ testresources/,\ validatexmltests.jar,\ META-INF/,\ - about.html,\ - plugin.properties + about.html source.validatexmltests.jar = src/ bin.excludes = testresources/.cvsignore
diff --git a/tests/org.eclipse.wst.xml.validation.tests/plugin.properties b/tests/org.eclipse.wst.xml.validation.tests/plugin.properties index 83faaf6..65c0568 100644 --- a/tests/org.eclipse.wst.xml.validation.tests/plugin.properties +++ b/tests/org.eclipse.wst.xml.validation.tests/plugin.properties
@@ -1,13 +1,3 @@ -############################################################################### -# Copyright (c) 2005, 2006 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### # properties file for org.eclipse.wst.xml.validation.tests Bundle-Vendor.0 = Eclipse Bundle-Name.0 = XML Validator Tests Plug-in \ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BaseTestCase.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BaseTestCase.java index 1d8c734..9bc17c8 100644 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BaseTestCase.java +++ b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BaseTestCase.java
@@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2001, 2006 IBM Corporation and others. + * Copyright (c) 2001, 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/PathsTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/PathsTest.java index f2390c0..67245f0 100644 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/PathsTest.java +++ b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/PathsTest.java
@@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2001, 2005 IBM Corporation and others. + * Copyright (c) 2001, 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/
diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLExamplesTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLExamplesTest.java index 2511f63..ef6ca86 100644 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLExamplesTest.java +++ b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLExamplesTest.java
@@ -1,10 +1,10 @@ /******************************************************************************* - * Copyright (c) 2001, 2007 IBM Corporation and others. + * Copyright (c) 2001, 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/