diff options
Diffstat (limited to 'tests/org.eclipse.jst.servlet.tests')
21 files changed, 0 insertions, 968 deletions
diff --git a/tests/org.eclipse.jst.servlet.tests/.classpath b/tests/org.eclipse.jst.servlet.tests/.classpath deleted file mode 100644 index 95657eef..00000000 --- a/tests/org.eclipse.jst.servlet.tests/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="webmodule-tomcat-tests"/> - <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.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/tests/org.eclipse.jst.servlet.tests/.cvsignore b/tests/org.eclipse.jst.servlet.tests/.cvsignore deleted file mode 100644 index 3336e347..00000000 --- a/tests/org.eclipse.jst.servlet.tests/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -bin -temp.folder -build.xml -ui.jar -tests.jar diff --git a/tests/org.eclipse.jst.servlet.tests/.project b/tests/org.eclipse.jst.servlet.tests/.project deleted file mode 100644 index 732c1cfb..00000000 --- a/tests/org.eclipse.jst.servlet.tests/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.jst.j2ee.servlet.tests</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/tests/org.eclipse.jst.servlet.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.servlet.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f9abbd12..00000000 --- a/tests/org.eclipse.jst.servlet.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -#Sun Jun 03 01:24:17 EDT 2007 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.compliance=1.4 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.source=1.3 diff --git a/tests/org.eclipse.jst.servlet.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.servlet.tests/META-INF/MANIFEST.MF deleted file mode 100644 index 302e1108..00000000 --- a/tests/org.eclipse.jst.servlet.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,27 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %PLUGIN -Bundle-SymbolicName: org.eclipse.jst.servlet.tests -Bundle-Version: 1.1.201.qualifier -Bundle-ClassPath: tests.jar -Bundle-Activator: org.eclipse.jst.servlet.tests.ServletTestsPlugin -Bundle-Vendor: %Bundle-Vendor.0 -Bundle-Localization: plugin -Export-Package: org.eclipse.jst.servlet.tests, - org.eclipse.jst.servlet.tests.bvt, - org.eclipse.jst.servlet.tomcat.tests -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.core.commands, - org.eclipse.jst.common.frameworks, - org.eclipse.wst.common.frameworks, - org.eclipse.jst.j2ee.core, - org.eclipse.jst.j2ee.web, - org.eclipse.wst.common.tests, - org.junit;bundle-version="[3.8.1,4.0.0)", - org.eclipse.jst.j2ee.tests, - org.eclipse.jst.j2ee, - org.eclipse.wst.server.core, - org.eclipse.wst.common.modulecore, - org.eclipse.wst.common.project.facet.core -Eclipse-LazyStart: true -Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/tests/org.eclipse.jst.servlet.tests/WARImportTests/Example1.war b/tests/org.eclipse.jst.servlet.tests/WARImportTests/Example1.war Binary files differdeleted file mode 100644 index 9c30a383..00000000 --- a/tests/org.eclipse.jst.servlet.tests/WARImportTests/Example1.war +++ /dev/null diff --git a/tests/org.eclipse.jst.servlet.tests/WARImportTests/Test12Web.war b/tests/org.eclipse.jst.servlet.tests/WARImportTests/Test12Web.war Binary files differdeleted file mode 100644 index ba220b13..00000000 --- a/tests/org.eclipse.jst.servlet.tests/WARImportTests/Test12Web.war +++ /dev/null diff --git a/tests/org.eclipse.jst.servlet.tests/WARImportTests/Test13Web.war b/tests/org.eclipse.jst.servlet.tests/WARImportTests/Test13Web.war Binary files differdeleted file mode 100644 index 22aa926e..00000000 --- a/tests/org.eclipse.jst.servlet.tests/WARImportTests/Test13Web.war +++ /dev/null diff --git a/tests/org.eclipse.jst.servlet.tests/WARImportTests/Test14Web.war b/tests/org.eclipse.jst.servlet.tests/WARImportTests/Test14Web.war Binary files differdeleted file mode 100644 index 1eb2a3fb..00000000 --- a/tests/org.eclipse.jst.servlet.tests/WARImportTests/Test14Web.war +++ /dev/null diff --git a/tests/org.eclipse.jst.servlet.tests/WARImportTests/YourCompanyExample.war b/tests/org.eclipse.jst.servlet.tests/WARImportTests/YourCompanyExample.war Binary files differdeleted file mode 100644 index 1c9628c7..00000000 --- a/tests/org.eclipse.jst.servlet.tests/WARImportTests/YourCompanyExample.war +++ /dev/null diff --git a/tests/org.eclipse.jst.servlet.tests/about.html b/tests/org.eclipse.jst.servlet.tests/about.html deleted file mode 100644 index 2199df3f..00000000 --- a/tests/org.eclipse.jst.servlet.tests/about.html +++ /dev/null @@ -1,34 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<HTML> - -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> - -<BODY lang="EN-US"> - -<H3>About This Content</H3> - -<P>June, 2008</P> - -<H3>License</H3> - -<P>The Eclipse Foundation makes available all content in this plug-in -("Content"). Unless otherwise indicated below, the Content is provided to you -under the terms and conditions of the Eclipse Public License Version 1.0 -("EPL"). A copy of the EPL is available at -<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. -For purposes of the EPL, "Program" will mean the Content.</P> - -<P>If you did not receive this Content directly from the Eclipse Foundation, the -Content is being redistributed by another party ("Redistributor") and different -terms and conditions may apply to your use of any object code in the Content. -Check the Redistributor’s license that was provided with the Content. If no such -license exists, contact the Redistributor. Unless otherwise indicated below, the -terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at -<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P> - -</BODY> -</HTML> diff --git a/tests/org.eclipse.jst.servlet.tests/build.properties b/tests/org.eclipse.jst.servlet.tests/build.properties deleted file mode 100644 index 01db2e8a..00000000 --- a/tests/org.eclipse.jst.servlet.tests/build.properties +++ /dev/null @@ -1,18 +0,0 @@ -############################################################################### -# Copyright (c) 2005, 2007 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 -############################################################################### -source.tests.jar = webmodule-tomcat-tests/ -output.tests.jar = bin/ -bin.includes = tests.jar,\ - WARImportTests/,\ - test.xml,\ - about.html,\ - plugin.properties,\ - META-INF/ diff --git a/tests/org.eclipse.jst.servlet.tests/plugin.properties b/tests/org.eclipse.jst.servlet.tests/plugin.properties deleted file mode 100644 index 707f21aa..00000000 --- a/tests/org.eclipse.jst.servlet.tests/plugin.properties +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################### -# Copyright (c) 2003, 2007 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 -############################################################################### - -PLUGIN=org.eclipse.jst.servlet.tests -Bundle-Vendor.0 = Eclipse.org diff --git a/tests/org.eclipse.jst.servlet.tests/test.xml b/tests/org.eclipse.jst.servlet.tests/test.xml deleted file mode 100644 index cbbb98f5..00000000 --- a/tests/org.eclipse.jst.servlet.tests/test.xml +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0"?> - -<project name="testsuite" default="run" basedir="."> - <!-- The property ${eclipse-home} should be passed into this script --> - <!-- Set a meaningful default value for when it is not. --> - <!-- <property name="eclipse-home" value="${basedir}\..\.."/> --> - <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.servlet.tests"/> - <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/> - <property name="extraVMargs" value="-Dorg.eclipse.jst.server.tomcat.50=${testDir}/${tomcat50Dir}"/> - - <!-- This target holds all initialization code that needs to be done for --> - <!-- all tests that are to be run. Initialization for individual tests --> - <!-- should be done within the body of the suite target. --> - <target name="init"> - <tstamp/> - <delete> - <fileset dir="${eclipse-home}" includes="org*.xml"/> - </delete> - </target> - - <!-- This target defines the tests that need to be run. --> - <target name="suite"> - <property name="jst-folder" value="${eclipse-home}/jst_folder"/> - <delete dir="${jst-folder}" quiet="true"/> - <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${jst-folder}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.jst.servlet.tests.bvt.AutomatedBVT" /> - <property name="extraVMargs" value="${extraVMargs}"/> - </ant> - </target> - - <!-- This target holds code to cleanup the testing environment after --> - <!-- after all of the tests have been run. You can use this target to --> - <!-- delete temporary files that have been created. --> - <target name="cleanup"> - </target> - - <!-- This target runs the test suite. Any actions that need to happen --> - <!-- after all the tests have been run should go here. --> - <target name="run" depends="init,suite,cleanup"> - <ant target="collect" antfile="${library-file}" dir="${eclipse-home}"> - <property name="includes" value="org*.xml"/> - <property name="output-file" value="${plugin-name}.xml"/> - </ant> - </target> -</project>
\ No newline at end of file diff --git a/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tests/ServletTestsPlugin.java b/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tests/ServletTestsPlugin.java deleted file mode 100644 index 34b2a7a2..00000000 --- a/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tests/ServletTestsPlugin.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.eclipse.jst.servlet.tests; - -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -import org.eclipse.core.runtime.Plugin; -import org.osgi.framework.BundleContext; - -/** - * The main plugin class to be used in the desktop. - */ -public class ServletTestsPlugin extends Plugin { - //The shared instance. - private static ServletTestsPlugin plugin; - //Resource bundle. - private ResourceBundle resourceBundle; - - /** - * The constructor. - */ - public ServletTestsPlugin() { - super(); - plugin = this; - } - - /** - * This method is called upon plug-in activation - */ - public void start(BundleContext context) throws Exception { - super.start(context); - } - - /** - * This method is called when the plug-in is stopped - */ - public void stop(BundleContext context) throws Exception { - super.stop(context); - plugin = null; - resourceBundle = null; - } - - /** - * Returns the shared instance. - */ - public static ServletTestsPlugin getDefault() { - return plugin; - } - - /** - * Returns the string from the plugin's resource bundle, - * or 'key' if not found. - */ - public static String getResourceString(String key) { - ResourceBundle bundle = ServletTestsPlugin.getDefault().getResourceBundle(); - try { - return (bundle != null) ? bundle.getString(key) : key; - } catch (MissingResourceException e) { - return key; - } - } - - /** - * Returns the plugin's resource bundle, - */ - public ResourceBundle getResourceBundle() { - try { - if (resourceBundle == null) - resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.servlet.tests.ServletTestsPluginResources"); //$NON-NLS-1$ - } catch (MissingResourceException x) { - resourceBundle = null; - } - return resourceBundle; - } -} diff --git a/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tests/bvt/AutomatedBVT.java b/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tests/bvt/AutomatedBVT.java deleted file mode 100644 index 69b2b28b..00000000 --- a/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tests/bvt/AutomatedBVT.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Created on Apr 1, 2003 - * - * To change this generated comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ -package org.eclipse.jst.servlet.tests.bvt; - -import java.net.URL; - -import junit.framework.Test; -import junit.framework.TestSuite; -import junit.textui.TestRunner; - -import org.eclipse.core.runtime.Platform; - - -/** - * @author jsholl - * - * To change this generated comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ -public class AutomatedBVT extends TestSuite { - - public static String baseDirectory = System.getProperty("user.dir") + java.io.File.separatorChar + "WARImportTests" + java.io.File.separatorChar; //$NON-NLS-1$ //$NON-NLS-2$ - - static { - try { - URL url = Platform.getBundle("org.eclipse.jst.servlet.tests").getEntry("/"); //$NON-NLS-1$ //$NON-NLS-2$ - AutomatedBVT.baseDirectory = Platform.asLocalURL(url).getFile() + "TestData"+ java.io.File.separatorChar; //$NON-NLS-1$ - } catch (Exception e) { - System.err.println("Using working directory since a workspace URL could not be located."); //$NON-NLS-1$ - } - } - - public static int unimplementedMethods; - - public static void main(String[] args) { - unimplementedMethods = 0; - TestRunner.run(suite()); - if (unimplementedMethods > 0) { - System.out.println("\nCalls to warnUnimpl: " + unimplementedMethods); //$NON-NLS-1$ - } - } - - public AutomatedBVT() { - super(); - TestSuite suite = (TestSuite) AutomatedBVT.suite(); - for (int i = 0; i < suite.testCount(); i++) { - addTest(suite.testAt(i)); - } - } - - public static Test suite() { - TestSuite suite = new TestSuite("Test for org.eclipse.jst.servlet.tests.bvt"); //$NON-NLS-1$ - //suite.addTest(AllTomcatTests.suite()); - return suite; - } -} diff --git a/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tests/bvt/AutomatedBVTEclipse.java b/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tests/bvt/AutomatedBVTEclipse.java deleted file mode 100644 index 464fbb4a..00000000 --- a/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tests/bvt/AutomatedBVTEclipse.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Created on Mar 25, 2004 - * - * To change the template for this generated file go to - * Window - Preferences - Java - Code Generation - Code and Comments - */ -package org.eclipse.jst.servlet.tests.bvt; - -import java.io.IOException; -import java.net.URL; - -import org.eclipse.core.runtime.Platform; - -/** - * @author jsholl - * - * To change the template for this generated type comment go to - * Window - Preferences - Java - Code Generation - Code and Comments - */ -public class AutomatedBVTEclipse extends AutomatedBVT { - - public AutomatedBVTEclipse(){ - super(); - URL url = Platform.getBundle("org.eclipse.jst.servlet.tests").getEntry("/"); //$NON-NLS-1$ //$NON-NLS-2$ - try { - AutomatedBVT.baseDirectory = Platform.asLocalURL(url).getFile() + "WARImportTests"+ java.io.File.separatorChar; //$NON-NLS-1$ - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } -} diff --git a/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tomcat/tests/AllTomcatTests.java b/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tomcat/tests/AllTomcatTests.java deleted file mode 100644 index 948e35e5..00000000 --- a/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tomcat/tests/AllTomcatTests.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Created on Feb 2, 2004 - * - * To change the template for this generated file go to - * Window - Preferences - Java - Code Generation - Code and Comments - */ -package org.eclipse.jst.servlet.tomcat.tests; -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.core.runtime.Path; -import org.eclipse.wst.server.core.IRuntime; -import org.eclipse.wst.server.core.IRuntimeType; -import org.eclipse.wst.server.core.IRuntimeWorkingCopy; -import org.eclipse.wst.server.core.ServerCore; - -/** - * @author jsholl - * - * To change the template for this generated type comment go to - * Window - Preferences - Java - Code Generation - Code and Comments - */ -public class AllTomcatTests extends TestSuite { - - public static IRuntime TOMCAT_RUNTIME = createRuntime(); - - public static Test suite(){ - return new AllTomcatTests(); - } - - public AllTomcatTests(){ - super("WEB Tests"); //$NON-NLS-1$ - addTest(WebProjectCreationTomcatTest.suite()); - addTest(WebImportOperationTomcatTest.suite()); - addTest(WebExportOperationTomcatTest.suite()); - - } - - public static IRuntime createRuntime() { - String s = System.getProperty("org.eclipse.jst.server.tomcat.50"); //$NON-NLS-1$ - - if (s == null || s.length() == 0) - return null; - try { - IRuntimeType rt = ServerCore.findRuntimeType("org.eclipse.jst.server.tomcat.runtime.50"); //$NON-NLS-1$ - IRuntimeWorkingCopy wc = rt.createRuntime(null, null); - wc.setLocation(new Path(s)); - return wc.save(true, null); - } catch (Exception e) { - e.printStackTrace(); - return null; - } - } - -} diff --git a/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tomcat/tests/WebExportOperationTomcatTest.java b/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tomcat/tests/WebExportOperationTomcatTest.java deleted file mode 100644 index 589d986d..00000000 --- a/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tomcat/tests/WebExportOperationTomcatTest.java +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Created on Jan 6, 2004 - * - * To change the template for this generated file go to - * Window - Preferences - Java - Code Generation - Code and Comments - */ -package org.eclipse.jst.servlet.tomcat.tests; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import junit.framework.Test; - -import org.eclipse.core.resources.IProject; -import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentExportDataModelProvider; -import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; -import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentExportDataModelProvider; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; -import org.eclipse.wst.common.frameworks.datamodel.IDataModel; -import org.eclipse.wst.common.tests.ProjectUtility; -import org.eclipse.wst.common.tests.SimpleTestSuite; -import org.eclipse.wtp.j2ee.headless.tests.j2ee.operations.ModuleExportOperationTest; -import org.eclipse.wtp.j2ee.headless.tests.j2ee.operations.ModuleImportOperationTest; - -/** - * @author Administrator - * - * To change the template for this generated type comment go to Window - Preferences - Java - Code - * Generation - Code and Comments - */ -public class WebExportOperationTomcatTest extends ModuleExportOperationTest { - - protected boolean excludeCompileJsp = false; - protected boolean exportSourceFiles = false; - protected boolean overwriteExisting = false; - protected boolean dataModelShouldBeValid = true; - - public WebExportOperationTomcatTest(String name) { - super(name); - } - - public static Test suite() { - return new SimpleTestSuite(WebExportOperationTomcatTest.class); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.wtp.j2ee.headless.tests.j2ee.operations.OperationTestCase#setUp() - */ - protected void setUp() throws Exception { - super.setUp(); - excludeCompileJsp = false; - } - - public void testExcludeCompileJspOn() throws Exception { - excludeCompileJsp = true; - testAllExportTestCases(); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.wtp.j2ee.headless.tests.j2ee.operations.ModuleExportOperationTestCase#getModelInstance() - */ - protected IDataModel getModelInstance() { - return DataModelFactory.createDataModel(new WebComponentExportDataModelProvider()); - } - protected IProject[] getExportableProjects() throws Exception { - - deleteAllProjects(); - WebImportOperationTomcatTest importTestCase = (WebImportOperationTomcatTest)getImportTestCase(); - importTestCase.testAllImportTestCases(); - - // if the projects aren't created successfully, the previous - // line will fail so there's no need to verify - IProject[] projs = ProjectUtility.getAllProjects(); - - List filteredProjs = new ArrayList(); - for (int i = 0; i < projs.length; i++) { - IProject project = projs[i]; - if (J2EEProjectUtilities.isDynamicWebProject(project)) - filteredProjs.add(project); - } - return (IProject[]) filteredProjs.toArray(new IProject[filteredProjs.size()]); - - } - - public void testAllExportTestCases() throws Exception { - - File exportDirectory = new File(BASE_DATA_DIR); - if (exportDirectory.isDirectory()) { - File[] contents = exportDirectory.listFiles(); - for (int i = 0; i < contents.length; i++) { - if (!contents[i].isDirectory()) - contents[i].delete(); - } - } - IProject[] projects = getExportableProjects(); - for (int i = 0; i < projects.length; i++) { - testExport(ComponentCore.createComponent(projects[i]), getFileName(projects[i].getName())); - } - } - - public String getFileName(String baseName) { - StringBuffer result = new StringBuffer(baseName); - result.append((exportSourceFiles) ? "_withSource" : "_withoutSource").append(getModuleExtension()); - return result.toString(); - } - - public void testExport(IVirtualComponent component, String filename) throws Exception { - IDataModel dataModel = getModelInstance(); - dataModel.setProperty(J2EEComponentExportDataModelProvider.ARCHIVE_DESTINATION, BASE_DATA_DIR + filename); - dataModel.setProperty(J2EEComponentExportDataModelProvider.COMPONENT, component); - dataModel.setBooleanProperty(J2EEComponentExportDataModelProvider.EXPORT_SOURCE_FILES, exportSourceFiles); - dataModel.setBooleanProperty(J2EEComponentExportDataModelProvider.OVERWRITE_EXISTING, overwriteExisting); - - if (dataModelShouldBeValid) - runAndVerify(dataModel); - else - verifyInvalidDataModel(dataModel); - } - - - /* - * (non-Javadoc) - * - * @see org.eclipse.wtp.j2ee.headless.tests.j2ee.operations.ModuleExportOperationTestCase#getImportTestCase() - */ - protected ModuleImportOperationTest getImportTestCase() { - return new WebImportOperationTomcatTest(""); //$NON-NLS-1$ - } - - - protected void addJavaFilesToProject(String projectName, - String[] classNames, String prackageName) throws Exception { - // TODO Auto-generated method stub - - } - - protected void verifyJavaFilesExported(String archivePath, - String[] classNames, String packageName, boolean withClassFiles, - boolean withSource) throws Exception { - // TODO Auto-generated method stub - - } - - protected IDataModel getExportDataModel(String projectName, - String destination, boolean exportSource, boolean runBuild, - boolean overwriteExisting) { - // TODO Auto-generated method stub - return null; - } - - protected String getModuleExtension() { - return ".war";//$NON-NLS-1$ - } -} diff --git a/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tomcat/tests/WebImportOperationTomcatTest.java b/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tomcat/tests/WebImportOperationTomcatTest.java deleted file mode 100644 index cd81c15d..00000000 --- a/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tomcat/tests/WebImportOperationTomcatTest.java +++ /dev/null @@ -1,177 +0,0 @@ -/* - * Created on Jan 6, 2004 - * - * To change the template for this generated file go to - * Window - Preferences - Java - Code Generation - Code and Comments - */ -package org.eclipse.jst.servlet.tomcat.tests; - -import java.io.File; -import java.util.List; - -import junit.framework.Test; - -import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties; -import org.eclipse.jst.j2ee.internal.archive.operations.IOverwriteHandler; -import org.eclipse.wst.common.frameworks.datamodel.IDataModel; -import org.eclipse.wst.common.tests.ProjectUtility; -import org.eclipse.wst.common.tests.SimpleTestSuite; -import org.eclipse.wtp.j2ee.headless.tests.j2ee.operations.ModuleImportOperationTest; -import org.eclipse.wtp.j2ee.headless.tests.plugin.HeadlessTestsPlugin; - -/** - * @author Administrator - * - * To change the template for this generated type comment go to Window - Preferences - Java - Code - * Generation - Code and Comments - */ -public class WebImportOperationTomcatTest extends ModuleImportOperationTest { - - private static final String TESTS_PATH = System.getProperty("user.dir") + java.io.File.separatorChar + "TestData" + java.io.File.separatorChar + "WARImportTests"; - protected boolean dataModelShouldBeValid = true; - - public WebImportOperationTomcatTest() { - super("WebImportOperationTomcatTests"); - } - - public WebImportOperationTomcatTest(String name) { - super(name); - } - - public static Test suite() { - return new SimpleTestSuite(WebImportOperationTomcatTest.class); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.wtp.j2ee.headless.tests.j2ee.operations.ModuleImportOperationTestCase#getModelInstance() - */ - protected IDataModel getModelInstance() { - return null; // new WebModuleImportDataModel(); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.wtp.j2ee.headless.tests.j2ee.operations.ModuleImportOperationTestCase#getImportableArchiveFileNames() - */ - protected List getImportableArchiveFileNames() { - return ProjectUtility.getWarsInDirectory(HeadlessTestsPlugin.getDefault(), TESTS_PATH); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.wtp.j2ee.headless.tests.j2ee.operations.ModuleImportOperationTestCase#setServerTargetProperty(org.eclipse.jst.j2ee.application.operations.J2EEModuleImportDataModel) - */ - public void setServerTargetProperty(IDataModel dataModel) { - // dataModel.setProperty(ServerTargetDataModel.RUNTIME_TARGET_ID,AllTomcatTests.TOMCAT_RUNTIME.getId()); - } - - public void testAllImportTestCases() throws Exception { - - List projects = getImportableArchiveFileNames(); - for (int i = 0; i < projects.size(); i++) { - String jarName = projects.get(i).toString(); - String projectName = jarName.substring(jarName.lastIndexOf(File.separator) + 1, jarName.length() - 4); - testImport(projectName, jarName); - } - } - - public void testImportTestCase_0() throws Exception { - importIndex(0); - } - - public void testImportTestCase_1() throws Exception { - importIndex(1); - } - - public void testImportTestCase_2() throws Exception { - importIndex(2); - } - - public void testImportTestCase_3() throws Exception { - importIndex(3); - } - - public void testImportTestCase_4() throws Exception { - importIndex(4); - } - - public void testImportTestCase_5() throws Exception { - importIndex(5); - } - - public void testImportTestCase_6() throws Exception { - importIndex(6); - } - - public void testImportTestCase_7() throws Exception { - importIndex(7); - } - - public void testImportTestCase_8() throws Exception { - importIndex(8); - } - - public void testImportTestCase_9() throws Exception { - importIndex(9); - } - - private void importIndex(int index) throws Exception { - List projects = getImportableArchiveFileNames(); - if (index < projects.size()) { - String jarName = projects.get(index).toString(); - String projectName = jarName.substring(jarName.lastIndexOf(File.separator) + 1, jarName.length() - 4); - testImport(projectName, jarName); - } - } - - public void testImportTestCase_rest() throws Exception { - List projects = getImportableArchiveFileNames(); - for (int i = 10; i < projects.size(); i++) { - String jarName = projects.get(i).toString(); - String projectName = jarName.substring(jarName.lastIndexOf(File.separator) + 1, jarName.length() - 4); - testImport(projectName, jarName); - } - } - - public void testImport(String projectName, String filename) throws Exception { - IDataModel dataModel = getModelInstance(); - dataModel.setProperty(IJ2EEComponentImportDataModelProperties.FILE_NAME, filename); - dataModel.setProperty(IJ2EEComponentImportDataModelProperties.PROJECT_NAME, projectName); - if (dataModelShouldBeValid) - runAndVerify(dataModel); - else - verifyInvalidDataModel(dataModel); - } - - public void testBadFileName() throws Exception { - - dataModelShouldBeValid = false; - testImport("BobTheProject", "BobTheFile"); - } - - protected IDataModel getExportDataModel(String projectName, - String destination, boolean exportSource, boolean runBuild, - boolean overwriteExisting) { - - // TODO Auto-generated method stub - return null; - } - - protected IDataModel getImportDataModel(String filePath, - String projectName, IOverwriteHandler overwriteHandler, - IDataModel creationModel, boolean closeArchiveOnDispose) { - - // TODO Auto-generated method stub - return null; - } - - protected String getModuleExtension() { - // TODO Auto-generated method stub - return null; - } - -} diff --git a/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tomcat/tests/WebProjectCreationTomcatTest.java b/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tomcat/tests/WebProjectCreationTomcatTest.java deleted file mode 100644 index 42eb4cf5..00000000 --- a/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tomcat/tests/WebProjectCreationTomcatTest.java +++ /dev/null @@ -1,220 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2007 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 - *******************************************************************************/ -/* - * Created on Jan 6, 2004 - * - * To change the template for this generated file go to - * Window - Preferences - Java - Code Generation - Code and Comments - */ -package org.eclipse.jst.servlet.tomcat.tests; - -import junit.framework.Test; -import junit.framework.TestCase; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel; -import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; -import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties; -import org.eclipse.jst.j2ee.internal.web.archive.operations.WebFacetProjectCreationDataModelProvider; -import org.eclipse.jst.j2ee.internal.web.operations.AddServletOperation; -import org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties; -import org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModelProvider; -import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties; -import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties; -import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties; -import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap; -import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties; -import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; -import org.eclipse.wst.common.frameworks.datamodel.IDataModel; -import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation; -import org.eclipse.wst.common.tests.LogUtility; -import org.eclipse.wst.common.tests.ProjectUtility; -import org.eclipse.wst.common.tests.SimpleTestSuite; -import org.eclipse.wst.common.tests.TaskViewUtility; - -/** - * @author blancett - * - * To change the template for this generated type comment go to Window - - * Preferences - Java - Code Generation - Code and Comments - */ -public class WebProjectCreationTomcatTest extends TestCase { - - public void createSimpleProject(String projectName) throws Exception { - IDataModel dataModel = DataModelFactory.createDataModel(new WebFacetProjectCreationDataModelProvider()); - dataModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName); - setServerTargetProperty(dataModel); - dataModel.getDefaultOperation().execute(new NullProgressMonitor(), null); - } - - /** - * @param dataModel - */ - public void setServerTargetProperty(IDataModel dataModel) { - dataModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, AllTomcatTests.TOMCAT_RUNTIME.getId()); - } - - public static void createServlet(IDataModel model) throws Exception { - AddServletOperation op = new AddServletOperation(model); - op.execute(null,null); - ProjectUtility.verifyProject(op.getTargetProject().getName(), true); - TaskViewUtility.verifyNoErrors(); - } - - public IDataModel setupStandaloneWebProject(String projectName, int j2eeVersion) throws Exception { - createSimpleProject(projectName); - IDataModel model = getWebComponentCreationDataModel(projectName, j2eeVersion); - createStandaloneWebProject(model); - createServlet(projectName); - return model; - } - - public IDataModel setupStandaloneAnnotatedWebProject(String projectName, int j2eeVersion) throws Exception { - createSimpleProject(projectName); - - IDataModel model = getWebComponentCreationDataModel(projectName, j2eeVersion); - createStandaloneWebProject(model); - createAnnotatedServlet(projectName); - return model; - } - - public static void createStandaloneWebProject(IDataModel model) throws Exception { - IDataModelOperation webOp = model.getDefaultOperation(); - webOp.execute(new NullProgressMonitor(), null); - // ProjectUtility.verifyProject(model.getTargetProject().getName(), - // true); - TaskViewUtility.verifyNoErrors(); - } - - private IDataModel getWebComponentCreationDataModel(String projectName, int j2eeVersion) { - IProject javaProject = ProjectUtility.getProject(projectName); - String moduleName = projectName + "WebModule"; //$NON-NLS-1$ - String moduleDeployName = moduleName + ".war"; //$NON-NLS-1$ - IDataModel model = DataModelFactory.createDataModel(IWebFacetInstallDataModelProperties.class); - model.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, javaProject.getName()); - FacetDataModelMap map = (FacetDataModelMap) model.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP); - IDataModel webModel = map.getFacetDataModel(IWebFacetInstallDataModelProperties.DYNAMIC_WEB); - webModel.setIntProperty(IFacetDataModelProperties.FACET_VERSION,j2eeVersion); - return model; - } - - /** - * @throws Exception - */ - private void createServlet(String projectName) throws Exception { - IDataModel servletModel = setupServletCreationDataModel(projectName, false); - createServlet(servletModel); - } - - /** - * @throws Exception - */ - private void createAnnotatedServlet(String projectName) throws Exception { - IDataModel servletModel = setupServletCreationDataModel(projectName, true); - createServlet(servletModel); - } - - public IDataModel setupServletCreationDataModel(String projectName, boolean isAnnotated) { - IDataModel servletDataModel = DataModelFactory.createDataModel(NewServletClassDataModelProvider.class); - servletDataModel.setProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME, projectName); - servletDataModel.setProperty(IArtifactEditOperationDataModelProperties.COMPONENT_NAME, projectName); - servletDataModel.setProperty(INewJavaClassDataModelProperties.CLASS_NAME, "FooServlet"); //$NON-NLS-1$ - servletDataModel.setProperty(INewServletClassDataModelProperties.DISPLAY_NAME, "FooServlet"); //$NON-NLS-1$ - servletDataModel.setBooleanProperty(IAnnotationsDataModel.USE_ANNOTATIONS, isAnnotated); - return servletDataModel; - } - - public void createVaildProjectAndServletCreation(String projectName, int j2eeVersion) throws Exception { - LogUtility.getInstance().resetLogging(); - IDataModel model = null; - model = setupStandaloneWebProject(projectName, j2eeVersion); - LogUtility.getInstance().verifyNoWarnings(); - checkValidDataModel(model); - } - - public void createVaildAnnotatedProjectAndServletCreation(String projectName, int j2eeVersion) throws Exception { - LogUtility.getInstance().resetLogging(); - IDataModel model = null; - model = setupStandaloneAnnotatedWebProject(projectName, j2eeVersion); - LogUtility.getInstance().verifyNoWarnings(); - checkValidDataModel(model); - } - - /** - * @param model - */ - protected void checkValidDataModel(IDataModel model) { - // DataModelVerifier verifier = - // DataModelVerifierFactory.getInstance().createVerifier(model); - // try { - // verifier.verify(model); - // } catch (Exception e) { - // // TODO Auto-generated catch block - // e.printStackTrace(); - // } - - } - - public void testVaild12WebProjectNameCreation() throws Exception { - ProjectUtility.deleteAllProjects(); - createVaildProjectAndServletCreation("FooTomcatWebProject12", J2EEVersionConstants.WEB_2_2_ID); //$NON-NLS-1$ - } - - /* - * TODO Uncomment this method when Annotation support for servlets is - * enabled public void testVaild12AnnotatedWebProjectNameCreation() throws - * Exception { ProjectUtility.deleteAllProjects(); - * createVaildAnnotatedProjectAndServletCreation("FooAnnotatedTomcatWebProject12", - * J2EEVersionConstants.WEB_2_2_ID); } - */ - - public void testVaild13WebProjectNameCreation() throws Exception { - ProjectUtility.deleteAllProjects(); - createVaildProjectAndServletCreation("Foo1TomcatWebProject13", J2EEVersionConstants.WEB_2_3_ID); //$NON-NLS-1$ - } - - /* - * TODO Uncomment this method when Annotation support for servlets is - * enabled public void testVaild13AnnotatedWebProjectNameCreation() throws - * Exception { ProjectUtility.deleteAllProjects(); - * createVaildAnnotatedProjectAndServletCreation("Foo1TomcatWebProject13", - * J2EEVersionConstants.WEB_2_3_ID); } - */ - - public void testVaild14WebProjectNameCreation() throws Exception { - ProjectUtility.deleteAllProjects(); - createVaildProjectAndServletCreation("Foo1TomcatWebProject14", J2EEVersionConstants.WEB_2_4_ID); //$NON-NLS-1$ - } - - /* - * TODO Uncomment this method when Annotation support for servlets is - * enabled public void testVaild14AnnotatedWebProjectNameCreation() throws - * Exception { ProjectUtility.deleteAllProjects(); - * createVaildAnnotatedProjectAndServletCreation("Foo1TomcatWebProject14", - * J2EEVersionConstants.WEB_2_4_ID); } - */ - - public static Test suite() { - return new SimpleTestSuite(WebProjectCreationTomcatTest.class); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.wtp.j2ee.headless.tests.j2ee.operations.ModuleProjectCreationOperationTest#getProjectCreationDataModel() - */ - public IDataModel getProjectCreationDataModel() { - // TODO Auto-generated method stub - return null; - } - -} |