This commit was manufactured by cvs2svn to create tag 'v20051129'.
diff --git a/tests/org.eclipse.jst.server.generic.tests/.classpath b/tests/org.eclipse.jst.server.generic.tests/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <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.jst.server.generic.tests/.cvsignore b/tests/org.eclipse.jst.server.generic.tests/.cvsignore
deleted file mode 100644
index 518fe8f..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-genericServerTests.jar
-genericServerTestssrc.zip
diff --git a/tests/org.eclipse.jst.server.generic.tests/.project b/tests/org.eclipse.jst.server.generic.tests/.project
deleted file mode 100644
index 5ceacf5..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.server.generic.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.server.generic.tests/about.html b/tests/org.eclipse.jst.server.generic.tests/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.generic.tests/build.properties b/tests/org.eclipse.jst.server.generic.tests/build.properties
deleted file mode 100644
index 1b4fb44..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.genericServerTests.jar = src/
-output.genericServerTests.jar = bin/
-bin.includes = plugin.xml,\
- test.xml,\
- genericServerTests.jar,\
- about.html
-src.includes = test.xml,\
- plugin.xml,\
- build.properties
-
diff --git a/tests/org.eclipse.jst.server.generic.tests/plugin.xml b/tests/org.eclipse.jst.server.generic.tests/plugin.xml
deleted file mode 100644
index 7895b50..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/plugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.jst.server.generic.tests"
- name="Generic Server Tests Plug-in"
- version="1.0.0"
- provider-name="eclipse.org"
- class="org.eclipse.jst.server.generic.tests.TestsPlugin">
-
- <runtime>
- <library name="genericServerTests.jar">
- <export name="*"/>
- </library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.jst.server.generic.core"/>
- <import plugin="org.eclipse.jst.server.generic.ui"/>
- <import plugin="org.junit"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.jdt.core"/>
- <import plugin="org.eclipse.jdt.launching"/>
- <import plugin="org.eclipse.wst.server.core"/>
- <import plugin="org.eclipse.debug.core"/>
- <import plugin="org.eclipse.jst.server.core"/>
- </requires>
-
-</plugin>
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/AllGenericServerTests.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/AllGenericServerTests.java
deleted file mode 100644
index 5b86ad5..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/AllGenericServerTests.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * 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/cpl-v10.html
- *
- * Contributors:
- * Naci M. Dai - initial API and implementation
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllGenericServerTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite(
- "Test for org.eclipse.jst.server.generic.tests");
- //$JUnit-BEGIN$
- suite.addTestSuite(ServerDefinitionTypeTest.class);
- suite.addTestSuite(GenericServerClasspathRuntimeHandlerTest.class);
- suite.addTestSuite(PluginIntegrityTest.class);
- suite.addTestSuite(ServerCreationTest.class);
- suite.addTestSuite(ServerTypeDefinitionModelTest.class);
- //$JUnit-END$
- return suite;
- }
-}
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/GenericServerClasspathRuntimeHandlerTest.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/GenericServerClasspathRuntimeHandlerTest.java
deleted file mode 100644
index 3574bcf..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/GenericServerClasspathRuntimeHandlerTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Created on Dec 11, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.server.generic.tests;
-
-import java.util.HashMap;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jst.server.generic.core.internal.GenericServerRuntime;
-import org.eclipse.jst.server.generic.core.internal.GenericServerRuntimeTargetHandler;
-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;
-
-import junit.framework.TestCase;
-
-/**
- *
- *
- * @author Gorkem Ercan
- */
-public class GenericServerClasspathRuntimeHandlerTest extends TestCase {
-
- private static final String SERVER_ROOT = "/dev/java/appservers/JOnAS-4.1.4";
- private static final String SERVER_DEF_NAME = "JOnAS 4.x";
- private IRuntime fRuntime;
- /*
- * @see TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
- IRuntimeType type =ServerCore.findRuntimeType("org.eclipse.jst.server.generic.runtime.jonas4");
- IRuntimeWorkingCopy wc = type.createRuntime("testRuntime",null);
- GenericServerRuntime delegate = (GenericServerRuntime)wc.loadAdapter(GenericServerRuntime.class, new NullProgressMonitor());
- HashMap props = new HashMap();
- props.put("mappernames", "");
- props.put("classPathVariableName", "JONAS");
- props.put("serverAddress", "127.0.0.1");
- props.put("jonasBase", SERVER_ROOT);
- props.put("jonasRoot", SERVER_ROOT);
- props.put("protocols", "jrmp");
- props.put("port", "9000");
- delegate.setServerInstanceProperties(props);
- delegate.setServerDefinitionId(SERVER_DEF_NAME);
- wc.save(false,null);
-
- fRuntime = wc.getOriginal();
- }
-
- /**
- * Constructor for ClasspathRuntimeHandlerTest.
- * @param name
- */
- public GenericServerClasspathRuntimeHandlerTest(String name) {
- super(name);
- }
-
- public void testGetClasspathContainerLabel() {
- GenericServerRuntimeTargetHandler handler = new GenericServerRuntimeTargetHandler();
- String name = handler.getClasspathContainerLabel(fRuntime,null);
- assertEquals(SERVER_DEF_NAME,name);
- }
-
- public void testResolveClasspathContainer() {
- GenericServerRuntimeTargetHandler handler = new GenericServerRuntimeTargetHandler();
- IClasspathEntry[] entries = handler.resolveClasspathContainer(fRuntime,null);
- assertNotNull("Failed to resolve classpath entries",entries);
- for (int i = 0; i < entries.length; i++) {
- assertTrue("the resolved classpath entry does not start with classpath prefix",(new org.eclipse.core.runtime.Path(SERVER_ROOT)).isPrefixOf(entries[i].getPath()));
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/PluginIntegrityTest.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/PluginIntegrityTest.java
deleted file mode 100644
index 1ade2d2..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/PluginIntegrityTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * 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/cpl-v10.html
- *
- * Contributors:
- * Naci M. Dai - initial API and implementation
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.tests;
-
-import org.eclipse.jst.server.generic.core.internal.CorePlugin;
-import org.eclipse.jst.server.generic.ui.internal.GenericUiPlugin;
-
-
-import junit.framework.TestCase;
-
-/**
- * @author naci
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class PluginIntegrityTest extends TestCase {
-
- /*
- * @see TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- /*
- * @see TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- /**
- * Constructor for PluginIntegrityTest.
- * @param name
- */
- public PluginIntegrityTest(String name) {
- super(name);
- }
-
- public void testGenericUiPluginExists(){
- assertNotNull(GenericUiPlugin.getDefault());
- }
- public void testCorePluginExists(){
- assertNotNull(CorePlugin.getDefault());
- }
-
-}
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerCreationTest.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerCreationTest.java
deleted file mode 100644
index 91ddf33..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerCreationTest.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * 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/cpl-v10.html
- *
- * Contributors:
- * Naci M. Dai - initial API and implementation
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.tests;
-
-import java.util.HashMap;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.server.generic.core.internal.GenericServerRuntime;
-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.IServerType;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.internal.RuntimeType;
-
-public class ServerCreationTest extends TestCase {
-
- RuntimeType j2eeRuntimeType = null;
- private final static String ID = "org.eclipse.jst.server.generic.jonas4";
-
- /*
- * @see TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
- IRuntimeType[] listAll = ServerCore.getRuntimeTypes();
- if (listAll != null) {
- for (int i = 0; i < listAll.length; i++) {
- IRuntimeType runtimeType = listAll[i];
-
- if ("J2EE Runtime Library".equals(runtimeType.getName()))
- j2eeRuntimeType = (RuntimeType) runtimeType;
- }
- }
- }
-
- /*
- * @see TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- /**
- * Constructor for PluginIntegrityTest.
- *
- * @param name
- */
- public ServerCreationTest(String name) {
- super(name);
- }
-
- public void testGetTypes() {
- assertNotNull(j2eeRuntimeType);
- }
-
- public void testCreateServer() throws Exception {
-
- // Finds the generic server type
- IServerType[] sTypes = ServerCore.getServerTypes();
- IServerType serverType = null;
- for (int i = 0; i < sTypes.length; i++) {
- IServerType sType = sTypes[i];
- if (ID.equals(sType.getId()))
- serverType = sType;
- }
- assertNotNull("Could not find org.eclipse.jst.server.generic.jonas4 server type",serverType);
-
- //Finds the generic server runtime type
- IRuntimeType runtimeType = serverType.getRuntimeType();
- assertNotNull("Could not find runtime type for the generic server type",runtimeType);
-
-
- //Create a new server instance from the type
- IServerWorkingCopy server = serverType.createServer(ID+".Jonas.Server", null,
- (IRuntime) null, null);
- assertNotNull("Could not create server",server);
-
-
- //Create a new runtime instance from the type
- IRuntime runtime = runtimeType.createRuntime(ID+".Jonas.Runtime",null);
-
- assertNotNull("Could not create runtime",runtime);
-
-
- //Set the runtime for the server
- server.setRuntime(runtime);
-
- //Save the server
- server.save(false,null);
-
- // Set properties for the runtime
- IRuntimeWorkingCopy runtimeWorkingCopy = runtime.createWorkingCopy();
- assertNotNull("Could not create runtime working copy",runtimeWorkingCopy);
-
- // Set the JONAS runtime as the default runtime
- ServerUtil.setRuntimeDefaultName(runtimeWorkingCopy);
- assertNotNull("Runtime working copy has no name",runtimeWorkingCopy.getName());
-
- // Set properties for the JONAS runtime
- GenericServerRuntime runtimeDelegate = (GenericServerRuntime)runtimeWorkingCopy.loadAdapter(GenericServerRuntime.class,new NullProgressMonitor());
- assertNotNull("Could not obtain runtime delegate",runtimeDelegate);
-
- HashMap props = new HashMap();
- props.put("mappernames", "");
- props.put("classPathVariableName", "JONAS");
- props.put("serverAddress", "127.0.0.1");
- props.put("jonasBase", "C:\\nmd\\dev\\java\\appservers\\JOnAS-4.1.4");
- props.put("jonasRoot", "C:\\nmd\\dev\\java\\appservers\\JOnAS-4.1.4");
- props.put("classPath", "C:\\nmd\\dev\\java\\appservers\\JOnAS-4.1.4");
- props.put("protocols", "C:\\nmd\\dev\\java\\appservers\\JOnAS-4.1.4");
- props.put("port", "9000");
- runtimeDelegate.setServerInstanceProperties(props);
-
- //Save the runtime working copy
- runtimeWorkingCopy.save(false,null);
-
- }
-
-
-
-
- public void testGetWebTypes() {
-
- IRuntimeType listWeb[] = ServerUtil.getRuntimeTypes("jst.web", null);
- assertNotNull(listWeb);
-
- boolean found = listWeb.length>0;
- assertTrue(found);
- }
-
-}
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerDefinitionTypeTest.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerDefinitionTypeTest.java
deleted file mode 100644
index 2508fca..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerDefinitionTypeTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * 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/cpl-v10.html
- *
- * Contributors:
- * Naci M. Dai - initial API and implementation
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.jst.server.generic.core.internal.CorePlugin;
-import org.eclipse.jst.server.generic.core.internal.ServerTypeDefinitionManager;
-import org.eclipse.jst.server.generic.internal.core.util.ExtensionPointUtil;
-import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
-
-/**
- * @author naci
- *
- * TODO To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Style - Code Templates
- */
-public class ServerDefinitionTypeTest extends TestCase {
-
- /*
- * @see TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- /*
- * @see TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- /**
- * Constructor for PluginIntegrityTest.
- *
- * @param name
- */
- public ServerDefinitionTypeTest(String name) {
- super(name);
- }
-
- public void testGetTypes() {
- IExtension[] extensions = ExtensionPointUtil.getGenericServerDefinitionExtensions();
- int noOfExtensions = 0;
- for (int i = 0; i < extensions.length; i++) {
- noOfExtensions+= ExtensionPointUtil.getConfigurationElements(extensions[i]).length;
- }
- ServerTypeDefinitionManager serverTypeDefinitionManager = CorePlugin.getDefault().getServerTypeDefinitionManager();
- assertNotNull(serverTypeDefinitionManager);
- ServerRuntime[] types = serverTypeDefinitionManager.getServerTypeDefinitions();
- assertNotNull(types);
- assertEquals(noOfExtensions, types.length);
- }
-
- public void testResolve() {
- ServerTypeDefinitionManager serverTypeDefinitionManager = CorePlugin
- .getDefault().getServerTypeDefinitionManager();
- assertNotNull(serverTypeDefinitionManager);
- ServerRuntime[] types = serverTypeDefinitionManager
- .getServerTypeDefinitions();
- assertNotNull(types);
- assertTrue(types.length > 0);
- for (int i = 0; i < types.length; i++) {
- ServerRuntime definition = types[i];
- String wd = definition.getStart().getWorkingDirectory();
- String resolved = definition.getResolver().resolveProperties(wd);
- assertFalse(resolved.indexOf("${") >= 0);
- }
- }
-}
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerTypeDefinitionModelTest.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerTypeDefinitionModelTest.java
deleted file mode 100644
index 83de91a..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerTypeDefinitionModelTest.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package org.eclipse.jst.server.generic.tests;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.eclipse.jst.server.generic.core.internal.CorePlugin;
-import org.eclipse.jst.server.generic.servertype.definition.ArchiveType;
-import org.eclipse.jst.server.generic.servertype.definition.ArgumentPair;
-import org.eclipse.jst.server.generic.servertype.definition.Classpath;
-import org.eclipse.jst.server.generic.servertype.definition.JndiConnection;
-import org.eclipse.jst.server.generic.servertype.definition.LaunchConfiguration;
-import org.eclipse.jst.server.generic.servertype.definition.Module;
-import org.eclipse.jst.server.generic.servertype.definition.Port;
-import org.eclipse.jst.server.generic.servertype.definition.Project;
-import org.eclipse.jst.server.generic.servertype.definition.Property;
-import org.eclipse.jst.server.generic.servertype.definition.Publisher;
-import org.eclipse.jst.server.generic.servertype.definition.PublisherData;
-import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
-import org.eclipse.jst.server.generic.servertype.definition.ServerTypeFactory;
-
-import junit.framework.TestCase;
-
-public class ServerTypeDefinitionModelTest extends TestCase {
-
- private static final String TESTED_SERVER_ID = "org.eclipse.jst.server.generic.runtime.jonas4";
- private ServerRuntime subject = null;
- protected void setUp() throws Exception {
- ServerRuntime[] serverdefs = CorePlugin.getDefault().getServerTypeDefinitionManager().getServerTypeDefinitions();
- for (int i = 0; i < serverdefs.length; i++) {
- if(TESTED_SERVER_ID.equals(serverdefs[i].getId()))
- subject=serverdefs[i];
- }
- }
-
-
- public void testServerTypeFactory(){
- ServerTypeFactory factory = ServerTypeFactory.eINSTANCE;
- assertNotNull(factory.createArchiveType());
- assertNotNull(factory.createClasspath());
- assertNotNull(factory.createJndiConnection());
- assertNotNull(factory.createLaunchConfiguration());
- assertNotNull(factory.createModule());
- assertNotNull(factory.createPort());
- assertNotNull(factory.createProject());
- assertNotNull(factory.createProperty());
- assertNotNull(factory.createPublisher());
- assertNotNull(factory.createPublisherData());
- assertNotNull(factory.createServerRuntime());
- assertNotNull(factory.getServerTypePackage());
-
- }
- public void testServerRuntime(){
- assertTrue(subject.getClasspath()!=null && subject.getClasspath().size()>0);
- assertTrue(subject.getConfigurationElementNamespace()!=null && subject.getConfigurationElementNamespace().length()>0);
- assertTrue(subject.getName()!= null && subject.getName().length()>0);
- assertTrue(subject.getVersion()!=null && subject.getVersion().length()>0);
- assertTrue(subject.getProperty()!=null && subject.getProperty().size()>0);
- assertTrue(subject.getPort()!=null && subject.getPort().size()>0);
- assertTrue(subject.getModule()!=null && subject.getModule().size()>0);
- assertNotNull(subject.getProject());
- assertNotNull(subject.getStop());
- assertNotNull(subject.getStart());
- assertTrue(subject.getId()!= null && subject.getId().length()>0);
- assertTrue(subject.getFilename()!=null && subject.getFilename().length()>0);
- Classpath cp = (Classpath)subject.getClasspath().get(0);
- assertEquals(cp,subject.getClasspath(cp.getId()));
- Module module = (Module)subject.getModule().get(0);
- assertEquals(module,subject.getModule(module.getType()));
- assertNotNull(subject.getPublisher("org.eclipse.jst.server.generic.antpublisher"));
- }
- public void testSetServerRuntime()
- {
- subject.setId(TESTED_SERVER_ID);
- subject.setConfigurationElementNamespace("test.namespace");
- subject.setFilename("test.filename");
- Map testMap =new HashMap();
- subject.setPropertyValues(testMap);
- assertEquals(TESTED_SERVER_ID,subject.getId());
- assertEquals("test.namespace",subject.getConfigurationElementNamespace());
- assertEquals("test.filename",subject.getFilename());
- }
-
-
- public void testClasspath()
- {
- Classpath cp =(Classpath)subject.getClasspath().get(0);
- assertTrue(cp.getId()!=null && cp.getId().length()>0);
- assertTrue(cp.getArchive()!=null && cp.getArchive().size()>0);
- ArchiveType archiveType = (ArchiveType)cp.getArchive().get(0);
- assertTrue(archiveType.getPath()!=null && archiveType.getPath().length()>0);
-
- }
-
- public void testLaunchConfiguration()
- {
- LaunchConfiguration lcfg = subject.getStart();
- assertNotNull(lcfg);
- assertTrue(lcfg.getMainClass()!=null && lcfg.getMainClass().length()>0);
- assertTrue(lcfg.getMainClass()!=null && lcfg.getExternal().isEmpty());
- assertTrue(lcfg.getMainClass()!=null && lcfg.getDebugPort()==null);
- assertTrue(lcfg.getClasspathReference()!=null && lcfg.getClasspathReference().length()>0);
- assertTrue(lcfg.getProgramArguments()!=null && !lcfg.getProgramArguments().isEmpty());
- assertTrue(lcfg.getVmParameters()!=null && !lcfg.getVmParameters().isEmpty());
- assertTrue(lcfg.getWorkingDirectory()!=null && lcfg.getWorkingDirectory().length()>0);
- }
- public void testModule()
- {
- Module module = (Module)subject.getModule().get(0);
- assertNotNull(module);
- assertTrue(module.getPublishDir()!= null && module.getPublishDir().length()>0);
- assertTrue(module.getPublisherReference()!=null && module.getPublisherReference().length()>0);
- assertTrue(module.getType()!=null && module.getType().length()>0);
- }
- public void testPort()
- {
- Port port = (Port)subject.getPort().get(0);
- assertNotNull(port);
- assertNotNull(port.getName());
- assertTrue(port.getNo()!= null && port.getNo().length()>0);
- assertTrue(port.getProtocol()!=null && port.getProtocol().length()>0);
- }
- public void testProject()
- {
- Project project = subject.getProject();
- assertNotNull(project);
- assertNotNull(project.getClasspathReference());
- }
- public void testProperty()
- {
- Property property = (Property)subject.getProperty().get(0);
- assertNotNull(property);
- assertTrue(property.getContext()!=null && property.getContext().length()>0);
- assertTrue(property.getDefault()!=null && property.getDefault().length()>0);
- assertTrue(property.getId()!=null && property.getId().length()>0);
- assertTrue(property.getLabel()!= null && property.getLabel().length()>0);
- assertTrue(property.getType()!= null && property.getType().length()>0);
-
- }
- public void testPublisher()
- {
- Publisher publisher = (Publisher)subject.getPublisher().get(0);
- assertNotNull(publisher);
- assertTrue(publisher.getId()!=null && publisher.getId().length()>0);
- assertTrue(publisher.getPublisherdata()!=null && publisher.getPublisherdata().size()>0);
- PublisherData data = (PublisherData)publisher.getPublisherdata().get(0);
- assertNotNull(data);
- assertTrue(data.getDataname()!= null && data.getDataname().length()>0);
- assertTrue(data.getDatavalue()!=null && data.getDatavalue().length()>0);
- }
- public void testJNDIConnection()
- {
- JndiConnection jndi = subject.getJndiConnection();
- assertNotNull(jndi);
- assertTrue(jndi.getProviderUrl()!=null && jndi.getProviderUrl().length()>0);
- assertTrue(jndi.getInitialContextFactory()!= null && jndi.getInitialContextFactory().length()>0);
- assertNotNull(jndi.getJndiProperty());
- if(jndi.getJndiProperty().size()>0)
- {
- ArgumentPair property = (ArgumentPair)jndi.getJndiProperty().get(0);
- assertNotNull(property.getName());
- assertNotNull(property.getValue());
- }
- }
-
-
-
-}
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/TestProject.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/TestProject.java
deleted file mode 100644
index d1cf016..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/TestProject.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * 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/cpl-v10.html
- *
- * Contributors:
- * Naci M. Dai - initial API and implementation
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.tests;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.core.search.SearchPattern;
-import org.eclipse.jdt.core.search.TypeNameRequestor;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.osgi.framework.Bundle;
-public class TestProject {
- public IProject project;
- public IJavaProject javaProject;
- private IPackageFragmentRoot sourceFolder;
- public TestProject() throws CoreException {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- project = root.getProject("Project-1");
- project.create(null);
- project.open(null);
- javaProject = JavaCore.create(project);
- IFolder binFolder = createBinFolder();
- setJavaNature();
- javaProject.setRawClasspath(new IClasspathEntry[0], null);
- createOutputFolder(binFolder);
- addSystemLibraries();
- }
- public IProject getProject() {
- return project;
- }
- public IJavaProject getJavaProject() {
- return javaProject;
- }
- public void addJar(String plugin, String jar) throws MalformedURLException,
- IOException, JavaModelException {
- Path result = findFileInPlugin(plugin, jar);
- IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
- IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1];
- System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
- newEntries[oldEntries.length] = JavaCore.newLibraryEntry(result, null,
- null);
- javaProject.setRawClasspath(newEntries, null);
- }
- public IPackageFragment createPackage(String name) throws CoreException {
- if (sourceFolder == null)
- sourceFolder = createSourceFolder();
- return sourceFolder.createPackageFragment(name, false, null);
- }
- public IType createType(IPackageFragment pack, String cuName, String source)
- throws JavaModelException {
- StringBuffer buf = new StringBuffer();
- buf.append("package " + pack.getElementName() + ";\n");
- buf.append("\n");
- buf.append(source);
- ICompilationUnit cu = pack.createCompilationUnit(cuName,
- buf.toString(), false, null);
- return cu.getTypes()[0];
- }
- public void dispose() throws CoreException {
- waitForIndexer();
- project.delete(true, true, null);
- }
- private IFolder createBinFolder() throws CoreException {
- IFolder binFolder = project.getFolder("bin");
- binFolder.create(false, true, null);
- return binFolder;
- }
-
- public IFolder createWebModule(String moduleName, String contents) throws CoreException {
- IFolder moduleFolder = project.getFolder(moduleName);
- moduleFolder.create(false, true, null);
-
- IFolder folder = project.getFolder(moduleName + "/WEB-INF");
- folder.create(false, true, null);
- folder = project.getFolder(moduleName + "/WEB-INF/classes");
- folder.create(false, true, null);
- folder = project.getFolder(moduleName + "/WEB-INF/lib");
- folder.create(false, true, null);
-
- ByteArrayInputStream stream = new ByteArrayInputStream(contents.getBytes());
- IFile file = project.getFile(moduleName + "/WEB-INF/web.xml");
- file.create(stream, true, null);
-
- return moduleFolder;
- }
-
- private void setJavaNature() throws CoreException {
- IProjectDescription description = project.getDescription();
- description.setNatureIds(new String[]{JavaCore.NATURE_ID});
- project.setDescription(description, null);
- }
- private void createOutputFolder(IFolder binFolder)
- throws JavaModelException {
- IPath outputLocation = binFolder.getFullPath();
- javaProject.setOutputLocation(outputLocation, null);
- }
- public IPackageFragmentRoot createSourceFolder() throws CoreException {
- IFolder folder = project.getFolder("src");
- folder.create(false, true, null);
- IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(folder);
- IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
- IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1];
- System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
- newEntries[oldEntries.length] = JavaCore.newSourceEntry(root.getPath());
- javaProject.setRawClasspath(newEntries, null);
- return root;
- }
- private void addSystemLibraries() throws JavaModelException {
- IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
- IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1];
- System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
- newEntries[oldEntries.length] = JavaRuntime
- .getDefaultJREContainerEntry();
- javaProject.setRawClasspath(newEntries, null);
- }
- private Path findFileInPlugin(String plugin, String file)
- throws MalformedURLException, IOException {
- Bundle bundle = Platform.getBundle(plugin);
- URL pluginURL = bundle.getEntry("/");
- URL jarURL = new URL(pluginURL, file);
- URL localJarURL = Platform.asLocalURL(jarURL);
- return new Path(localJarURL.getPath());
- }
- private void waitForIndexer() throws JavaModelException {
- new SearchEngine().searchAllTypeNames(null, null,
- SearchPattern.R_CASE_SENSITIVE,
- IJavaSearchConstants.CLASS, SearchEngine
- .createJavaSearchScope(new IJavaElement[0]),
- new TypeNameRequestor() {
- public void acceptClass(char[] packageName,
- char[] simpleTypeName, char[][] enclosingTypeNames,
- String path) {
- }
- public void acceptInterface(char[] packageName,
- char[] simpleTypeName, char[][] enclosingTypeNames,
- String path) {
- }
- }, IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, null);
- }
- /**
- * @return Returns the sourceFolder.
- */
- public IPackageFragmentRoot getSourceFolder() {
- return sourceFolder;
- }
- /**
- * @param sourceFolder The sourceFolder to set.
- */
- public void setSourceFolder(IPackageFragmentRoot sourceFolder) {
- this.sourceFolder = sourceFolder;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/TestsPlugin.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/TestsPlugin.java
deleted file mode 100644
index 95fff08..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/TestsPlugin.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * 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/cpl-v10.html
- *
- * Contributors:
- * Naci M. Dai - initial API and implementation
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.tests;
-
-import org.eclipse.ui.plugin.*;
-import org.osgi.framework.BundleContext;
-import java.util.*;
-
-
-public class TestsPlugin extends AbstractUIPlugin {
- //The shared instance.
- private static TestsPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public TestsPlugin() {
- 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 TestsPlugin 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 = TestsPlugin.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.server.generic.tests.TestsPluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- return resourceBundle;
- }
-}
diff --git a/tests/org.eclipse.jst.server.generic.tests/test.xml b/tests/org.eclipse.jst.server.generic.tests/test.xml
deleted file mode 100644
index 900f5bb..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/test.xml
+++ /dev/null
@@ -1,49 +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.server.generic.tests"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
-
- <!-- 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.server.generic.tests.AllGenericServerTests" />
- <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">
- </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.server.geronimo.core.tests/.classpath b/tests/org.eclipse.jst.server.geronimo.core.tests/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.jst.server.geronimo.core.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <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.jst.server.geronimo.core.tests/.cvsignore b/tests/org.eclipse.jst.server.geronimo.core.tests/.cvsignore
deleted file mode 100644
index 60463af..0000000
--- a/tests/org.eclipse.jst.server.geronimo.core.tests/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-build.xml
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/.project b/tests/org.eclipse.jst.server.geronimo.core.tests/.project
deleted file mode 100644
index 3946809..0000000
--- a/tests/org.eclipse.jst.server.geronimo.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.server.geronimo.core.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.server.geronimo.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.server.geronimo.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 97be667..0000000
--- a/tests/org.eclipse.jst.server.geronimo.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,52 +0,0 @@
-#Thu May 26 14:34:05 EDT 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,NORMAL,HIGH
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,issue,Provisional API
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.jst.server.geronimo.core.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index a0ff53c..0000000
--- a/tests/org.eclipse.jst.server.geronimo.core.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu May 26 14:34:05 EDT 2005
-eclipse.preferences.version=1
-internal.default.compliance=user
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.server.geronimo.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index b96d963..0000000
--- a/tests/org.eclipse.jst.server.geronimo.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.jst.server.geronimo.core.tests
-Bundle-SymbolicName: org.eclipse.jst.server.geronimo.core.tests
-Bundle-Version: 0.7.0
-Bundle-ClassPath: tests.jar
-Bundle-Activator: org.eclipse.jst.server.geronimo.core.tests.TestsPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.server.geronimo.core.tests
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.junit,
- org.eclipse.jdt.launching,
- org.eclipse.wst.server.core,
- org.eclipse.jst.server.core,
- org.eclipse.jst.server.geronimo.core,
- org.eclipse.wst.server.core.tests
-Eclipse-AutoStart: true
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/about.html b/tests/org.eclipse.jst.server.geronimo.core.tests/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.jst.server.geronimo.core.tests/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/build.properties b/tests/org.eclipse.jst.server.geronimo.core.tests/build.properties
deleted file mode 100644
index 06f7a31..0000000
--- a/tests/org.eclipse.jst.server.geronimo.core.tests/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# 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
-###############################################################################
-bin.includes = plugin.xml,\
- test.xml,\
- tests.jar,\
- META-INF/,\
- about.html
-jars.compile.order = tests.jar
-source.tests.jar = src/
-output.tests.jar = bin/
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/AllTests.java b/tests/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/AllTests.java
deleted file mode 100644
index d46f4be..0000000
--- a/tests/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/AllTests.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**********************************************************************
- * 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
- **********************************************************************/
-package org.eclipse.jst.server.geronimo.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.jst.server.geronimo.core.tests");
- //$JUnit-BEGIN$
- suite.addTestSuite(ExistenceTest.class);
- //$JUnit-END$
- return suite;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/ExistenceTest.java b/tests/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/ExistenceTest.java
deleted file mode 100644
index 65757bd..0000000
--- a/tests/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/ExistenceTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.geronimo.core.tests;
-
-import org.eclipse.jst.server.geronimo.core.internal.GeronimoPlugin;
-import junit.framework.TestCase;
-
-public class ExistenceTest extends TestCase {
- public void testPluginExists() {
- assertNotNull(GeronimoPlugin.getInstance());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/OrderedTestSuite.java b/tests/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/OrderedTestSuite.java
deleted file mode 100644
index 5d288b8..0000000
--- a/tests/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/OrderedTestSuite.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.geronimo.core.tests;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Vector;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-class OrderedTestSuite extends TestSuite{
- public OrderedTestSuite(Class theClass, String name) {
- this(theClass);
- setName(name);
- }
-
- public OrderedTestSuite(final Class theClass) {
- super();
- setName(theClass.getName());
- try {
- getTestConstructor(theClass); // Avoid generating multiple error messages
- } catch (NoSuchMethodException e) {
- addTest(warning("Class " + theClass.getName()
- + " has no public constructor TestCase(String name) or TestCase()"));
- return;
- }
- if (!Modifier.isPublic(theClass.getModifiers())) {
- addTest(warning("Class " + theClass.getName() + " is not public"));
- return;
- }
- Class superClass = theClass;
- Vector names = new Vector();
- while (Test.class.isAssignableFrom(superClass)) {
- Method[] methods = superClass.getDeclaredMethods();
- int size = methods.length;
- for (int i = 0; i < size - 1; i++) {
- for (int j = i + 1; j < size; j++) {
- if (methods[i].getName().compareTo(methods[j].getName()) > 0) {
- Method m = methods[i];
- methods[i] = methods[j];
- methods[j] = m;
- }
- }
- }
- for (int i = 0; i < size; i++) {
- addTestMethod(methods[i], names, theClass);
- }
- superClass = superClass.getSuperclass();
- }
- if (!tests().hasMoreElements())
- addTest(warning("No tests found in " + theClass.getName()));
- }
-
- private void addTestMethod(Method m, Vector names, Class theClass) {
- String name = m.getName();
- if (names.contains(name))
- return;
- if (!isPublicTestMethod(m)) {
- if (isTestMethod(m))
- addTest(warning("Test method isn't public: " + m.getName()));
- return;
- }
- names.addElement(name);
- addTest(createTest(theClass, name));
- }
-
- private boolean isPublicTestMethod(Method m) {
- return isTestMethod(m) && Modifier.isPublic(m.getModifiers());
- }
-
- private boolean isTestMethod(Method m) {
- String name = m.getName();
- Class[] parameters = m.getParameterTypes();
- Class returnType = m.getReturnType();
- return parameters.length == 0 && name.startsWith("test") && returnType.equals(Void.TYPE);
- }
-
- private Test warning(final String message) {
- return new TestCase("warning") {
- protected void runTest() {
- fail(message);
- }
- };
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/TestsPlugin.java b/tests/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/TestsPlugin.java
deleted file mode 100644
index f80d29d..0000000
--- a/tests/org.eclipse.jst.server.geronimo.core.tests/src/org/eclipse/jst/server/geronimo/core/tests/TestsPlugin.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.geronimo.core.tests;
-
-import org.eclipse.core.runtime.Plugin;
-/**
- *
- */
-public class TestsPlugin extends Plugin {
- /**
- * The constructor.
- */
- public TestsPlugin() {
- super();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.geronimo.core.tests/test.xml b/tests/org.eclipse.jst.server.geronimo.core.tests/test.xml
deleted file mode 100644
index 4c60c05..0000000
--- a/tests/org.eclipse.jst.server.geronimo.core.tests/test.xml
+++ /dev/null
@@ -1,49 +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.server.geronimo.core.tests"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
-
- <!-- 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="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.jst.server.geronimo.core.tests.AllTests"/>
- <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">
- </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.server.geronimo.ui.tests/.classpath b/tests/org.eclipse.jst.server.geronimo.ui.tests/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.jst.server.geronimo.ui.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <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.jst.server.geronimo.ui.tests/.cvsignore b/tests/org.eclipse.jst.server.geronimo.ui.tests/.cvsignore
deleted file mode 100644
index 60463af..0000000
--- a/tests/org.eclipse.jst.server.geronimo.ui.tests/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-build.xml
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/.project b/tests/org.eclipse.jst.server.geronimo.ui.tests/.project
deleted file mode 100644
index 9853472..0000000
--- a/tests/org.eclipse.jst.server.geronimo.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.server.geronimo.ui.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.server.geronimo.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.server.geronimo.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d05825e..0000000
--- a/tests/org.eclipse.jst.server.geronimo.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,47 +0,0 @@
-#Wed May 25 10:52:36 EDT 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.server.geronimo.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 623ea5b..0000000
--- a/tests/org.eclipse.jst.server.geronimo.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.jst.server.geronimo.ui.tests
-Bundle-SymbolicName: org.eclipse.jst.server.geronimo.ui.tests
-Bundle-Version: 0.7.0
-Bundle-ClassPath: tests.jar
-Bundle-Activator: org.eclipse.jst.server.geronimo.ui.tests.TestsPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.server.geronimo.ui.tests
-Require-Bundle: org.eclipse.core.runtime,
- org.junit,
- org.eclipse.ui,
- org.eclipse.wst.server.core,
- org.eclipse.wst.server.ui,
- org.eclipse.jst.server.geronimo.core,
- org.eclipse.jst.server.geronimo.ui,
- org.eclipse.wst.server.core.tests,
- org.eclipse.wst.server.ui.tests,
- org.eclipse.jst.server.geronimo.core.tests
-Eclipse-AutoStart: true
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/about.html b/tests/org.eclipse.jst.server.geronimo.ui.tests/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.jst.server.geronimo.ui.tests/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/build.properties b/tests/org.eclipse.jst.server.geronimo.ui.tests/build.properties
deleted file mode 100644
index e813ad9..0000000
--- a/tests/org.eclipse.jst.server.geronimo.ui.tests/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# 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
-###############################################################################
-bin.includes = plugin.xml,\
- test.xml,\
- tests.jar,\
- META-INF/,\
- about.html
-jars.compile.order = tests.jar
-source.tests.jar = src/
-output.tests.jar = bin/
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/AllTests.java b/tests/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/AllTests.java
deleted file mode 100644
index b6a3756..0000000
--- a/tests/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/AllTests.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.geronimo.ui.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.jst.server.geronimo.ui.tests");
- //$JUnit-BEGIN$
- suite.addTestSuite(ExistenceTest.class);
- //$JUnit-END$
- return suite;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/ExistenceTest.java b/tests/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/ExistenceTest.java
deleted file mode 100644
index e49c136..0000000
--- a/tests/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/ExistenceTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.geronimo.ui.tests;
-
-import org.eclipse.jst.server.geronimo.ui.internal.GeronimoUIPlugin;
-import junit.framework.TestCase;
-
-public class ExistenceTest extends TestCase {
- public void testPluginExists() {
- assertNotNull(GeronimoUIPlugin.getInstance());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/OrderedTestSuite.java b/tests/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/OrderedTestSuite.java
deleted file mode 100644
index 5e2a301..0000000
--- a/tests/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/OrderedTestSuite.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.geronimo.ui.tests;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Vector;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-class OrderedTestSuite extends TestSuite{
- public OrderedTestSuite(Class theClass, String name) {
- this(theClass);
- setName(name);
- }
-
- public OrderedTestSuite(final Class theClass) {
- super();
- setName(theClass.getName());
- try {
- getTestConstructor(theClass); // Avoid generating multiple error messages
- } catch (NoSuchMethodException e) {
- addTest(warning("Class " + theClass.getName()
- + " has no public constructor TestCase(String name) or TestCase()"));
- return;
- }
- if (!Modifier.isPublic(theClass.getModifiers())) {
- addTest(warning("Class " + theClass.getName() + " is not public"));
- return;
- }
- Class superClass = theClass;
- Vector names = new Vector();
- while (Test.class.isAssignableFrom(superClass)) {
- Method[] methods = superClass.getDeclaredMethods();
- int size = methods.length;
- for (int i = 0; i < size - 1; i++) {
- for (int j = i + 1; j < size; j++) {
- if (methods[i].getName().compareTo(methods[j].getName()) > 0) {
- Method m = methods[i];
- methods[i] = methods[j];
- methods[j] = m;
- }
- }
- }
- for (int i = 0; i < size; i++) {
- addTestMethod(methods[i], names, theClass);
- }
- superClass = superClass.getSuperclass();
- }
- if (!tests().hasMoreElements())
- addTest(warning("No tests found in " + theClass.getName()));
- }
-
- private void addTestMethod(Method m, Vector names, Class theClass) {
- String name = m.getName();
- if (names.contains(name))
- return;
- if (!isPublicTestMethod(m)) {
- if (isTestMethod(m))
- addTest(warning("Test method isn't public: " + m.getName()));
- return;
- }
- names.addElement(name);
- addTest(createTest(theClass, name));
- }
-
- private boolean isPublicTestMethod(Method m) {
- return isTestMethod(m) && Modifier.isPublic(m.getModifiers());
- }
-
- private boolean isTestMethod(Method m) {
- String name = m.getName();
- Class[] parameters = m.getParameterTypes();
- Class returnType = m.getReturnType();
- return parameters.length == 0 && name.startsWith("test") && returnType.equals(Void.TYPE);
- }
-
- private Test warning(final String message) {
- return new TestCase("warning") {
- protected void runTest() {
- fail(message);
- }
- };
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/TestsPlugin.java b/tests/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/TestsPlugin.java
deleted file mode 100644
index 75c2101..0000000
--- a/tests/org.eclipse.jst.server.geronimo.ui.tests/src/org/eclipse/jst/server/geronimo/ui/tests/TestsPlugin.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.geronimo.ui.tests;
-
-import org.eclipse.core.runtime.Plugin;
-/**
- *
- */
-public class TestsPlugin extends Plugin {
- /**
- * The constructor.
- */
- public TestsPlugin() {
- super();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.geronimo.ui.tests/test.xml b/tests/org.eclipse.jst.server.geronimo.ui.tests/test.xml
deleted file mode 100644
index 45d1ac6..0000000
--- a/tests/org.eclipse.jst.server.geronimo.ui.tests/test.xml
+++ /dev/null
@@ -1,49 +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.server.geronimo.ui.tests"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
-
- <!-- 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="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.jst.server.geronimo.ui.tests.AllTests" />
- <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">
- </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.server.tomcat.core.tests/.classpath b/tests/org.eclipse.jst.server.tomcat.core.tests/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <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.jst.server.tomcat.core.tests/.cvsignore b/tests/org.eclipse.jst.server.tomcat.core.tests/.cvsignore
deleted file mode 100644
index 6c1b57a..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-tests.jar
-testssrc.zip
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/.project b/tests/org.eclipse.jst.server.tomcat.core.tests/.project
deleted file mode 100644
index e2c044e..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.server.tomcat.core.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.server.tomcat.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.server.tomcat.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 97be667..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,52 +0,0 @@
-#Thu May 26 14:34:05 EDT 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,NORMAL,HIGH
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,issue,Provisional API
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.jst.server.tomcat.core.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index a0ff53c..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu May 26 14:34:05 EDT 2005
-eclipse.preferences.version=1
-internal.default.compliance=user
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.server.tomcat.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 8a5b2d1..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.jst.server.tomcat.core.tests
-Bundle-SymbolicName: org.eclipse.jst.server.tomcat.core.tests
-Bundle-Version: 1.0.0
-Bundle-ClassPath: tests.jar
-Bundle-Activator: org.eclipse.jst.server.tomcat.core.tests.TestsPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.server.tomcat.core.tests,
- org.eclipse.jst.server.tomcat.core.tests.internal,
- org.eclipse.jst.server.tomcat.core.tests.module
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.commands,
- org.junit,
- org.eclipse.wst.server.core,
- org.eclipse.jst.server.tomcat.core,
- org.eclipse.wst.server.core.tests,
- org.eclipse.jst.j2ee.web,
- org.eclipse.wst.common.frameworks,
- org.eclipse.jst.j2ee,
- org.eclipse.jdt.launching,
- org.eclipse.core.resources,
- org.eclipse.jst.server.core
-Eclipse-AutoStart: true
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/about.html b/tests/org.eclipse.jst.server.tomcat.core.tests/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/build.properties b/tests/org.eclipse.jst.server.tomcat.core.tests/build.properties
deleted file mode 100644
index 310beba..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 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
-###############################################################################
-bin.includes = plugin.xml,\
- test.xml,\
- tests.jar,\
- META-INF/,\
- about.html
-jars.compile.order = tests.jar
-source.tests.jar = src/
-output.tests.jar = bin/
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/AbstractTomcatRuntimeTestCase.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/AbstractTomcatRuntimeTestCase.java
deleted file mode 100644
index e15c4f7..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/AbstractTomcatRuntimeTestCase.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**********************************************************************
- * 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
- **********************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.server.core.*;
-import org.eclipse.wst.server.core.tests.ext.AbstractRuntimeTestCase;
-
-public abstract class AbstractTomcatRuntimeTestCase extends AbstractRuntimeTestCase {
- protected abstract String getRuntimeTypeId();
-
- public IRuntime createRuntime() throws Exception {
- try {
- IRuntimeWorkingCopy wc = createRuntime(getRuntimeTypeId());
- return wc.save(true, null);
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
- }
-
- public void deleteRuntime(IRuntime runtime2) throws Exception {
- runtime2.delete();
- }
-
- protected static IRuntimeWorkingCopy createRuntime(String runtimeTypeId) throws Exception {
- IRuntimeType rt = ServerCore.findRuntimeType(runtimeTypeId);
- IRuntimeWorkingCopy wc = rt.createRuntime(null, null);
- wc.setLocation(new Path(RuntimeLocation.runtimeLocation));
- return wc;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/AbstractTomcatServerTestCase.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/AbstractTomcatServerTestCase.java
deleted file mode 100644
index 3be080a..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/AbstractTomcatServerTestCase.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/**********************************************************************
- * 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
- **********************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests;
-
-import java.util.List;
-import junit.framework.Test;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.server.tomcat.core.internal.ITomcatConfigurationWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.internal.TomcatServer;
-import org.eclipse.jst.server.tomcat.core.tests.module.ModuleTestCase;
-import org.eclipse.wst.server.core.*;
-import org.eclipse.wst.server.core.tests.ext.AbstractServerTestCase;
-
-public abstract class AbstractTomcatServerTestCase extends AbstractServerTestCase {
- public static Test suite() {
- return new OrderedTestSuite(AbstractTomcatServerTestCase.class, "TomcatServerTestCase");
- }
-
- protected abstract String getServerTypeId();
-
- public void deleteServer(IServer server2) throws Exception {
- server2.getRuntime().delete();
- server2.delete();
- }
-
- protected IRuntime createRuntime() throws Exception {
- IServerType st = ServerCore.findServerType(getServerTypeId());
- IRuntimeWorkingCopy wc = st.getRuntimeType().createRuntime(null, null);
- wc.setLocation(new Path(RuntimeLocation.runtimeLocation));
- return wc.save(true, null);
- }
-
- public IServer createServer() throws Exception {
- IServerType st = ServerCore.findServerType(getServerTypeId());
- IRuntime runtime = createRuntime();
- IServerWorkingCopy wc = st.createServer(null, null, runtime, null);
-
- ServerPort[] ports = wc.getServerPorts(null);
- TomcatServer tomcatServer = (TomcatServer) wc.getAdapter(TomcatServer.class);
- ITomcatConfigurationWorkingCopy configuration = (ITomcatConfigurationWorkingCopy) tomcatServer.getServerConfiguration();
- // if no ports from the server, use the configuration
- if (ports == null || ports.length == 0) {
- List portsList = configuration.getServerPorts();
- if (portsList != null && portsList.size() > 0) {
- ports = (ServerPort[])portsList.toArray(new ServerPort[portsList.size()]);
- }
- }
- if (ports != null) {
- int size = ports.length;
- for (int i = 0; i < size; i++) {
- configuration.modifyServerPort(ports[i].getId(), 22100 + i);
- }
- }
-
- return wc.save(true, null);
- }
-
- public void test0100CanAddModule() {
- IModule webModule = ModuleTestCase.webModule;
- IStatus status = server.canModifyModules(new IModule[] { webModule }, null, null);
- assertTrue(status.isOK());
- }
-
- public void test0101HasModule() {
- IModule webModule = ModuleTestCase.webModule;
- IModule[] modules = server.getModules();
- int size = modules.length;
- boolean found = false;
- for (int i = 0; i < size; i++) {
- if (webModule.equals(modules[i]))
- found = true;
- }
- if (found)
- assertTrue(false);
- }
-
- public void test0102AddModule() throws Exception {
- IModule webModule = ModuleTestCase.webModule;
- IServerWorkingCopy wc = server.createWorkingCopy();
- wc.modifyModules(new IModule[] { webModule }, null, null);
- wc.save(true, null);
- }
-
- public void test0103HasModule() {
- IModule webModule = ModuleTestCase.webModule;
- IModule[] modules = server.getModules();
- int size = modules.length;
- boolean found = false;
- for (int i = 0; i < size; i++) {
- if (webModule.equals(modules[i]))
- found = true;
- }
- if (!found)
- assertTrue(false);
- }
-
- public void test0104RemoveModule() throws Exception {
- IModule webModule = ModuleTestCase.webModule;
- IServerWorkingCopy wc = server.createWorkingCopy();
- wc.modifyModules(null, new IModule[] { webModule }, null);
- wc.save(true, null);
- }
-
- public void test0105HasModule() {
- IModule webModule = ModuleTestCase.webModule;
- IModule[] modules = server.getModules();
- int size = modules.length;
- boolean found = false;
- for (int i = 0; i < size; i++) {
- if (webModule.equals(modules[i]))
- found = true;
- }
- if (found)
- assertTrue(false);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/AllTests.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/AllTests.java
deleted file mode 100644
index 87201dc..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/AllTests.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**********************************************************************
- * 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
- **********************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests;
-
-import org.eclipse.jst.server.tomcat.core.tests.internal.UtilTestCase;
-import org.eclipse.jst.server.tomcat.core.tests.module.DeleteModuleTestCase;
-import org.eclipse.jst.server.tomcat.core.tests.module.ModuleTestCase;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.jst.server.tomcat.core.tests");
- //$JUnit-BEGIN$
- System.setProperty("wtp.autotest.noninteractive", "true");
-
- suite.addTestSuite(ExistenceTest.class);
- suite.addTest(new OrderedTestSuite(TomcatRuntimeTestCase.class));
- suite.addTest(new OrderedTestSuite(ModuleTestCase.class));
-
- String s = System.getProperty("org.eclipse.jst.server.tomcat.32");
- //s = "D:\\Tools\\tomcat\\jakarta-tomcat-3.2.4";
- if (s != null && s.length() > 0) {
- RuntimeLocation.runtimeLocation = s;
- suite.addTest(new OrderedTestSuite(Tomcat32RuntimeTestCase.class));
- suite.addTest(new OrderedTestSuite(Tomcat32ServerTestCase.class));
- } else {
- System.err.println("Warning: Tomcat 3.2 not found - tests skipped");
- }
-
- s = System.getProperty("org.eclipse.jst.server.tomcat.40");
- if (s != null && s.length() > 0) {
- RuntimeLocation.runtimeLocation = s;
- suite.addTest(new OrderedTestSuite(Tomcat40RuntimeTestCase.class));
- suite.addTest(new OrderedTestSuite(Tomcat40ServerTestCase.class));
- } else {
- System.err.println("Warning: Tomcat 4.0 not found - tests skipped");
- }
-
- s = System.getProperty("org.eclipse.jst.server.tomcat.41");
- if (s != null && s.length() > 0) {
- RuntimeLocation.runtimeLocation = s;
- suite.addTest(new OrderedTestSuite(Tomcat41RuntimeTestCase.class));
- suite.addTest(new OrderedTestSuite(Tomcat41ServerTestCase.class));
- } else {
- System.err.println("Warning: Tomcat 4.1 not found - tests skipped");
- }
-
- s = System.getProperty("org.eclipse.jst.server.tomcat.50");
- //s = "D:\\Tools\\tomcat\\jakarta-tomcat-5.0.19";
- if (s != null && s.length() > 0) {
- RuntimeLocation.runtimeLocation = s;
- suite.addTest(new OrderedTestSuite(Tomcat50RuntimeTestCase.class));
- suite.addTest(new OrderedTestSuite(Tomcat50ServerTestCase.class));
- } else {
- System.err.println("Warning: Tomcat 5.0 not found - tests skipped");
- }
-
- s = System.getProperty("org.eclipse.jst.server.tomcat.55");
- if (s != null && s.length() > 0) {
- RuntimeLocation.runtimeLocation = s;
- suite.addTest(new OrderedTestSuite(Tomcat55RuntimeTestCase.class));
- suite.addTest(new OrderedTestSuite(Tomcat55ServerTestCase.class));
- } else {
- System.err.println("Warning: Tomcat 5.5 not found - tests skipped");
- }
-
- suite.addTestSuite(UtilTestCase.class);
-
- suite.addTest(new OrderedTestSuite(DeleteModuleTestCase.class));
- //$JUnit-END$
- return suite;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/ExistenceTest.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/ExistenceTest.java
deleted file mode 100644
index ed07364..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/ExistenceTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests;
-
-import org.eclipse.jst.server.tomcat.core.internal.TomcatPlugin;
-import junit.framework.TestCase;
-
-public class ExistenceTest extends TestCase {
- public void testPluginExists() {
- assertNotNull(TomcatPlugin.getInstance());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/OrderedTestSuite.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/OrderedTestSuite.java
deleted file mode 100644
index 3d2bf40..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/OrderedTestSuite.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Vector;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class OrderedTestSuite extends TestSuite {
- public OrderedTestSuite(Class theClass, String name) {
- this(theClass);
- setName(name);
- }
-
- public OrderedTestSuite(final Class theClass) {
- super();
- setName(theClass.getName());
- try {
- getTestConstructor(theClass); // Avoid generating multiple error messages
- } catch (NoSuchMethodException e) {
- addTest(warning("Class " + theClass.getName()
- + " has no public constructor TestCase(String name) or TestCase()"));
- return;
- }
- if (!Modifier.isPublic(theClass.getModifiers())) {
- addTest(warning("Class " + theClass.getName() + " is not public"));
- return;
- }
- Class superClass = theClass;
- Vector names = new Vector();
-
- Method[] methods = superClass.getMethods();
- int size = methods.length;
- for (int i = 0; i < size - 1; i++) {
- for (int j = i + 1; j < size; j++) {
- if (methods[i].getName().compareTo(methods[j].getName()) > 0) {
- Method m = methods[i];
- methods[i] = methods[j];
- methods[j] = m;
- }
- }
- }
- for (int i = 0; i < size; i++) {
- addTestMethod(methods[i], names, theClass);
- }
- if (!tests().hasMoreElements())
- addTest(warning("No tests found in " + theClass.getName()));
- }
-
- private void addTestMethod(Method m, Vector names, Class theClass) {
- String name = m.getName();
- if (names.contains(name))
- return;
- if (!isPublicTestMethod(m)) {
- if (isTestMethod(m))
- addTest(warning("Test method isn't public: " + m.getName()));
- return;
- }
- names.addElement(name);
- addTest(createTest(theClass, name));
- }
-
- private boolean isPublicTestMethod(Method m) {
- return isTestMethod(m) && Modifier.isPublic(m.getModifiers());
- }
-
- private boolean isTestMethod(Method m) {
- String name = m.getName();
- Class[] parameters = m.getParameterTypes();
- Class returnType = m.getReturnType();
- return parameters.length == 0 && name.startsWith("test") && returnType.equals(Void.TYPE);
- }
-
- private Test warning(final String message) {
- return new TestCase("warning") {
- protected void runTest() {
- fail(message);
- }
- };
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/RuntimeLocation.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/RuntimeLocation.java
deleted file mode 100644
index cb4eef6..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/RuntimeLocation.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/**********************************************************************
- * 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
- **********************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests;
-
-public class RuntimeLocation {
- public static String runtimeLocation;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/TestsPlugin.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/TestsPlugin.java
deleted file mode 100644
index 6cb75fa..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/TestsPlugin.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests;
-
-import org.eclipse.core.runtime.Plugin;
-/**
- *
- */
-public class TestsPlugin extends Plugin {
- /**
- * The constructor.
- */
- public TestsPlugin() {
- super();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat32RuntimeTestCase.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat32RuntimeTestCase.java
deleted file mode 100644
index e4371e8..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat32RuntimeTestCase.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**********************************************************************
- * 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
- **********************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests;
-
-public class Tomcat32RuntimeTestCase extends AbstractTomcatRuntimeTestCase {
- protected String getRuntimeTypeId() {
- return "org.eclipse.jst.server.tomcat.runtime.32";
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat32ServerTestCase.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat32ServerTestCase.java
deleted file mode 100644
index b67e715..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat32ServerTestCase.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**********************************************************************
- * 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
- **********************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests;
-
-public class Tomcat32ServerTestCase extends AbstractTomcatServerTestCase {
- protected String getServerTypeId() {
- return "org.eclipse.jst.server.tomcat.32";
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat40RuntimeTestCase.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat40RuntimeTestCase.java
deleted file mode 100644
index 2d2c678..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat40RuntimeTestCase.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**********************************************************************
- * 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
- **********************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests;
-
-public class Tomcat40RuntimeTestCase extends AbstractTomcatRuntimeTestCase {
- protected String getRuntimeTypeId() {
- return "org.eclipse.jst.server.tomcat.runtime.40";
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat40ServerTestCase.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat40ServerTestCase.java
deleted file mode 100644
index b928647..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat40ServerTestCase.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**********************************************************************
- * 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
- **********************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests;
-
-public class Tomcat40ServerTestCase extends AbstractTomcatServerTestCase {
- protected String getServerTypeId() {
- return "org.eclipse.jst.server.tomcat.40";
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat41RuntimeTestCase.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat41RuntimeTestCase.java
deleted file mode 100644
index f3f6247..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat41RuntimeTestCase.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**********************************************************************
- * 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
- **********************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests;
-
-public class Tomcat41RuntimeTestCase extends AbstractTomcatRuntimeTestCase {
- protected String getRuntimeTypeId() {
- return "org.eclipse.jst.server.tomcat.runtime.41";
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat41ServerTestCase.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat41ServerTestCase.java
deleted file mode 100644
index 30c234e..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat41ServerTestCase.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**********************************************************************
- * 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
- **********************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests;
-
-public class Tomcat41ServerTestCase extends AbstractTomcatServerTestCase {
- protected String getServerTypeId() {
- return "org.eclipse.jst.server.tomcat.41";
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat50RuntimeTestCase.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat50RuntimeTestCase.java
deleted file mode 100644
index b401191..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat50RuntimeTestCase.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**********************************************************************
- * 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
- **********************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests;
-
-public class Tomcat50RuntimeTestCase extends AbstractTomcatRuntimeTestCase {
- protected String getRuntimeTypeId() {
- return "org.eclipse.jst.server.tomcat.runtime.50";
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat50ServerTestCase.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat50ServerTestCase.java
deleted file mode 100644
index bb16a2d..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat50ServerTestCase.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**********************************************************************
- * 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
- **********************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests;
-
-public class Tomcat50ServerTestCase extends AbstractTomcatServerTestCase {
- protected String getServerTypeId() {
- return "org.eclipse.jst.server.tomcat.50";
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat55RuntimeTestCase.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat55RuntimeTestCase.java
deleted file mode 100644
index 44bb45d..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat55RuntimeTestCase.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**********************************************************************
- * 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
- **********************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests;
-
-public class Tomcat55RuntimeTestCase extends AbstractTomcatRuntimeTestCase {
- protected String getRuntimeTypeId() {
- return "org.eclipse.jst.server.tomcat.runtime.55";
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat55ServerTestCase.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat55ServerTestCase.java
deleted file mode 100644
index dd3081c..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/Tomcat55ServerTestCase.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**********************************************************************
- * 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
- **********************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests;
-
-public class Tomcat55ServerTestCase extends AbstractTomcatServerTestCase {
- protected String getServerTypeId() {
- return "org.eclipse.jst.server.tomcat.55";
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/TomcatRuntimeTestCase.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/TomcatRuntimeTestCase.java
deleted file mode 100644
index 75fb685..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/TomcatRuntimeTestCase.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.server.tomcat.core.internal.ITomcatRuntime;
-import org.eclipse.jst.server.tomcat.core.internal.ITomcatRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.*;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class TomcatRuntimeTestCase extends TestCase {
- private static final String RUNTIME_TYPE_ID_32 = "org.eclipse.jst.server.tomcat.runtime.32";
- private static final String RUNTIME_TYPE_ID_40 = "org.eclipse.jst.server.tomcat.runtime.40";
- private static final String RUNTIME_TYPE_ID_41 = "org.eclipse.jst.server.tomcat.runtime.41";
- private static final String RUNTIME_TYPE_ID_50 = "org.eclipse.jst.server.tomcat.runtime.50";
- private static final String RUNTIME_TYPE_ID_55 = "org.eclipse.jst.server.tomcat.runtime.55";
-
- protected static IRuntime runtime;
- protected static ITomcatRuntime tomcatRuntime;
-
- public static Test suite() {
- return new OrderedTestSuite(TomcatRuntimeTestCase.class, "TomcatRuntimeTestCase");
- }
-
- protected IRuntimeWorkingCopy createRuntime(String runtimeTypeId) throws Exception {
- IRuntimeType rt = ServerCore.findRuntimeType(runtimeTypeId);
- IRuntimeWorkingCopy wc = rt.createRuntime("a", null);
- wc.setLocation(new Path("c://test"));
- return wc;
- }
-
- public void test00CreateRuntime() throws Exception {
- runtime = createRuntime(RUNTIME_TYPE_ID_32).save(false, null);
- assertTrue(!runtime.isWorkingCopy());
- }
-
- protected void validateRuntime() throws Exception {
- IStatus status = runtime.validate(null);
- assertTrue(!status.isOK());
- }
-
- protected void adaptRuntime() throws Exception {
- tomcatRuntime = (ITomcatRuntime) runtime.loadAdapter(ITomcatRuntime.class, null);
- assertNotNull(tomcatRuntime);
- assertNotNull(tomcatRuntime.getVMInstall());
- assertNotNull(tomcatRuntime.getRuntimeClasspath());
- }
-
- protected void modifyRuntime() throws Exception {
- IRuntimeWorkingCopy wc = runtime.createWorkingCopy();
- ITomcatRuntimeWorkingCopy trwc = (ITomcatRuntimeWorkingCopy) wc.loadAdapter(ITomcatRuntimeWorkingCopy.class, null);
- trwc.setVMInstall(null);
- wc.save(true, null);
- tomcatRuntime = (ITomcatRuntime) runtime.loadAdapter(ITomcatRuntime.class, null);
- assertNotNull(tomcatRuntime.getVMInstall());
- }
-
- protected void deleteRuntime() throws Exception {
- runtime.delete();
- runtime = null;
- tomcatRuntime = null;
- }
-
- public void test01ValidateRuntime() throws Exception {
- validateRuntime();
- }
-
- public void test02AdaptRuntime() throws Exception {
- adaptRuntime();
- }
-
- public void test03ModifyRuntime() throws Exception {
- modifyRuntime();
- }
-
- public void test04DeleteRuntime() throws Exception {
- deleteRuntime();
- }
-
- public void test10CreateRuntime() throws Exception {
- runtime = createRuntime(RUNTIME_TYPE_ID_40).save(false, null);
- assertTrue(!runtime.isWorkingCopy());
- }
-
- public void test11ValidateRuntime() throws Exception {
- validateRuntime();
- }
-
- public void test12AdaptRuntime() throws Exception {
- adaptRuntime();
- }
-
- public void test13ModifyRuntime() throws Exception {
- modifyRuntime();
- }
-
- public void test14DeleteRuntime() throws Exception {
- deleteRuntime();
- }
-
- public void test20CreateRuntime() throws Exception {
- runtime = createRuntime(RUNTIME_TYPE_ID_41).save(false, null);
- assertTrue(!runtime.isWorkingCopy());
- }
-
- public void test21ValidateRuntime() throws Exception {
- validateRuntime();
- }
-
- public void test22AdaptRuntime() throws Exception {
- adaptRuntime();
- }
-
- public void test23ModifyRuntime() throws Exception {
- modifyRuntime();
- }
-
- public void test24DeleteRuntime() throws Exception {
- deleteRuntime();
- }
-
- public void test30CreateRuntime() throws Exception {
- runtime = createRuntime(RUNTIME_TYPE_ID_50).save(false, null);
- assertTrue(!runtime.isWorkingCopy());
- }
-
- public void test31ValidateRuntime() throws Exception {
- validateRuntime();
- }
-
- public void test32AdaptRuntime() throws Exception {
- adaptRuntime();
- }
-
- public void test33ModifyRuntime() throws Exception {
- modifyRuntime();
- }
-
- public void test34DeleteRuntime() throws Exception {
- deleteRuntime();
- }
-
- public void test40CreateRuntime() throws Exception {
- runtime = createRuntime(RUNTIME_TYPE_ID_55).save(false, null);
- assertTrue(!runtime.isWorkingCopy());
- }
-
- public void test41ValidateRuntime() throws Exception {
- validateRuntime();
- }
-
- public void test42AdaptRuntime() throws Exception {
- adaptRuntime();
- }
-
- public void test43ModifyRuntime() throws Exception {
- modifyRuntime();
- }
-
- public void test44DeleteRuntime() throws Exception {
- deleteRuntime();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/internal/UtilTestCase.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/internal/UtilTestCase.java
deleted file mode 100644
index 2e1ec76..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/internal/UtilTestCase.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests.internal;
-
-import org.eclipse.jst.server.tomcat.core.internal.TomcatServerBehaviour;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class UtilTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(UtilTestCase.class, "UtilTestCase");
- }
-
- public void testArgMerge() {
- assertEquals("", TomcatServerBehaviour.mergeArguments("", new String[] { }));
- }
-
- public void testArgMerge2() {
- assertEquals("a=b", TomcatServerBehaviour.mergeArguments("", new String[] { "a=b"}));
- }
-
- public void testArgMerge3() {
- assertEquals("a=b c=d", TomcatServerBehaviour.mergeArguments("", new String[] { "a=b", "c=d" }));
- }
-
- public void testArgMerge4() {
- assertEquals("a=b c=d", TomcatServerBehaviour.mergeArguments("a=b", new String[] { "c=d" }));
- }
-
- public void testArgMerge5() {
- assertEquals("a=c", TomcatServerBehaviour.mergeArguments("a=b", new String[] { "a=c" }));
- }
-
- public void testArgMerge6() {
- assertEquals("a b=2 d e=3", TomcatServerBehaviour.mergeArguments("a b=c d", new String[] { "b=2", "e=3" }));
- }
-
- public void testArgMerge7() {
- assertEquals("a bb=c d b=2 e=3", TomcatServerBehaviour.mergeArguments("a bb=c d", new String[] { "b=2", "e=3" }));
- }
-
- public void testArgMerge8() {
- assertEquals("a", TomcatServerBehaviour.mergeArguments("a", new String[] { }));
- }
-
- public void testArgMerge9() {
- assertEquals("a b", TomcatServerBehaviour.mergeArguments("a", new String[] { "b" }));
- }
-
- public void testArgMerge10() {
- assertEquals("a b c d", TomcatServerBehaviour.mergeArguments("a b ", new String[] { "c", "d" }));
- }
-
- public void testArgMerge11() {
- assertEquals("a=b c=\"e\"", TomcatServerBehaviour.mergeArguments("a=b c=d", new String[] { "c=\"e\"" }));
- }
-
- public void testArgMerge12() {
- assertEquals("a=b c=\"e f\"", TomcatServerBehaviour.mergeArguments("a=b c=\"d e\"", new String[] { "c=\"e f\"" }));
- }
-
- public void testArgMerge13() {
- assertEquals("a=b -c \"e\"", TomcatServerBehaviour.mergeArguments("a=b -c d", new String[] { "-c \"e\"" }));
- }
-
- public void testArgMerge14() {
- assertEquals("a=b -c \"e f\"", TomcatServerBehaviour.mergeArguments("a=b -c \"d e\"", new String[] { "-c \"e f\"" }));
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/DeleteModuleTestCase.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/DeleteModuleTestCase.java
deleted file mode 100644
index 04c2f0f..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/DeleteModuleTestCase.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests.module;
-
-import org.eclipse.jst.server.tomcat.core.tests.OrderedTestSuite;
-import org.eclipse.jst.server.tomcat.core.tests.TomcatRuntimeTestCase;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class DeleteModuleTestCase extends TestCase {
- public static Test suite() {
- return new OrderedTestSuite(TomcatRuntimeTestCase.class, "DeleteModuleTestCase");
- }
-
- public void test0DeleteWebModule() throws Exception {
- ModuleHelper.deleteModule(ModuleTestCase.WEB_MODULE_NAME);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/ModuleHelper.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/ModuleHelper.java
deleted file mode 100644
index b2a66be..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/ModuleHelper.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests.module;
-
-import java.io.ByteArrayInputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public class ModuleHelper {
- public static void createModule(String name) throws Exception {
- IDataModel dataModel = DataModelFactory.createDataModel(new WebComponentCreationDataModelProvider());
- dataModel.setProperty(IComponentCreationDataModelProperties.COMPONENT_NAME, name);
- dataModel.setBooleanProperty(IJ2EEComponentCreationDataModelProperties.ADD_TO_EAR, false);
- dataModel.setIntProperty(IJ2EEComponentCreationDataModelProperties.COMPONENT_VERSION, 22); //J2EEVersionConstants.12);
- dataModel.getDefaultOperation().execute(new NullProgressMonitor(), null);
- dataModel.dispose();
- }
-
- public static void createWebContent(String name, int i) throws Exception {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- IFile file = project.getFile(new Path("WebContent").append("test" + i + ".html"));
- String content = "Hello!";
- ByteArrayInputStream in = new ByteArrayInputStream(content.getBytes());
- file.create(in, true, null);
- }
-
- public static void createXMLContent(String name, int i) throws Exception {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- IFile file = project.getFile(new Path("WebContent").append("test" + i + ".xml"));
- String content = "<book name='test'><isbn>299827698</isbn></book>";
- ByteArrayInputStream in = new ByteArrayInputStream(content.getBytes());
- file.create(in, true, null);
- }
-
- public static void createJavaContent(String name, int i) throws Exception {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- IFile file = project.getFile(new Path("JavaSource").append("Test" + i + ".java"));
- String content = "public class Test" + i + " { }";
- ByteArrayInputStream in = new ByteArrayInputStream(content.getBytes());
- file.create(in, true, null);
- }
-
- public static void deleteModule(String name) throws Exception {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- project.delete(true, null);
- }
-
- public static void buildIncremental() throws CoreException {
- ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
- boolean interrupted = true;
- while (interrupted) {
- try {
- Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD,
- new NullProgressMonitor());
- interrupted = false;
- } catch (InterruptedException e) {
- //
- }
- }
- }
-
- public static void buildFull() throws CoreException {
- ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, null);
- boolean interrupted = true;
- while (interrupted) {
- try {
- Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD,
- new NullProgressMonitor());
- interrupted = false;
- } catch (InterruptedException e) {
- //
- }
- }
- }
-
- public static void buildClean() throws CoreException {
- ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.CLEAN_BUILD, null);
- boolean interrupted = true;
- while (interrupted) {
- try {
- Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD,
- new NullProgressMonitor());
- interrupted = false;
- } catch (InterruptedException e) {
- //
- }
- }
- }
-
- public static IModule getModule(String name) throws Exception {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- IModule module = ServerUtil.getModule(project);
- if (module == null)
- throw new Exception("No module in Web project");
-
- return module;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/ModuleTestCase.java b/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/ModuleTestCase.java
deleted file mode 100644
index 319bab6..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/ModuleTestCase.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests.module;
-
-import org.eclipse.jst.server.tomcat.core.tests.OrderedTestSuite;
-import org.eclipse.jst.server.tomcat.core.tests.TomcatRuntimeTestCase;
-import org.eclipse.wst.server.core.IModule;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class ModuleTestCase extends TestCase {
- protected static final String WEB_MODULE_NAME = "MyWeb";
- public static IModule webModule;
-
- public static Test suite() {
- return new OrderedTestSuite(TomcatRuntimeTestCase.class, "ModuleTestCase");
- }
-
- public void test01CreateWebModule() throws Exception {
- ModuleHelper.createModule(WEB_MODULE_NAME);
- }
-
- public void test02CreateWebContent() throws Exception {
- ModuleHelper.createWebContent(WEB_MODULE_NAME, 0);
- }
-
- public void test04GetModule() throws Exception {
- ModuleHelper.buildFull();
- webModule = ModuleHelper.getModule(WEB_MODULE_NAME);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/test.xml b/tests/org.eclipse.jst.server.tomcat.core.tests/test.xml
deleted file mode 100644
index f7b1bef..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/test.xml
+++ /dev/null
@@ -1,51 +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.server.tomcat.core.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="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.jst.server.tomcat.core.tests.AllTests"/>
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <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.server.tomcat.tests.performance/.classpath b/tests/org.eclipse.jst.server.tomcat.tests.performance/.classpath
deleted file mode 100644
index ce61870..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="performance"/>
- <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.jst.server.tomcat.tests.performance/.cvsignore b/tests/org.eclipse.jst.server.tomcat.tests.performance/.cvsignore
deleted file mode 100644
index 8208382..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-performance.jar
-org.eclipse.jst.server.tomcat.tests.performance_1.0.0.jar
-build.xml
-temp.folder
-performancesrc.zip
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/.project b/tests/org.eclipse.jst.server.tomcat.tests.performance/.project
deleted file mode 100644
index 611ace0..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.server.tomcat.tests.performance</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.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.server.tomcat.tests.performance/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index cb3bc1b..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,47 +0,0 @@
-#Thu May 26 14:34:27 EDT 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.server.tomcat.tests.performance/META-INF/MANIFEST.MF
deleted file mode 100644
index f92396e..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Server Tomcat Performance Plug-in
-Bundle-SymbolicName: org.eclipse.jst.server.tomcat.tests.performance
-Bundle-Version: 1.0.0
-Bundle-ClassPath: performance.jar
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.server.tomcat.tests.performance.tomcat50
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.junit,
- org.eclipse.jdt.launching,
- org.eclipse.test.performance,
- org.eclipse.wst.server.core,
- org.eclipse.jst.server.tomcat.core,
- org.eclipse.wst.server.tests.performance,
- org.eclipse.wst.server.ui.tests,
- org.eclipse.jst.server.tomcat.core.tests,
- org.eclipse.core.resources,
- org.eclipse.wst.server.ui
-Eclipse-AutoStart: true
-Bundle-Vendor: Eclipse.org
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/about.html b/tests/org.eclipse.jst.server.tomcat.tests.performance/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/build.properties b/tests/org.eclipse.jst.server.tomcat.tests.performance/build.properties
deleted file mode 100644
index 8d30c49..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 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
-###############################################################################
-bin.includes = performance.jar,\
- plugin.xml,\
- test.xml,\
- META-INF/,\
- about.html
-source.performance.jar = performance/
-output.performance.jar = bin/
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AbstractTomcatServerTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AbstractTomcatServerTestCase.java
deleted file mode 100644
index 20ce4ab..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AbstractTomcatServerTestCase.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**********************************************************************
- * 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
- **********************************************************************/
-package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-
-import java.util.List;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.server.tomcat.core.internal.ITomcatConfigurationWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.internal.TomcatServer;
-import org.eclipse.jst.server.tomcat.core.tests.RuntimeLocation;
-import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
-import org.eclipse.wst.server.core.*;
-
-public abstract class AbstractTomcatServerTestCase extends TestCase {
- protected static IServer server;
-
- public static Test suite() {
- return new TestSuite(AbstractTomcatServerTestCase.class, "TomcatServerTestCase");
- }
-
- protected IServer getServer() throws Exception {
- if (server == null) {
- server = createServer();
-
- // test save all
- IServerWorkingCopy wc = server.createWorkingCopy();
- wc.saveAll(false, null);
- }
-
- return server;
- }
-
- protected abstract String getServerTypeId();
-
- public static void deleteServer() {
- if (server == null)
- return;
- try {
- server.getRuntime().delete();
- server.delete();
- } catch (Exception e) {
- // ignore
- }
- }
-
- protected IRuntime createRuntime() throws Exception {
- IServerType st = ServerCore.findServerType(getServerTypeId());
- IRuntimeWorkingCopy wc = st.getRuntimeType().createRuntime(null, null);
- wc.setLocation(new Path(RuntimeLocation.runtimeLocation));
- return wc.save(true, null);
- }
-
- public IServer createServer() throws Exception {
- IServerType st = ServerCore.findServerType(getServerTypeId());
- IRuntime runtime = createRuntime();
- IServerWorkingCopy wc = st.createServer(null, null, runtime, null);
-
- ServerPort[] ports = wc.getServerPorts(null);
- TomcatServer tomcatServer = (TomcatServer) wc.getAdapter(TomcatServer.class);
- ITomcatConfigurationWorkingCopy configuration = (ITomcatConfigurationWorkingCopy) tomcatServer.getServerConfiguration();
- // if no ports from the server, use the configuration
- if (ports == null || ports.length == 0) {
- List portsList = configuration.getServerPorts();
- if (portsList != null && portsList.size() > 0) {
- ports = (ServerPort[])portsList.toArray(new ServerPort[portsList.size()]);
- }
- }
- if (ports != null) {
- int size = ports.length;
- for (int i = 0; i < size; i++) {
- configuration.modifyServerPort(ports[i].getId(), 22100 + i);
- }
- }
-
- return wc.save(true, null);
- }
-
- public void testCreateServer() throws Exception {
- getServer();
- int size = CreateModulesTestCase.NUM_MODULES;
- IModule[] modules = new IModule[size];
- for (int i = 0; i < size; i++) {
- modules[i] = ModuleHelper.getModule(CreateModulesTestCase.WEB_MODULE_NAME + i);
- }
- IServerWorkingCopy wc = getServer().createWorkingCopy();
- wc.modifyModules(modules, null, null);
- wc.save(true, null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AddRemoveModulesWizard2TestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AddRemoveModulesWizard2TestCase.java
deleted file mode 100644
index c396ec6..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AddRemoveModulesWizard2TestCase.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.PerformanceTestCase;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.ui.tests.dialog.WizardTestCase;
-
-public class AddRemoveModulesWizard2TestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(AddRemoveModulesWizard2TestCase.class, "AddRemoveModulesWizardTestCase");
- }
-
- public void testAddRemoveModulesWizard() throws Exception {
- Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
- tagAsSummary("Add/remove modules wizard", dims);
-
- IModule module = ModuleHelper.getModule(CreateModulesTestCase.WEB_MODULE_NAME + "0");
-
- for (int i = 0; i < 5; i++) {
- startMeasuring();
- WizardTestCase.testRoS(module);
- stopMeasuring();
- }
- commitMeasurements();
- assertPerformance();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AddRemoveModulesWizardTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AddRemoveModulesWizardTestCase.java
deleted file mode 100644
index 05f8a60..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AddRemoveModulesWizardTestCase.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.PerformanceTestCase;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.ui.tests.dialog.WizardTestCase;
-
-public class AddRemoveModulesWizardTestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(AddRemoveModulesWizardTestCase.class, "AddRemoveModulesWizardTestCase");
- }
-
- public void testAddRemoveModulesWizard() throws Exception {
- Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
- tagAsSummary("Add/remove modules wizard", dims);
-
- IModule module = ModuleHelper.getModule(CreateModulesTestCase.WEB_MODULE_NAME + "0");
-
- startMeasuring();
- WizardTestCase.testRoS(module);
- stopMeasuring();
-
- commitMeasurements();
- assertPerformance();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AllTests.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AllTests.java
deleted file mode 100644
index b490af7..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AllTests.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jst.server.tomcat.core.tests.RuntimeLocation;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.jst.server.tomcat.tests.performance.tomcat50");
- //$JUnit-BEGIN$
- System.setProperty("wtp.autotest.noninteractive", "true");
-
- // Bug 107442 against Eclipse. Performance problem in Form based editors
- // because FormUtil.computeWrapSize() calls BreakIterator.getWordInstance(),
- // which takes 1.1s on the first load
-
- ResourcesPlugin.getWorkspace().getDescription().setAutoBuilding(false);
-
- suite.addTestSuite(CreateModulesTestCase.class);
- suite.addTestSuite(BuildFullTestCase.class);
-
- String s = System.getProperty("org.eclipse.jst.server.tomcat.50");
- //s = "D:\\Tools\\tomcat\\jakarta-tomcat-5.0.19";
- if (s != null && s.length() > 0) {
- RuntimeLocation.runtimeLocation = s;
-
- suite.addTestSuite(Tomcat50ServerTestCase.class);
-
- suite.addTestSuite(GetDelegateTestCase.class);
- suite.addTestSuite(OpenEditorTestCase.class);
- suite.addTestSuite(OpenEditorAgainTestCase.class);
- //suite.addTestSuite(ServerActionsTestCase.class);
- } else {
- System.err.println("Warning: Tomcat 5.0 not found - performance tests skipped");
- }
-
- suite.addTestSuite(CreateWebContentTestCase.class);
- suite.addTestSuite(CreateXMLContentTestCase.class);
- suite.addTestSuite(CreateJavaContentTestCase.class);
- suite.addTestSuite(BuildFullAgainTestCase.class);
- suite.addTestSuite(BuildCleanTestCase.class);
- suite.addTestSuite(BuildIncrementalTestCase.class);
- suite.addTestSuite(AddRemoveModulesWizardTestCase.class);
- suite.addTestSuite(AddRemoveModulesWizard2TestCase.class);
-
- if (s != null && s.length() > 0)
- suite.addTestSuite(PublishTestCase.class);
-
- suite.addTestSuite(DeleteModulesTestCase.class);
-
- AbstractTomcatServerTestCase.deleteServer();
-
- suite.addTestSuite(AutobuildTestCase.class);
- //ResourcesPlugin.getWorkspace().getDescription().setAutoBuilding(true);
-
- //$JUnit-END$
- return suite;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AutobuildTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AutobuildTestCase.java
deleted file mode 100644
index 82ce015..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AutobuildTestCase.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class AutobuildTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(AutobuildTestCase.class, "AutobuildTestCase");
- }
-
- public void testBuild() throws Exception {
- ResourcesPlugin.getWorkspace().getDescription().setAutoBuilding(true);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildCleanTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildCleanTestCase.java
deleted file mode 100644
index 5ece148..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildCleanTestCase.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.PerformanceTestCase;
-
-public class BuildCleanTestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(BuildCleanTestCase.class, "BuildCleanTestCase");
- }
-
- public void testBuild() throws Exception {
- Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
- tagAsSummary("Build clean", dims);
-
- for (int i = 0; i < CreateModulesTestCase.NUM_BUILDS; i++) {
- startMeasuring();
- ModuleHelper.buildClean();
- stopMeasuring();
- }
-
- commitMeasurements();
- assertPerformance();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildFullAgainTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildFullAgainTestCase.java
deleted file mode 100644
index c37b840..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildFullAgainTestCase.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.PerformanceTestCase;
-
-public class BuildFullAgainTestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(BuildFullAgainTestCase.class, "BuildFullAgainTestCase");
- }
-
- public void testBuild() throws Exception {
- Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
- tagAsSummary("Build full again", dims);
-
- for (int i = 0; i < CreateModulesTestCase.NUM_BUILDS; i++) {
- startMeasuring();
- ModuleHelper.buildFull();
- stopMeasuring();
- }
-
- commitMeasurements();
- assertPerformance();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildFullTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildFullTestCase.java
deleted file mode 100644
index 96355c4..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildFullTestCase.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.PerformanceTestCase;
-
-public class BuildFullTestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(BuildFullTestCase.class, "BuildFullTestCase");
- }
-
- public void testBuild() throws Exception {
- Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
- tagAsSummary("Build full", dims);
-
- for (int i = 0; i < CreateModulesTestCase.NUM_BUILDS; i++) {
- startMeasuring();
- ModuleHelper.buildFull();
- stopMeasuring();
- }
-
- commitMeasurements();
- assertPerformance();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildIncrementalTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildIncrementalTestCase.java
deleted file mode 100644
index 10fdb1a..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/BuildIncrementalTestCase.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.PerformanceTestCase;
-
-public class BuildIncrementalTestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(BuildIncrementalTestCase.class, "BuildIncrementalTestCase");
- }
-
- public void testBuild() throws Exception {
- Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
- tagAsSummary("Build incremental", dims);
-
- for (int i = 0; i < CreateModulesTestCase.NUM_BUILDS; i++) {
- startMeasuring();
- ModuleHelper.buildIncremental();
- stopMeasuring();
- }
-
- commitMeasurements();
- assertPerformance();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateJavaContentTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateJavaContentTestCase.java
deleted file mode 100644
index 1fe8f6b..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateJavaContentTestCase.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
-
-public class CreateJavaContentTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(CreateJavaContentTestCase.class, "CreateJavaContentTestCase");
- }
-
- public void testCreateModuleJavaContent() throws Exception {
- for (int i = 0; i < CreateModulesTestCase.NUM_MODULES; i++) {
- final int ii = i;
- ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- try {
- for (int j = 0; j < CreateModulesTestCase.NUM_RESOURCES; j++)
- ModuleHelper.createJavaContent(CreateModulesTestCase.WEB_MODULE_NAME + ii, j);
- } catch (Exception e) {
- e.printStackTrace();
- throw new CoreException(new Status(IStatus.ERROR, null, 0, "Error creating resources", e));
- }
- }
- }, null);
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateModulesTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateModulesTestCase.java
deleted file mode 100644
index bdc0606..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateModulesTestCase.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.PerformanceTestCase;
-
-public class CreateModulesTestCase extends PerformanceTestCase {
- protected static final String WEB_MODULE_NAME = "WebModule";
- protected static final int NUM_MODULES = 25;
- protected static final int NUM_RESOURCES = 500;
- protected static final int NUM_BUILDS = 10;
-
- public static Test suite() {
- return new TestSuite(CreateModulesTestCase.class, "CreateModulesTestCase");
- }
-
- public void testCreateModules() throws Exception {
- Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
- tagAsSummary("Create web modules", dims);
-
- for (int i = 0; i < NUM_MODULES; i++) {
- startMeasuring();
-
- ModuleHelper.createModule(WEB_MODULE_NAME + i);
-
- stopMeasuring();
- }
- commitMeasurements();
- assertPerformance();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateWebContentTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateWebContentTestCase.java
deleted file mode 100644
index 2d4e490..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateWebContentTestCase.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
-
-public class CreateWebContentTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(CreateWebContentTestCase.class, "CreateWebContentTestCase");
- }
-
- public void testCreateWebModuleContent() throws Exception {
- for (int i = 0; i < CreateModulesTestCase.NUM_MODULES; i++) {
- final int ii = i;
- ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- try {
- for (int j = 0; j < CreateModulesTestCase.NUM_RESOURCES; j++)
- ModuleHelper.createWebContent(CreateModulesTestCase.WEB_MODULE_NAME + ii, j);
- } catch (Exception e) {
- e.printStackTrace();
- throw new CoreException(new Status(IStatus.ERROR, null, 0, "Error creating resources", e));
- }
- }
- }, null);
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateXMLContentTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateXMLContentTestCase.java
deleted file mode 100644
index 51a9a23..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateXMLContentTestCase.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
-
-public class CreateXMLContentTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(CreateXMLContentTestCase.class, "CreateXMLContentTestCase");
- }
-
- public void testCreateWebModuleContent() throws Exception {
- for (int i = 0; i < CreateModulesTestCase.NUM_MODULES; i++) {
- final int ii = i;
- ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- try {
- for (int j = 0; j < CreateModulesTestCase.NUM_RESOURCES; j++)
- ModuleHelper.createXMLContent(CreateModulesTestCase.WEB_MODULE_NAME + ii, j);
- } catch (Exception e) {
- e.printStackTrace();
- throw new CoreException(new Status(IStatus.ERROR, null, 0, "Error creating resources", e));
- }
- }
- }, null);
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/DeleteModulesTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/DeleteModulesTestCase.java
deleted file mode 100644
index 17c37b5..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/DeleteModulesTestCase.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.PerformanceTestCase;
-
-public class DeleteModulesTestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(DeleteModulesTestCase.class, "DeleteModulesTestCase");
- }
-
- public void testDeleteModules() throws Exception {
- Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
- tagAsSummary("Delete modules", dims);
-
- for (int i = 0; i < CreateModulesTestCase.NUM_MODULES; i++) {
- startMeasuring();
- ModuleHelper.deleteModule(CreateModulesTestCase.WEB_MODULE_NAME + i);
- stopMeasuring();
- }
-
- commitMeasurements();
- assertPerformance();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/GetDelegateTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/GetDelegateTestCase.java
deleted file mode 100644
index ae1b3d4..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/GetDelegateTestCase.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-
-import java.io.File;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.server.tomcat.core.internal.ITomcatRuntimeWorkingCopy;
-import org.eclipse.jst.server.tomcat.core.tests.RuntimeLocation;
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.tests.performance.common.AbstractGetDelegateTestCase;
-public class GetDelegateTestCase extends AbstractGetDelegateTestCase {
- public static Test suite() {
- return new TestSuite(GetDelegateTestCase.class, "GetDelegateTestCase");
- }
-
- public void testGetDelegate() throws Exception {
- Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
- tagAsSummary("Create Tomcat runtime", dims);
- super.testGetDelegate();
- }
-
- protected IRuntimeWorkingCopy createRuntime(String runtimeTypeId, String runtimeTypeLocation) throws CoreException {
- if (runtimeTypeId == null)
- throw new IllegalArgumentException();
- IRuntimeWorkingCopy runtimeCopy = ServerCore.findRuntimeType(runtimeTypeId).createRuntime(runtimeTypeId, null);
- runtimeCopy.setLocation(new Path(runtimeTypeLocation));
- runtimeCopy.setReadOnly(false);
- IVMInstall vmInstall = JavaRuntime.getDefaultVMInstall();
- ITomcatRuntimeWorkingCopy rwc = (ITomcatRuntimeWorkingCopy) runtimeCopy.loadAdapter(ITomcatRuntimeWorkingCopy.class, new NullProgressMonitor());
- rwc.setVMInstall(vmInstall);
- runtimeCopy.save(false, null);
- return runtimeCopy;
- }
-
- protected String getRuntimeTypeId() {
- return "org.eclipse.jst.server.tomcat.runtime.50";
- }
-
- protected String getRuntimeTypeLocation() {
- assertNotNull(RuntimeLocation.runtimeLocation);
- assertTrue((new File(RuntimeLocation.runtimeLocation)).exists());
- return RuntimeLocation.runtimeLocation;
- }
-
- protected String getServerTypeId() {
- return "org.eclipse.jst.server.tomcat.50";
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/OpenEditorAgainTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/OpenEditorAgainTestCase.java
deleted file mode 100644
index 48a9447..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/OpenEditorAgainTestCase.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.tests.performance.common.AbstractOpenEditorTestCase;
-import org.eclipse.wst.server.ui.internal.editor.ServerEditorInput;
-
-public class OpenEditorAgainTestCase extends AbstractOpenEditorTestCase {
- public static Test suite() {
- return new TestSuite(OpenEditorAgainTestCase.class, "OpenEditorAgainTestCase");
- }
-
- public void testOpenEditor() throws Exception {
- Dimension[] dims = new Dimension[] { Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP };
- tagAsSummary("Open Tomcat editor again", dims);
-
- for (int i = 0; i < 5; i++) {
- startMeasuring();
- IServer server = getFirstServer(getServerTypeId());
- IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- IEditorPart editor = page.openEditor(new ServerEditorInput(server.getId()), SERVER_EDITOR_ID, true);
- stopMeasuring();
- page.closeEditor(editor, false);
- }
-
- commitMeasurements();
- assertPerformance();
- }
-
- protected String getServerTypeId() {
- return "org.eclipse.jst.server.tomcat.50";
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/OpenEditorTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/OpenEditorTestCase.java
deleted file mode 100644
index 3981fd7..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/OpenEditorTestCase.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.wst.server.tests.performance.common.AbstractOpenEditorTestCase;
-
-public class OpenEditorTestCase extends AbstractOpenEditorTestCase {
- public static Test suite() {
- return new TestSuite(OpenEditorTestCase.class, "OpenEditorTestCase");
- }
-
- public void testOpenEditor() throws Exception {
- Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
- tagAsSummary("Open Tomcat editor", dims);
- super.testOpenEditor();
- }
-
- protected String getServerTypeId() {
- return "org.eclipse.jst.server.tomcat.50";
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/PublishTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/PublishTestCase.java
deleted file mode 100644
index 20165d0..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/PublishTestCase.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.server.tomcat.core.tests.module.ModuleHelper;
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.PerformanceTestCase;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-
-public class PublishTestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(PublishTestCase.class, "PublishTestCase");
- }
-
- public void testOpenEditor() throws Exception {
- Dimension[] dims = new Dimension[] { Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP };
- tagAsSummary("Publish to Tomcat", dims);
-
- IServer server = AbstractTomcatServerTestCase.server;
- IServerWorkingCopy wc = server.createWorkingCopy();
-
- int size = CreateModulesTestCase.NUM_MODULES;
- IModule[] modules = new IModule[size];
- for (int i = 0; i < size; i++)
- modules[i] = ModuleHelper.getModule(CreateModulesTestCase.WEB_MODULE_NAME + i);
-
- wc.modifyModules(modules, null, null);
- wc.save(true, null);
-
- startMeasuring();
- server.publish(IServer.PUBLISH_FULL, null);
- stopMeasuring();
-
- commitMeasurements();
- assertPerformance();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/Tomcat50ServerTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/Tomcat50ServerTestCase.java
deleted file mode 100644
index e9d385d..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/Tomcat50ServerTestCase.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**********************************************************************
- * 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
- **********************************************************************/
-package org.eclipse.jst.server.tomcat.tests.performance.tomcat50;
-
-public class Tomcat50ServerTestCase extends AbstractTomcatServerTestCase {
- protected String getServerTypeId() {
- return "org.eclipse.jst.server.tomcat.50";
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/test.xml b/tests/org.eclipse.jst.server.tomcat.tests.performance/test.xml
deleted file mode 100644
index f3be2da..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/test.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="performance" 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}\..\.."/>
-
- <!-- sets the properties eclipse-home, and library-file -->
- <property name="plugin-name" value="org.eclipse.jst.server.tomcat.tests.performance"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
- <property name="perf-tests-file" value="${testDir}/performance-tests.xml"/>
- <property name="extraVMargs" value="-Dorg.eclipse.jst.server.tomcat.50=${testDir}/${tomcat50Dir}"/>
-
- <property name="workspace" value="${eclipse-home}/workspace_servertomcat_performance"/>
-
- <!-- 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.server.tomcat.*.xml"/>
- </delete>
- </target>
-
- <!-- This target defines the performance tests that need to be run. -->
- <target name="performance_suite">
-
- <antcall target="AllTests"/>
- <antcall target="AllTests"/>
- <antcall target="AllTests"/>
- <antcall target="AllTests"/>
- <antcall target="AllTests"/>
-
- </target>
-
- <target name="AllTests">
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.server.tomcat.tests.performance.tomcat50.AllTests"/>
- <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">
- <delete dir="${workspace}" quiet="true"/>
- </target>
-
- <!-- This target runs the performance test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="performance" depends="init,performance_suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org.eclipse.jst.server.tomcat.*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-
-</project>
diff --git a/tests/org.eclipse.jst.server.tomcat.ui.tests/.classpath b/tests/org.eclipse.jst.server.tomcat.ui.tests/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.jst.server.tomcat.ui.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <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.jst.server.tomcat.ui.tests/.cvsignore b/tests/org.eclipse.jst.server.tomcat.ui.tests/.cvsignore
deleted file mode 100644
index 6c1b57a..0000000
--- a/tests/org.eclipse.jst.server.tomcat.ui.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-tests.jar
-testssrc.zip
diff --git a/tests/org.eclipse.jst.server.tomcat.ui.tests/.project b/tests/org.eclipse.jst.server.tomcat.ui.tests/.project
deleted file mode 100644
index 43ba7b0..0000000
--- a/tests/org.eclipse.jst.server.tomcat.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.server.tomcat.ui.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.server.tomcat.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.server.tomcat.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d05825e..0000000
--- a/tests/org.eclipse.jst.server.tomcat.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,47 +0,0 @@
-#Wed May 25 10:52:36 EDT 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/tests/org.eclipse.jst.server.tomcat.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.server.tomcat.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 1b730c9..0000000
--- a/tests/org.eclipse.jst.server.tomcat.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.jst.server.tomcat.ui.tests
-Bundle-SymbolicName: org.eclipse.jst.server.tomcat.ui.tests
-Bundle-Version: 1.0.0
-Bundle-ClassPath: tests.jar
-Bundle-Activator: org.eclipse.jst.server.tomcat.ui.tests.TestsPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.server.tomcat.ui.tests
-Require-Bundle: org.eclipse.core.runtime,
- org.junit,
- org.eclipse.ui,
- org.eclipse.wst.server.core,
- org.eclipse.wst.server.ui,
- org.eclipse.jst.server.tomcat.core,
- org.eclipse.jst.server.tomcat.ui,
- org.eclipse.wst.server.core.tests,
- org.eclipse.wst.server.ui.tests,
- org.eclipse.jst.server.tomcat.core.tests
-Eclipse-AutoStart: true
diff --git a/tests/org.eclipse.jst.server.tomcat.ui.tests/about.html b/tests/org.eclipse.jst.server.tomcat.ui.tests/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.jst.server.tomcat.ui.tests/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.ui.tests/build.properties b/tests/org.eclipse.jst.server.tomcat.ui.tests/build.properties
deleted file mode 100644
index cad94f3..0000000
--- a/tests/org.eclipse.jst.server.tomcat.ui.tests/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 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
-###############################################################################
-bin.includes = plugin.xml,\
- test.xml,\
- tests.jar,\
- META-INF/,\
- about.html
-jars.compile.order = tests.jar
-source.tests.jar = src/
-output.tests.jar = bin/
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/AllTests.java b/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/AllTests.java
deleted file mode 100644
index f703fee..0000000
--- a/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/AllTests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.ui.tests;
-
-import org.eclipse.jst.server.tomcat.core.tests.RuntimeLocation;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.jst.server.tomcat.ui.tests");
- //$JUnit-BEGIN$
- suite.addTestSuite(ExistenceTest.class);
- String s = System.getProperty("tomcat50Dir");
- //s = "D:\\Tools\\tomcat\\jakarta-tomcat-3.2.4";
- if (s != null && s.length() > 0) {
- RuntimeLocation.runtimeLocation = s;
- suite.addTestSuite(OpenEditorTestCase.class);
- }
- suite.addTestSuite(DialogsTestCase.class);
- //$JUnit-END$
- return suite;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/DialogsTestCase.java b/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/DialogsTestCase.java
deleted file mode 100644
index 5101812..0000000
--- a/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/DialogsTestCase.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.ui.tests;
-
-import org.eclipse.jst.server.tomcat.ui.internal.editor.MimeMappingDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import junit.framework.TestCase;
-
-public class DialogsTestCase extends TestCase {
- private Shell getShell() {
- return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- }
-
- public void testMimeMappingDialog() {
- MimeMappingDialog mmd = new MimeMappingDialog(getShell());
- UITestHelper.assertDialog(mmd);
- }
-
- /*public void testWebModuleDialog() {
- WebModuleDialog wmd = new WebModuleDialog(getShell(), null, null, null, true);
- UITestHelper.assertDialog(wmd);
- }*/
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/ExistenceTest.java b/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/ExistenceTest.java
deleted file mode 100644
index 004cee8..0000000
--- a/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/ExistenceTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.ui.tests;
-
-import org.eclipse.jst.server.tomcat.ui.internal.TomcatUIPlugin;
-import junit.framework.TestCase;
-
-public class ExistenceTest extends TestCase {
- public void testPluginExists() {
- assertNotNull(TomcatUIPlugin.getInstance());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/OpenEditorTestCase.java b/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/OpenEditorTestCase.java
deleted file mode 100644
index 1d118b2..0000000
--- a/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/OpenEditorTestCase.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**********************************************************************
- * 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
- **********************************************************************/
-package org.eclipse.jst.server.tomcat.ui.tests;
-
-import org.eclipse.jst.server.tomcat.core.tests.Tomcat50ServerTestCase;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.ui.tests.AbstractOpenEditorTestCase;
-
-public class OpenEditorTestCase extends AbstractOpenEditorTestCase {
- public IServer getServer() throws Exception {
- return new Tomcat50ServerTestCase().createServer();
- }
-
- public void releaseServer(IServer server) throws Exception {
- server.delete();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/OrderedTestSuite.java b/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/OrderedTestSuite.java
deleted file mode 100644
index 011616c..0000000
--- a/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/OrderedTestSuite.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.ui.tests;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Vector;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-class OrderedTestSuite extends TestSuite{
- public OrderedTestSuite(Class theClass, String name) {
- this(theClass);
- setName(name);
- }
-
- public OrderedTestSuite(final Class theClass) {
- super();
- setName(theClass.getName());
- try {
- getTestConstructor(theClass); // Avoid generating multiple error messages
- } catch (NoSuchMethodException e) {
- addTest(warning("Class " + theClass.getName()
- + " has no public constructor TestCase(String name) or TestCase()"));
- return;
- }
- if (!Modifier.isPublic(theClass.getModifiers())) {
- addTest(warning("Class " + theClass.getName() + " is not public"));
- return;
- }
- Class superClass = theClass;
- Vector names = new Vector();
- while (Test.class.isAssignableFrom(superClass)) {
- Method[] methods = superClass.getDeclaredMethods();
- int size = methods.length;
- for (int i = 0; i < size - 1; i++) {
- for (int j = i + 1; j < size; j++) {
- if (methods[i].getName().compareTo(methods[j].getName()) > 0) {
- Method m = methods[i];
- methods[i] = methods[j];
- methods[j] = m;
- }
- }
- }
- for (int i = 0; i < size; i++) {
- addTestMethod(methods[i], names, theClass);
- }
- superClass = superClass.getSuperclass();
- }
- if (!tests().hasMoreElements())
- addTest(warning("No tests found in " + theClass.getName()));
- }
-
- private void addTestMethod(Method m, Vector names, Class theClass) {
- String name = m.getName();
- if (names.contains(name))
- return;
- if (!isPublicTestMethod(m)) {
- if (isTestMethod(m))
- addTest(warning("Test method isn't public: " + m.getName()));
- return;
- }
- names.addElement(name);
- addTest(createTest(theClass, name));
- }
-
- private boolean isPublicTestMethod(Method m) {
- return isTestMethod(m) && Modifier.isPublic(m.getModifiers());
- }
-
- private boolean isTestMethod(Method m) {
- String name = m.getName();
- Class[] parameters = m.getParameterTypes();
- Class returnType = m.getReturnType();
- return parameters.length == 0 && name.startsWith("test") && returnType.equals(Void.TYPE);
- }
-
- private Test warning(final String message) {
- return new TestCase("warning") {
- protected void runTest() {
- fail(message);
- }
- };
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/TestsPlugin.java b/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/TestsPlugin.java
deleted file mode 100644
index 89fcdf1..0000000
--- a/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/TestsPlugin.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.ui.tests;
-
-import org.eclipse.core.runtime.Plugin;
-/**
- *
- */
-public class TestsPlugin extends Plugin {
- /**
- * The constructor.
- */
- public TestsPlugin() {
- super();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/UITestHelper.java b/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/UITestHelper.java
deleted file mode 100644
index e94ef34..0000000
--- a/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/ui/tests/UITestHelper.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.ui.tests;
-
-import java.util.Iterator;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.IPreferenceNode;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.eclipse.ui.internal.dialogs.PropertyDialog;
-import org.eclipse.ui.internal.dialogs.PropertyPageContributorManager;
-import org.eclipse.ui.internal.dialogs.PropertyPageManager;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-
-public class UITestHelper {
- private static class PreferenceDialogWrapper extends PreferenceDialog {
- public PreferenceDialogWrapper(Shell parentShell, PreferenceManager manager) {
- super(parentShell, manager);
- }
- protected boolean showPage(IPreferenceNode node) {
- return super.showPage(node);
- }
- }
-
- private static class PropertyDialogWrapper extends PropertyDialog {
- public PropertyDialogWrapper(Shell parentShell, PreferenceManager manager, ISelection selection) {
- super(parentShell, manager, selection);
- }
- protected boolean showPage(IPreferenceNode node) {
- return super.showPage(node);
- }
- }
-
- protected static Shell getShell() {
- return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- }
-
- public static PreferenceDialog getPreferenceDialog(String id) {
- PreferenceDialogWrapper dialog = null;
- PreferenceManager manager = WorkbenchPlugin.getDefault().getPreferenceManager();
- if (manager != null) {
- dialog = new PreferenceDialogWrapper(getShell(), manager);
- dialog.create();
-
- for (Iterator iterator = manager.getElements(PreferenceManager.PRE_ORDER).iterator();
- iterator.hasNext();)
- {
- IPreferenceNode node = (IPreferenceNode)iterator.next();
- if ( node.getId().equals(id) ) {
- dialog.showPage(node);
- break;
- }
- }
- }
- return dialog;
- }
-
- public static PropertyDialog getPropertyDialog(String id, IAdaptable element) {
- PropertyDialogWrapper dialog = null;
-
- PropertyPageManager manager = new PropertyPageManager();
- String title = "";
- String name = "";
-
- // load pages for the selection
- // fill the manager with contributions from the matching contributors
- PropertyPageContributorManager.getManager().contribute(manager, element);
-
- IWorkbenchAdapter adapter = (IWorkbenchAdapter)element.getAdapter(IWorkbenchAdapter.class);
- if (adapter != null) {
- name = adapter.getLabel(element);
- }
-
- // testing if there are pages in the manager
- Iterator pages = manager.getElements(PreferenceManager.PRE_ORDER).iterator();
- if (!pages.hasNext())
- return null;
-
-
- title = title = "Title: " + name;
- dialog = new PropertyDialogWrapper(getShell(), manager, new StructuredSelection(element));
- dialog.create();
- dialog.getShell().setText(title);
- for (Iterator iterator = manager.getElements(PreferenceManager.PRE_ORDER).iterator();
- iterator.hasNext();) {
- IPreferenceNode node = (IPreferenceNode)iterator.next();
- if ( node.getId().equals(id) ) {
- dialog.showPage(node);
- break;
- }
- }
- return dialog;
- }
-
- /**
- * Automated test that checks all the labels and buttons of a dialog
- * to make sure there is enough room to display all the text. Any
- * text that wraps is only approximated and is currently not accurate.
- *
- * @param dialog the test dialog to be verified.
- */
- public static void assertDialog(Dialog dialog) {
- Assert.assertNotNull(dialog);
- dialog.setBlockOnOpen(false);
- dialog.open();
- Shell shell = dialog.getShell();
- verifyCompositeText(shell);
- dialog.close();
- }
-
- /*
- * Looks at all the child widgets of a given composite and
- * verifies the text on all labels and widgets.
- * @param composite The composite to look through
- */
- private static void verifyCompositeText(Composite composite) {
- Control children[] = composite.getChildren();
- for (int i = 0; i < children.length; i++) {
- try {
- //verify the text if the child is a button
- verifyButtonText((Button) children[i]);
- } catch (ClassCastException exNotButton) {
- try {
- //child is not a button, maybe a label
- verifyLabelText((Label) children[i]);
- } catch (ClassCastException exNotLabel) {
- try {
- //child is not a label, make a recursive call if it is a composite
- verifyCompositeText((Composite) children[i]);
- } catch (ClassCastException exNotComposite) {
- //the child is not a button, label, or composite - ignore it.
- }
- }
- }
- }
- }
-
- /*
- * Verifies that a given button is large enough to display its text.
- * @param button The button to verify,
- */
- private static void verifyButtonText(Button button) {
- String widget = button.toString();
- Point size = button.getSize();
-
- // compute the size with no line wrapping
- Point preferred = button.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- //if (size.y/preferred.y) == X, then label spans X lines, so divide
- //the calculated value of preferred.x by X
- if (preferred.y * size.y > 0) {
- preferred.y /= countLines(button.getText()); //check for '\n\'
- if (size.y / preferred.y > 1) {
- preferred.x /= (size.y / preferred.y);
- }
- }
-
- String message =
- new StringBuffer("Warning: ")
- .append(widget)
- .append("\n\tActual Width -> ")
- .append(size.x)
- .append("\n\tRecommended Width -> ")
- .append(preferred.x)
- .toString();
- if (preferred.x > size.x) {
- //close the dialog
- button.getShell().dispose();
- Assert.assertTrue(message.toString(), false);
- }
- }
-
- /*
- * Verifies that a given label is large enough to display its text.
- * @param label The label to verify,
- */
- private static void verifyLabelText(Label label) {
- String widget = label.toString();
- Point size = label.getSize();
-
- // compute the size with no line wrapping
- Point preferred = label.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- //if (size.y/preferred.y) == X, then label spans X lines, so divide
- //the calculated value of preferred.x by X
- if (preferred.y * size.y > 0) {
- preferred.y /= countLines(label.getText());
- if (size.y / preferred.y > 1) {
- preferred.x /= (size.y / preferred.y);
- }
- }
- String message = new StringBuffer("Warning: ").append(widget)
- .append("\n\tActual Width -> ").append(size.x)
- .append("\n\tRecommended Width -> ").append(preferred.x).toString();
- if (preferred.x > size.x) {
- //close the dialog
- label.getShell().dispose();
- Assert.assertTrue(message.toString(), false);
- }
- }
-
- /*
- * Counts the number of lines in a given String.
- * For example, if a string contains one (1) newline character,
- * a value of two (2) would be returned.
- * @param text The string to look through.
- * @return int the number of lines in text.
- */
- private static int countLines(String text) {
- int newLines = 1;
- for (int i = 0; i < text.length(); i++) {
- if (text.charAt(i) == '\n') {
- newLines++;
- }
- }
- return newLines;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.tomcat.ui.tests/test.xml b/tests/org.eclipse.jst.server.tomcat.ui.tests/test.xml
deleted file mode 100644
index b6bd153..0000000
--- a/tests/org.eclipse.jst.server.tomcat.ui.tests/test.xml
+++ /dev/null
@@ -1,49 +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.server.tomcat.ui.tests"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
-
- <!-- 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="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.jst.server.tomcat.ui.tests.AllTests" />
- <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">
- </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.server.ui.tests/.classpath b/tests/org.eclipse.jst.server.ui.tests/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.jst.server.ui.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <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.jst.server.ui.tests/.cvsignore b/tests/org.eclipse.jst.server.ui.tests/.cvsignore
deleted file mode 100644
index 6c1b57a..0000000
--- a/tests/org.eclipse.jst.server.ui.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-tests.jar
-testssrc.zip
diff --git a/tests/org.eclipse.jst.server.ui.tests/.project b/tests/org.eclipse.jst.server.ui.tests/.project
deleted file mode 100644
index 4ed7c37..0000000
--- a/tests/org.eclipse.jst.server.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.server.ui.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.server.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.server.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 091815d..0000000
--- a/tests/org.eclipse.jst.server.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,47 +0,0 @@
-#Thu May 26 14:34:57 EDT 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/tests/org.eclipse.jst.server.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.server.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 0b8a122..0000000
--- a/tests/org.eclipse.jst.server.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.jst.server.ui.tests
-Bundle-SymbolicName: org.eclipse.jst.server.ui.tests
-Bundle-Version: 1.0.0
-Bundle-ClassPath: tests.jar
-Bundle-Activator: org.eclipse.jst.server.ui.tests.TestsPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.server.ui.tests
-Require-Bundle: org.eclipse.core.runtime,
- org.junit,
- org.eclipse.ui,
- org.eclipse.jst.server.ui
-Eclipse-AutoStart: true
diff --git a/tests/org.eclipse.jst.server.ui.tests/about.html b/tests/org.eclipse.jst.server.ui.tests/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.jst.server.ui.tests/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.ui.tests/build.properties b/tests/org.eclipse.jst.server.ui.tests/build.properties
deleted file mode 100644
index 310beba..0000000
--- a/tests/org.eclipse.jst.server.ui.tests/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 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
-###############################################################################
-bin.includes = plugin.xml,\
- test.xml,\
- tests.jar,\
- META-INF/,\
- about.html
-jars.compile.order = tests.jar
-source.tests.jar = src/
-output.tests.jar = bin/
diff --git a/tests/org.eclipse.jst.server.ui.tests/src/org/eclipse/jst/server/ui/tests/AllTests.java b/tests/org.eclipse.jst.server.ui.tests/src/org/eclipse/jst/server/ui/tests/AllTests.java
deleted file mode 100644
index 53aae12..0000000
--- a/tests/org.eclipse.jst.server.ui.tests/src/org/eclipse/jst/server/ui/tests/AllTests.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.ui.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.jst.server.ui.tests");
- //$JUnit-BEGIN$
- suite.addTestSuite(ExistenceTest.class);
- //$JUnit-END$
- return suite;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.ui.tests/src/org/eclipse/jst/server/ui/tests/ExistenceTest.java b/tests/org.eclipse.jst.server.ui.tests/src/org/eclipse/jst/server/ui/tests/ExistenceTest.java
deleted file mode 100644
index 6906d8a..0000000
--- a/tests/org.eclipse.jst.server.ui.tests/src/org/eclipse/jst/server/ui/tests/ExistenceTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.ui.tests;
-
-import org.eclipse.jst.server.ui.internal.JavaServerUIPlugin;
-import junit.framework.TestCase;
-
-public class ExistenceTest extends TestCase {
- public void testPluginExists() {
- assertNotNull(JavaServerUIPlugin.getInstance());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.ui.tests/src/org/eclipse/jst/server/ui/tests/OrderedTestSuite.java b/tests/org.eclipse.jst.server.ui.tests/src/org/eclipse/jst/server/ui/tests/OrderedTestSuite.java
deleted file mode 100644
index 1295ca7..0000000
--- a/tests/org.eclipse.jst.server.ui.tests/src/org/eclipse/jst/server/ui/tests/OrderedTestSuite.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.ui.tests;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Vector;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-class OrderedTestSuite extends TestSuite{
- public OrderedTestSuite(Class theClass, String name) {
- this(theClass);
- setName(name);
- }
-
- public OrderedTestSuite(final Class theClass) {
- super();
- setName(theClass.getName());
- try {
- getTestConstructor(theClass); // Avoid generating multiple error messages
- } catch (NoSuchMethodException e) {
- addTest(warning("Class " + theClass.getName()
- + " has no public constructor TestCase(String name) or TestCase()"));
- return;
- }
- if (!Modifier.isPublic(theClass.getModifiers())) {
- addTest(warning("Class " + theClass.getName() + " is not public"));
- return;
- }
- Class superClass = theClass;
- Vector names = new Vector();
- while (Test.class.isAssignableFrom(superClass)) {
- Method[] methods = superClass.getDeclaredMethods();
- int size = methods.length;
- for (int i = 0; i < size - 1; i++) {
- for (int j = i + 1; j < size; j++) {
- if (methods[i].getName().compareTo(methods[j].getName()) > 0) {
- Method m = methods[i];
- methods[i] = methods[j];
- methods[j] = m;
- }
- }
- }
- for (int i = 0; i < size; i++) {
- addTestMethod(methods[i], names, theClass);
- }
- superClass = superClass.getSuperclass();
- }
- if (!tests().hasMoreElements())
- addTest(warning("No tests found in " + theClass.getName()));
- }
-
- private void addTestMethod(Method m, Vector names, Class theClass) {
- String name = m.getName();
- if (names.contains(name))
- return;
- if (!isPublicTestMethod(m)) {
- if (isTestMethod(m))
- addTest(warning("Test method isn't public: " + m.getName()));
- return;
- }
- names.addElement(name);
- addTest(createTest(theClass, name));
- }
-
- private boolean isPublicTestMethod(Method m) {
- return isTestMethod(m) && Modifier.isPublic(m.getModifiers());
- }
-
- private boolean isTestMethod(Method m) {
- String name = m.getName();
- Class[] parameters = m.getParameterTypes();
- Class returnType = m.getReturnType();
- return parameters.length == 0 && name.startsWith("test") && returnType.equals(Void.TYPE);
- }
-
- private Test warning(final String message) {
- return new TestCase("warning") {
- protected void runTest() {
- fail(message);
- }
- };
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.ui.tests/src/org/eclipse/jst/server/ui/tests/TestsPlugin.java b/tests/org.eclipse.jst.server.ui.tests/src/org/eclipse/jst/server/ui/tests/TestsPlugin.java
deleted file mode 100644
index aa2d584..0000000
--- a/tests/org.eclipse.jst.server.ui.tests/src/org/eclipse/jst/server/ui/tests/TestsPlugin.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.jst.server.ui.tests;
-
-import org.eclipse.core.runtime.Plugin;
-/**
- *
- */
-public class TestsPlugin extends Plugin {
- /**
- * The constructor.
- */
- public TestsPlugin() {
- super();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.ui.tests/test.xml b/tests/org.eclipse.jst.server.ui.tests/test.xml
deleted file mode 100644
index c0cb61b..0000000
--- a/tests/org.eclipse.jst.server.ui.tests/test.xml
+++ /dev/null
@@ -1,49 +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.server.ui.tests"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
-
- <!-- 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="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.jst.server.ui.tests.AllTests" />
- <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">
- </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.wst.internet.monitor.core.tests/.classpath b/tests/org.eclipse.wst.internet.monitor.core.tests/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <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.internet.monitor.core.tests/.cvsignore b/tests/org.eclipse.wst.internet.monitor.core.tests/.cvsignore
deleted file mode 100644
index 4725bd5..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-monitortests.jar
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/.project b/tests/org.eclipse.wst.internet.monitor.core.tests/.project
deleted file mode 100644
index 968a828..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.internet.monitor.core.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.wst.internet.monitor.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.internet.monitor.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1cef3ce..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,49 +0,0 @@
-#Thu May 26 22:47:53 EDT 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.internet.monitor.core.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index e732216..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu May 26 22:47:53 EDT 2005
-eclipse.preferences.version=1
-internal.default.compliance=user
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.internet.monitor.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 3fc3085..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.wst.internet.monitor.core.tests
-Bundle-SymbolicName: org.eclipse.wst.internet.monitor.core.tests
-Bundle-Version: 1.0.0
-Bundle-ClassPath: monitortests.jar
-Bundle-Activator: org.eclipse.wst.internet.monitor.core.tests.TestsPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.internet.monitor.core.tests,
- org.eclipse.wst.internet.monitor.core.tests.extension
-Require-Bundle: org.eclipse.core.runtime,
- org.junit,
- org.eclipse.wst.internet.monitor.core
-Eclipse-AutoStart: true
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/about.html b/tests/org.eclipse.wst.internet.monitor.core.tests/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/build.properties b/tests/org.eclipse.wst.internet.monitor.core.tests/build.properties
deleted file mode 100644
index f073d07..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 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
-###############################################################################
-bin.includes = plugin.xml,\
- test.xml,\
- monitortests.jar,\
- META-INF/,\
- about.html
-jars.compile.order = monitortests.jar
-source.monitortests.jar = src/
-output.monitortests.jar = bin/
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/AllTests.java b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/AllTests.java
deleted file mode 100644
index d492dee..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/AllTests.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.internet.monitor.core.tests;
-
-import org.eclipse.wst.internet.monitor.core.tests.extension.*;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.wst.internet.monitor.core.tests");
- //$JUnit-BEGIN$
- suite.addTestSuite(ExistenceTest.class);
- suite.addTestSuite(ContentFiltersTestCase.class);
- suite.addTest(new OrderedTestSuite(MonitorTestCase.class));
- suite.addTest(new OrderedTestSuite(MonitorListenerTestCase.class));
- suite.addTest(new OrderedTestSuite(RequestTestCase.class));
-
- suite.addTest(new OrderedTestSuite(ContentFilterTestCase.class));
- //$JUnit-END$
- return suite;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/ContentFilterTestCase.java b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/ContentFilterTestCase.java
deleted file mode 100644
index 1fcd9c6..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/ContentFilterTestCase.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.internet.monitor.core.tests;
-
-import org.eclipse.wst.internet.monitor.core.internal.provisional.ContentFilterDelegate;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class ContentFilterTestCase extends TestCase {
- protected static ContentFilterDelegate delegate;
-
- public static Test suite() {
- return new OrderedTestSuite(MonitorListenerTestCase.class, "MonitorTestCase");
- }
-
- public void test00Creation() {
- delegate = new TestContentFilterDelegate();
- }
-
- public void test01Filter() throws Exception {
- delegate.filter(null, false, null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/ExistenceTest.java b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/ExistenceTest.java
deleted file mode 100644
index de08cf4..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/ExistenceTest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.internet.monitor.core.tests;
-
-import org.eclipse.wst.internet.monitor.core.internal.provisional.MonitorCore;
-
-import junit.framework.TestCase;
-
-public class ExistenceTest extends TestCase {
- public void testPluginExists() {
- assertNotNull(MonitorCore.getMonitors());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/MonitorListenerTestCase.java b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/MonitorListenerTestCase.java
deleted file mode 100644
index 7ba5b1a..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/MonitorListenerTestCase.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.internet.monitor.core.tests;
-
-import org.eclipse.wst.internet.monitor.core.internal.provisional.*;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class MonitorListenerTestCase extends TestCase {
- private static IMonitor monitor;
-
- protected static IMonitor addEvent;
- protected static IMonitor changeEvent;
- protected static IMonitor removeEvent;
- protected static int count;
-
- protected static IMonitorListener listener2;
-
- protected static IMonitorListener listener = new IMonitorListener() {
- public void monitorAdded(IMonitor monitor2) {
- addEvent = monitor2;
- count++;
- }
-
- public void monitorChanged(IMonitor monitor2) {
- changeEvent = monitor2;
- count++;
- }
-
- public void monitorRemoved(IMonitor monitor2) {
- removeEvent = monitor2;
- count++;
- }
- };
-
- public MonitorListenerTestCase() {
- super();
- }
-
- public static Test suite() {
- return new OrderedTestSuite(MonitorListenerTestCase.class, "MonitorListenerTestCase");
- }
-
- public void test0AddListener() throws Exception {
- MonitorCore.addMonitorListener(listener);
- }
-
- public void test1AddListener() throws Exception {
- MonitorCore.addMonitorListener(listener);
- }
-
- public void test2AddListener() throws Exception {
- IMonitorWorkingCopy wc = MonitorCore.createMonitor();
- monitor = wc.save();
-
- assertTrue(addEvent == monitor);
- assertTrue(changeEvent == null);
- assertTrue(removeEvent == null);
- assertTrue(count == 1);
- addEvent = null;
- count = 0;
- }
-
- public void test3ChangeListener() throws Exception {
- IMonitorWorkingCopy wc = monitor.createWorkingCopy();
- wc.setLocalPort(1);
- monitor = wc.save();
-
- assertTrue(addEvent == null);
- assertTrue(changeEvent == monitor);
- assertTrue(removeEvent == null);
- assertTrue(count == 1);
- changeEvent = null;
- count = 0;
- }
-
- public void test4RemoveListener() throws Exception {
- monitor.delete();
-
- assertTrue(addEvent == null);
- assertTrue(changeEvent == null);
- assertTrue(removeEvent == monitor);
- assertTrue(count == 1);
- removeEvent = null;
- count = 0;
- }
-
- public void test5RemoveListener() throws Exception {
- MonitorCore.removeMonitorListener(listener);
- }
-
- public void test6RemoveListener() throws Exception {
- MonitorCore.removeMonitorListener(listener);
- }
-
- public void test7CheckListener() throws Exception {
- listener2 = new IMonitorListener() {
- public void monitorAdded(IMonitor monitor2) {
- // ignore
- }
-
- public void monitorChanged(IMonitor monitor2) {
- // ignore
- }
-
- public void monitorRemoved(IMonitor monitor2) {
- // ignore
- }
- };
-
- listener2.monitorAdded(null);
- listener2.monitorChanged(null);
- listener2.monitorRemoved(null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/MonitorTestCase.java b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/MonitorTestCase.java
deleted file mode 100644
index ab4e9d2..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/MonitorTestCase.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.internet.monitor.core.tests;
-
-import org.eclipse.wst.internet.monitor.core.internal.provisional.*;
-import junit.framework.Test;
-import junit.framework.TestCase;
-/**
- * Note: use ports between 22100-22200 to ensure they are free on the build machine.
- */
-public class MonitorTestCase extends TestCase {
- private static IMonitor monitor;
-
- public MonitorTestCase() {
- super();
- }
-
- public static Test suite() {
- return new OrderedTestSuite(MonitorListenerTestCase.class, "MonitorTestCase");
- }
-
- public void test00GetMonitors() throws Exception {
- assertNotNull(MonitorCore.getMonitors());
- }
-
- public void test01CreateMonitor() throws Exception {
- IMonitorWorkingCopy wc = MonitorCore.createMonitor();
- wc.setLocalPort(22150);
- wc.setRemoteHost("www.eclipse.org");
- wc.setRemotePort(80);
- monitor = wc.save();
-
- assertTrue(monitor != null);
- assertTrue(MonitorCore.getMonitors().length == 1);
- assertTrue(!monitor.isRunning());
- assertTrue(!monitor.isWorkingCopy());
- }
-
- public void test02GetMonitor() throws Exception {
- int count = 0;
- IMonitor[] monitors = MonitorCore.getMonitors();
- int size = monitors.length;
- for (int i = 0; i < size; i++) {
- if (monitor.equals(monitors[i]))
- count++;
- }
- assertTrue(count == 1);
- }
-
- public void test03StartMonitor() throws Exception {
- assertTrue(!monitor.isRunning());
- monitor.start();
- assertTrue(monitor.isRunning());
- }
-
- public void test04StartMonitor() throws Exception {
- assertTrue(monitor.isRunning());
- monitor.start();
- assertTrue(monitor.isRunning());
- }
-
- public void test05StartMonitor() throws Exception {
- try {
- IMonitorWorkingCopy wc = MonitorCore.createMonitor();
- wc.start();
- assertTrue("Should throw exception", false);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test06StartMonitor() throws Exception {
- try {
- IMonitorWorkingCopy wc = MonitorCore.createMonitor();
- IMonitor m = wc.save();
- m.delete();
- m.start();
- assertTrue("Should throw exception", false);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test07StopMonitor() throws Exception {
- assertTrue(monitor.isRunning());
- monitor.stop();
- assertTrue(!monitor.isRunning());
- }
-
- public void test08StopMonitor() throws Exception {
- assertTrue(!monitor.isRunning());
- monitor.stop();
- assertTrue(!monitor.isRunning());
- }
-
- public void test09RestartMonitor() throws Exception {
- assertTrue(!monitor.isRunning());
- monitor.start();
- assertTrue(monitor.isRunning());
- monitor.stop();
- assertTrue(!monitor.isRunning());
- }
-
- public void test10StopMonitor() throws Exception {
- try {
- IMonitorWorkingCopy wc = MonitorCore.createMonitor();
- wc.stop();
- assertTrue("Should throw exception", false);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test11StopMonitor() throws Exception {
- try {
- IMonitorWorkingCopy wc = MonitorCore.createMonitor();
- IMonitor m = wc.save();
- m.delete();
- m.stop();
- assertTrue("Should throw exception", false);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test12ValidateMonitor() throws Exception {
- assertTrue(monitor.validate().isOK());
- }
-
- public void test13ModifyMonitor() throws Exception {
- IMonitorWorkingCopy wc = monitor.createWorkingCopy();
- wc.setLocalPort(1);
- wc.setRemoteHost("a");
- wc.setRemotePort(2);
- IMonitor monitor2 = wc.save();
-
- assertTrue(monitor2 == monitor);
- assertTrue(monitor.getLocalPort() == 1);
- assertTrue(monitor.getRemoteHost().equals("a"));
- assertTrue(monitor.getRemotePort() == 2);
- }
-
- public void test14DeleteMonitor() throws Exception {
- monitor.delete();
- assertTrue(MonitorCore.getMonitors().length == 0);
- }
-
- public void test15DeleteMonitor() throws Exception {
- monitor.delete();
- }
-
- public void test16DeleteMonitor() throws Exception {
- IMonitorWorkingCopy wc = MonitorCore.createMonitor();
- wc.delete();
- }
-
- public void test17GetMonitor() throws Exception {
- int count = 0;
- IMonitor[] monitors = MonitorCore.getMonitors();
- int size = monitors.length;
- for (int i = 0; i < size; i++) {
- if (monitor.equals(monitors[i]))
- count++;
- }
- assertTrue(count == 0);
- }
-
- public void test18CreateMonitor() throws Exception {
- int num = MonitorCore.getMonitors().length;
- MonitorCore.createMonitor();
- assertTrue(MonitorCore.getMonitors().length == num);
- }
-
- public void test19CreateMonitor() {
- IMonitorWorkingCopy wc = MonitorCore.createMonitor();
- wc.setProtocol(null);
- assertNull(wc.getOriginal());
- }
-
- public void test20ValidateMonitor() throws Exception {
- IMonitorWorkingCopy wc = monitor.createWorkingCopy();
- wc.setLocalPort(-1);
- wc.setRemoteHost("www.eclipse.org");
- wc.setRemotePort(80);
- assertTrue(!wc.validate().isOK());
- }
-
- public void test21ValidateMonitor() throws Exception {
- IMonitorWorkingCopy wc = monitor.createWorkingCopy();
- wc.setLocalPort(80);
- wc.setRemoteHost("www.eclipse.org");
- wc.setRemotePort(-1);
- assertTrue(!wc.validate().isOK());
- }
-
- public void test22ValidateMonitor() throws Exception {
- IMonitorWorkingCopy wc = monitor.createWorkingCopy();
- wc.setLocalPort(8080);
- wc.setRemoteHost(null);
- wc.setRemotePort(80);
- assertTrue(!wc.validate().isOK());
- }
-
- public void test23ValidateMonitor() throws Exception {
- IMonitorWorkingCopy wc = monitor.createWorkingCopy();
- wc.setLocalPort(8080);
- wc.setRemoteHost("");
- wc.setRemotePort(80);
- assertTrue(!wc.validate().isOK());
- }
-
- public void test24ValidateMonitor() throws Exception {
- IMonitorWorkingCopy wc = monitor.createWorkingCopy();
- wc.setLocalPort(8080);
- wc.setRemoteHost(" ");
- wc.setRemotePort(80);
- assertTrue(!wc.validate().isOK());
- }
-
- public void test25ValidateMonitor() throws Exception {
- IMonitorWorkingCopy wc = monitor.createWorkingCopy();
- wc.setLocalPort(8080);
- wc.setRemoteHost("hi&bye");
- wc.setRemotePort(80);
- assertTrue(!wc.validate().isOK());
- }
-
- public void test26ValidateMonitor() throws Exception {
- IMonitorWorkingCopy wc = monitor.createWorkingCopy();
- wc.setLocalPort(8080);
- wc.setRemoteHost("xyz:");
- wc.setRemotePort(80);
- assertTrue(!wc.validate().isOK());
- }
-
- public void test27ValidateMonitor() throws Exception {
- IMonitorWorkingCopy wc = monitor.createWorkingCopy();
- wc.setLocalPort(80);
- wc.setRemoteHost("www.eclipse.org");
- wc.setRemotePort(80);
- assertTrue(wc.validate().isOK());
- }
-
- public void test28ValidateMonitor() throws Exception {
- IMonitorWorkingCopy wc = monitor.createWorkingCopy();
- wc.setLocalPort(80);
- wc.setRemoteHost("localhost");
- wc.setRemotePort(80);
- assertTrue(!wc.validate().isOK());
- }
-
- public void test29ValidateMonitor() throws Exception {
- IMonitorWorkingCopy wc = monitor.createWorkingCopy();
- wc.setLocalPort(80);
- wc.setRemoteHost("localhost");
- wc.setRemotePort(80);
- IMonitor monitor2 = wc.save();
- try {
- monitor2.start();
- assertTrue("Should throw exception", false);
- } catch (Exception e) {
- // ignore
- }
- monitor2.delete();
- }
-
- public void test30GetId() {
- monitor.getId();
- }
-
- public void test31GetProtocol() {
- assertNotNull(monitor.getProtocol());
- }
-
- public void test32CheckListener() throws Exception {
- IRequestListener listener2 = new IRequestListener() {
- public void requestAdded(IMonitor monitor2, Request request) {
- // ignore
- }
-
- public void requestChanged(IMonitor monitor2, Request request) {
- // ignore
- }
- };
-
- listener2.requestAdded(null, null);
- listener2.requestChanged(null, null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/OrderedTestSuite.java b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/OrderedTestSuite.java
deleted file mode 100644
index ee781b5..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/OrderedTestSuite.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.internet.monitor.core.tests;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Vector;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-class OrderedTestSuite extends TestSuite{
- public OrderedTestSuite(Class theClass, String name) {
- this(theClass);
- setName(name);
- }
-
- public OrderedTestSuite(final Class theClass) {
- super();
- setName(theClass.getName());
- try {
- getTestConstructor(theClass); // Avoid generating multiple error messages
- } catch (NoSuchMethodException e) {
- addTest(warning("Class " + theClass.getName()
- + " has no public constructor TestCase(String name) or TestCase()"));
- return;
- }
- if (!Modifier.isPublic(theClass.getModifiers())) {
- addTest(warning("Class " + theClass.getName() + " is not public"));
- return;
- }
- Class superClass = theClass;
- Vector names = new Vector();
- while (Test.class.isAssignableFrom(superClass)) {
- Method[] methods = superClass.getDeclaredMethods();
- int size = methods.length;
- for (int i = 0; i < size - 1; i++) {
- for (int j = i + 1; j < size; j++) {
- if (methods[i].getName().compareTo(methods[j].getName()) > 0) {
- Method m = methods[i];
- methods[i] = methods[j];
- methods[j] = m;
- }
- }
- }
- for (int i = 0; i < size; i++) {
- addTestMethod(methods[i], names, theClass);
- }
- superClass = superClass.getSuperclass();
- }
- if (!tests().hasMoreElements())
- addTest(warning("No tests found in " + theClass.getName()));
- }
-
- private void addTestMethod(Method m, Vector names, Class theClass) {
- String name = m.getName();
- if (names.contains(name))
- return;
- if (!isPublicTestMethod(m)) {
- if (isTestMethod(m))
- addTest(warning("Test method isn't public: " + m.getName()));
- return;
- }
- names.addElement(name);
- addTest(createTest(theClass, name));
- }
-
- private boolean isPublicTestMethod(Method m) {
- return isTestMethod(m) && Modifier.isPublic(m.getModifiers());
- }
-
- private boolean isTestMethod(Method m) {
- String name = m.getName();
- Class[] parameters = m.getParameterTypes();
- Class returnType = m.getReturnType();
- return parameters.length == 0 && name.startsWith("test") && returnType.equals(Void.TYPE);
- }
-
- private Test warning(final String message) {
- return new TestCase("warning") {
- protected void runTest() {
- fail(message);
- }
- };
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/RequestTestCase.java b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/RequestTestCase.java
deleted file mode 100644
index c82a546..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/RequestTestCase.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.internet.monitor.core.tests;
-
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import org.eclipse.wst.internet.monitor.core.internal.provisional.*;
-import junit.framework.Test;
-import junit.framework.TestCase;
-/**
- * Note: use ports between 22100-22200 to ensure they are free on the build machine.
- */
-public class RequestTestCase extends TestCase {
- private static IMonitor monitor;
-
- protected static IMonitor monitorEvent;
- protected static Request requestEvent;
- protected static int addCount;
- protected static int changeCount;
-
- protected static IRequestListener listener = new IRequestListener() {
- public void requestAdded(IMonitor monitor2, Request request2) {
- monitorEvent = monitor2;
- requestEvent = request2;
- addCount++;
- }
-
- public void requestChanged(IMonitor monitor2, Request request2) {
- monitorEvent = monitor2;
- requestEvent = request2;
- changeCount++;
- }
- };
-
- public RequestTestCase() {
- super();
- }
-
- public static Test suite() {
- return new OrderedTestSuite(RequestTestCase.class, "RequestTestCase");
- }
-
- public void test00GetMonitors() throws Exception {
- assertNotNull(MonitorCore.getMonitors());
- }
-
- public void test01CreateMonitor() throws Exception {
- IMonitorWorkingCopy wc = MonitorCore.createMonitor();
- wc.setLocalPort(22152);
- wc.setRemoteHost("www.eclipse.org");
- wc.setRemotePort(80);
- monitor = wc.save();
-
- assertTrue(monitor != null);
- assertTrue(MonitorCore.getMonitors().length == 1);
- assertTrue(!monitor.isRunning());
- assertTrue(!monitor.isWorkingCopy());
- }
-
- public void test03AddListener() throws Exception {
- monitor.addRequestListener(listener);
- }
-
- public void test04AddListener() throws Exception {
- monitor.addRequestListener(listener);
- }
-
- public void test05StartMonitor() throws Exception {
- assertTrue(!monitor.isRunning());
- monitor.start();
- assertTrue(monitor.isRunning());
- }
-
- public void test06Ping() throws Exception {
- URL url = new URL("http://localhost:22152/");
- //URL url = new URL("http://www.eclipse.org/");
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- conn.connect();
-
- // read the server's response
- System.out.println("Response from www.eclipse.org ----------------------------------");
- InputStream in = conn.getInputStream();
- byte[] b = new byte[256];
- int n = in.read(b);
- System.out.println(new String(b));
- while (n >= 0) {
- n = in.read(b);
- System.out.println(new String(b));
- }
- in.close();
- System.out.println("End of response from www.eclipse.org ---------------------------");
- }
-
- public void test07CheckListener() throws Exception {
- assertEquals(addCount, 1);
- assertEquals(monitorEvent, monitor);
- assertNotNull(requestEvent);
- }
-
- public void test08VerifyMonitor() throws Exception {
- assertEquals(requestEvent.getMonitor(), monitor);
- }
-
- public void test09VerifyProtocol() throws Exception {
- assertEquals(requestEvent.getProtocol(), "HTTP");
- }
-
- public void test10VerifyTime() throws Exception {
- // within a minute
- assertTrue(Math.abs(requestEvent.getDate().getTime() - System.currentTimeMillis()) < 1000 * 60);
- }
-
- public void test11VerifyLocalPort() throws Exception {
- assertEquals(requestEvent.getLocalPort(), 22152);
- }
-
- public void test12VerifyRemoteHost() throws Exception {
- assertEquals(requestEvent.getRemoteHost(), "www.eclipse.org");
- }
-
- public void test13VerifyRemotePort() throws Exception {
- assertEquals(requestEvent.getRemotePort(), 80);
- }
-
- public void test14VerifyRequest() throws Exception {
- assertNotNull(requestEvent.getRequest(Request.ALL));
- }
-
- public void test15VerifyResponse() throws Exception {
- assertNotNull(requestEvent.getResponse(Request.ALL));
- }
-
- public void test16VerifyResponseTime() throws Exception {
- assertTrue(requestEvent.getResponseTime() > 0);
- }
-
- public void test17CheckRequest() throws Exception {
- assertNotNull(requestEvent.getName());
- }
-
- public void test18CheckRequest() throws Exception {
- assertNull(requestEvent.getProperty("test"));
- }
-
- /*public void test19CheckRequest() throws Exception {
- assert(requestEvent.getProperty(""));
- }*/
-
- public void test19AddToRequest() throws Exception {
- requestEvent.addToRequest(new byte[0]);
- }
-
- public void test20AddToResponse() throws Exception {
- requestEvent.addToResponse(new byte[0]);
- }
-
- public void test21SetProperty() throws Exception {
- requestEvent.setProperty("test", null);
- }
-
- public void test22GetAdapter() throws Exception {
- assertNull(requestEvent.getAdapter(String.class));
- }
-
- public void test23StopMonitor() throws Exception {
- assertTrue(monitor.isRunning());
- monitor.stop();
- assertTrue(!monitor.isRunning());
- }
-
- public void test24RemoveListener() throws Exception {
- monitor.removeRequestListener(listener);
- }
-
- public void test25Create() {
- new Request(null, null, 0, null, 0);
- }
-
- public void test26TestProtectedMethods() {
- Request mr = new Request(null, null, 0, null, 0) {
- public Object getAdapter(Class c) {
- setName("test");
- setRequest(null);
- setResponse(null);
- fireChangedEvent();
- return null;
- }
- };
- mr.getAdapter(null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/TestContentFilterDelegate.java b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/TestContentFilterDelegate.java
deleted file mode 100644
index 187db4f..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/TestContentFilterDelegate.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.internet.monitor.core.tests;
-
-import java.io.IOException;
-import org.eclipse.wst.internet.monitor.core.internal.provisional.ContentFilterDelegate;
-import org.eclipse.wst.internet.monitor.core.internal.provisional.Request;
-
-public class TestContentFilterDelegate extends ContentFilterDelegate{
- public byte[] filter(Request request, boolean isRequest, byte[] content) throws IOException {
- return null;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/TestsPlugin.java b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/TestsPlugin.java
deleted file mode 100644
index d5e20bb..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/TestsPlugin.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.internet.monitor.core.tests;
-
-import org.eclipse.core.runtime.Plugin;
-/**
- *
- */
-public class TestsPlugin extends Plugin {
- /**
- * The constructor.
- */
- public TestsPlugin() {
- super();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/extension/ContentFiltersTestCase.java b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/extension/ContentFiltersTestCase.java
deleted file mode 100644
index c8a611e..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/extension/ContentFiltersTestCase.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.internet.monitor.core.tests.extension;
-
-import org.eclipse.wst.internet.monitor.core.internal.IContentFilter;
-import org.eclipse.wst.internet.monitor.core.internal.MonitorPlugin;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class ContentFiltersTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(ContentFiltersTestCase.class, "ContentFiltersTestCase");
- }
-
- public void test1ContentFiltersExtension() throws Exception {
- IContentFilter[] cf = MonitorPlugin.getInstance().getContentFilters();
- if (cf != null) {
- int size = cf.length;
- for (int i = 0; i < size; i++)
- System.out.println(cf[i].getId() + " - " + cf[i].getName());
- }
- }
-
- public void test2ContentFiltersExtension() throws Exception {
- try {
- MonitorPlugin.getInstance().findContentFilter(null);
- assertTrue("Should throw exception", false);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test3ContentFiltersExtension() throws Exception {
- IContentFilter cf = MonitorPlugin.getInstance().findContentFilter("abc.xyz");
- assertTrue(cf == null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/test.xml b/tests/org.eclipse.wst.internet.monitor.core.tests/test.xml
deleted file mode 100644
index 68bae7d..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/test.xml
+++ /dev/null
@@ -1,49 +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.wst.internet.monitor.core.tests"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
-
- <!-- 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="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.internet.monitor.core.tests.AllTests" />
- <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">
- </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.wst.internet.monitor.ui.tests/.classpath b/tests/org.eclipse.wst.internet.monitor.ui.tests/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <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.internet.monitor.ui.tests/.cvsignore b/tests/org.eclipse.wst.internet.monitor.ui.tests/.cvsignore
deleted file mode 100644
index 4725bd5..0000000
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-monitortests.jar
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/.project b/tests/org.eclipse.wst.internet.monitor.ui.tests/.project
deleted file mode 100644
index 5725113..0000000
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.internet.monitor.ui.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.wst.internet.monitor.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.internet.monitor.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 487800d..0000000
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,47 +0,0 @@
-#Wed May 25 10:51:44 EDT 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.internet.monitor.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 998a358..0000000
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.wst.internet.monitor.ui.tests
-Bundle-SymbolicName: org.eclipse.wst.internet.monitor.ui.tests
-Bundle-Version: 1.0.0
-Bundle-ClassPath: monitortests.jar
-Bundle-Activator: org.eclipse.wst.internet.monitor.ui.tests.TestsPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.internet.monitor.ui.tests,
- org.eclipse.wst.internet.monitor.ui.tests.extension
-Require-Bundle: org.eclipse.core.runtime,
- org.junit,
- org.eclipse.ui,
- org.eclipse.wst.internet.monitor.core,
- org.eclipse.wst.internet.monitor.ui
-Eclipse-AutoStart: true
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/about.html b/tests/org.eclipse.wst.internet.monitor.ui.tests/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/build.properties b/tests/org.eclipse.wst.internet.monitor.ui.tests/build.properties
deleted file mode 100644
index f073d07..0000000
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 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
-###############################################################################
-bin.includes = plugin.xml,\
- test.xml,\
- monitortests.jar,\
- META-INF/,\
- about.html
-jars.compile.order = monitortests.jar
-source.monitortests.jar = src/
-output.monitortests.jar = bin/
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/AllTests.java b/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/AllTests.java
deleted file mode 100644
index 2494c67..0000000
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/AllTests.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.internet.monitor.ui.tests;
-
-import org.eclipse.wst.internet.monitor.ui.tests.extension.*;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.wst.internet.monitor.ui.tests");
- //$JUnit-BEGIN$
- suite.addTestSuite(ExistenceTest.class);
- suite.addTestSuite(ContentViewersTestCase.class);
- suite.addTestSuite(MonitorUICoreTest.class);
-
- suite.addTestSuite(DialogsTestCase.class);
- suite.addTestSuite(PreferencesTestCase.class);
- suite.addTestSuite(ViewTestCase.class);
- //$JUnit-END$
- return suite;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/DialogsTestCase.java b/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/DialogsTestCase.java
deleted file mode 100644
index 78440c9..0000000
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/DialogsTestCase.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**********************************************************************
- * 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
- **********************************************************************/
-package org.eclipse.wst.internet.monitor.ui.tests;
-
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.internet.monitor.ui.internal.MonitorDialog;
-import junit.framework.TestCase;
-
-public class DialogsTestCase extends TestCase {
- private Shell getShell() {
- return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- }
-
- public void testMonitorDialog() {
- MonitorDialog td = new MonitorDialog(getShell());
- UITestHelper.assertDialog(td);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/ExistenceTest.java b/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/ExistenceTest.java
deleted file mode 100644
index 5522735..0000000
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/ExistenceTest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.internet.monitor.ui.tests;
-
-import org.eclipse.wst.internet.monitor.ui.internal.MonitorUIPlugin;
-
-import junit.framework.TestCase;
-
-public class ExistenceTest extends TestCase {
- public void testPluginExists() {
- assertNotNull(MonitorUIPlugin.getInstance());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/MonitorUICoreTest.java b/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/MonitorUICoreTest.java
deleted file mode 100644
index 7a36160..0000000
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/MonitorUICoreTest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.internet.monitor.ui.tests;
-
-import org.eclipse.wst.internet.monitor.ui.internal.provisional.MonitorUICore;
-
-import junit.framework.TestCase;
-
-public class MonitorUICoreTest extends TestCase {
- public void testRequests() {
- assertNotNull(MonitorUICore.getRequests());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/OrderedTestSuite.java b/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/OrderedTestSuite.java
deleted file mode 100644
index 8e7ecd6..0000000
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/OrderedTestSuite.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.internet.monitor.ui.tests;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Vector;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-class OrderedTestSuite extends TestSuite{
- public OrderedTestSuite(Class theClass, String name) {
- this(theClass);
- setName(name);
- }
-
- public OrderedTestSuite(final Class theClass) {
- super();
- setName(theClass.getName());
- try {
- getTestConstructor(theClass); // Avoid generating multiple error messages
- } catch (NoSuchMethodException e) {
- addTest(warning("Class " + theClass.getName()
- + " has no public constructor TestCase(String name) or TestCase()"));
- return;
- }
- if (!Modifier.isPublic(theClass.getModifiers())) {
- addTest(warning("Class " + theClass.getName() + " is not public"));
- return;
- }
- Class superClass = theClass;
- Vector names = new Vector();
- while (Test.class.isAssignableFrom(superClass)) {
- Method[] methods = superClass.getDeclaredMethods();
- int size = methods.length;
- for (int i = 0; i < size - 1; i++) {
- for (int j = i + 1; j < size; j++) {
- if (methods[i].getName().compareTo(methods[j].getName()) > 0) {
- Method m = methods[i];
- methods[i] = methods[j];
- methods[j] = m;
- }
- }
- }
- for (int i = 0; i < size; i++) {
- addTestMethod(methods[i], names, theClass);
- }
- superClass = superClass.getSuperclass();
- }
- if (!tests().hasMoreElements())
- addTest(warning("No tests found in " + theClass.getName()));
- }
-
- private void addTestMethod(Method m, Vector names, Class theClass) {
- String name = m.getName();
- if (names.contains(name))
- return;
- if (!isPublicTestMethod(m)) {
- if (isTestMethod(m))
- addTest(warning("Test method isn't public: " + m.getName()));
- return;
- }
- names.addElement(name);
- addTest(createTest(theClass, name));
- }
-
- private boolean isPublicTestMethod(Method m) {
- return isTestMethod(m) && Modifier.isPublic(m.getModifiers());
- }
-
- private boolean isTestMethod(Method m) {
- String name = m.getName();
- Class[] parameters = m.getParameterTypes();
- Class returnType = m.getReturnType();
- return parameters.length == 0 && name.startsWith("test") && returnType.equals(Void.TYPE);
- }
-
- private Test warning(final String message) {
- return new TestCase("warning") {
- protected void runTest() {
- fail(message);
- }
- };
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/PreferencesTestCase.java b/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/PreferencesTestCase.java
deleted file mode 100644
index b5b12f9..0000000
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/PreferencesTestCase.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/
-package org.eclipse.wst.internet.monitor.ui.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.dialogs.Dialog;
-
-public class PreferencesTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(PreferencesTestCase.class);
- }
-
- public PreferencesTestCase(String name) {
- super(name);
- }
-
- public void testPreferencePage() {
- Dialog dialog = UITestHelper.getPreferenceDialog("org.eclipse.wst.internet.monitor.preferencePage");
- UITestHelper.assertDialog(dialog);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/TestsPlugin.java b/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/TestsPlugin.java
deleted file mode 100644
index 9f1bd1c..0000000
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/TestsPlugin.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.internet.monitor.ui.tests;
-
-import org.eclipse.core.runtime.Plugin;
-/**
- *
- */
-public class TestsPlugin extends Plugin {
- /**
- * The constructor.
- */
- public TestsPlugin() {
- super();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/UITestHelper.java b/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/UITestHelper.java
deleted file mode 100644
index 33d0516..0000000
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/UITestHelper.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.internet.monitor.ui.tests;
-
-import java.util.Iterator;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.IPreferenceNode;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.eclipse.ui.internal.dialogs.PropertyDialog;
-import org.eclipse.ui.internal.dialogs.PropertyPageContributorManager;
-import org.eclipse.ui.internal.dialogs.PropertyPageManager;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-
-public class UITestHelper {
- private static class PreferenceDialogWrapper extends PreferenceDialog {
- public PreferenceDialogWrapper(Shell parentShell, PreferenceManager manager) {
- super(parentShell, manager);
- }
- protected boolean showPage(IPreferenceNode node) {
- return super.showPage(node);
- }
- }
-
- private static class PropertyDialogWrapper extends PropertyDialog {
- public PropertyDialogWrapper(Shell parentShell, PreferenceManager manager, ISelection selection) {
- super(parentShell, manager, selection);
- }
- protected boolean showPage(IPreferenceNode node) {
- return super.showPage(node);
- }
- }
-
- protected static Shell getShell() {
- return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- }
-
- public static PreferenceDialog getPreferenceDialog(String id) {
- PreferenceDialogWrapper dialog = null;
- PreferenceManager manager = WorkbenchPlugin.getDefault().getPreferenceManager();
- if (manager != null) {
- dialog = new PreferenceDialogWrapper(getShell(), manager);
- dialog.create();
-
- for (Iterator iterator = manager.getElements(PreferenceManager.PRE_ORDER).iterator();
- iterator.hasNext();)
- {
- IPreferenceNode node = (IPreferenceNode)iterator.next();
- if ( node.getId().equals(id) ) {
- dialog.showPage(node);
- break;
- }
- }
- }
- return dialog;
- }
-
- public static PropertyDialog getPropertyDialog(String id, IAdaptable element) {
- PropertyDialogWrapper dialog = null;
-
- PropertyPageManager manager = new PropertyPageManager();
- String title = "";
- String name = "";
-
- // load pages for the selection
- // fill the manager with contributions from the matching contributors
- PropertyPageContributorManager.getManager().contribute(manager, element);
-
- IWorkbenchAdapter adapter = (IWorkbenchAdapter)element.getAdapter(IWorkbenchAdapter.class);
- if (adapter != null) {
- name = adapter.getLabel(element);
- }
-
- // testing if there are pages in the manager
- Iterator pages = manager.getElements(PreferenceManager.PRE_ORDER).iterator();
- if (!pages.hasNext())
- return null;
-
- title = "Title: " + name;
- dialog = new PropertyDialogWrapper(getShell(), manager, new StructuredSelection(element));
- dialog.create();
- dialog.getShell().setText(title);
- for (Iterator iterator = manager.getElements(PreferenceManager.PRE_ORDER).iterator();
- iterator.hasNext();) {
- IPreferenceNode node = (IPreferenceNode)iterator.next();
- if ( node.getId().equals(id) ) {
- dialog.showPage(node);
- break;
- }
- }
- return dialog;
- }
-
- /**
- * Automated test that checks all the labels and buttons of a dialog
- * to make sure there is enough room to display all the text. Any
- * text that wraps is only approximated and is currently not accurate.
- *
- * @param dialog the test dialog to be verified.
- */
- public static void assertDialog(Dialog dialog) {
- Assert.assertNotNull(dialog);
- dialog.setBlockOnOpen(false);
- dialog.open();
- Shell shell = dialog.getShell();
- verifyCompositeText(shell);
- dialog.close();
- }
-
- /*
- * Looks at all the child widgets of a given composite and
- * verifies the text on all labels and widgets.
- * @param composite The composite to look through
- */
- private static void verifyCompositeText(Composite composite) {
- Control children[] = composite.getChildren();
- for (int i = 0; i < children.length; i++) {
- try {
- //verify the text if the child is a button
- verifyButtonText((Button) children[i]);
- } catch (ClassCastException exNotButton) {
- try {
- //child is not a button, maybe a label
- verifyLabelText((Label) children[i]);
- } catch (ClassCastException exNotLabel) {
- try {
- //child is not a label, make a recursive call if it is a composite
- verifyCompositeText((Composite) children[i]);
- } catch (ClassCastException exNotComposite) {
- //the child is not a button, label, or composite - ignore it.
- }
- }
- }
- }
- }
-
- /*
- * Verifies that a given button is large enough to display its text.
- * @param button The button to verify,
- */
- private static void verifyButtonText(Button button) {
- String widget = button.toString();
- Point size = button.getSize();
-
- // compute the size with no line wrapping
- Point preferred = button.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- //if (size.y/preferred.y) == X, then label spans X lines, so divide
- //the calculated value of preferred.x by X
- if (preferred.y * size.y > 0) {
- preferred.y /= countLines(button.getText()); //check for '\n\'
- if (size.y / preferred.y > 1) {
- preferred.x /= (size.y / preferred.y);
- }
- }
-
- String message =
- new StringBuffer("Warning: ")
- .append(widget)
- .append("\n\tActual Width -> ")
- .append(size.x)
- .append("\n\tRecommended Width -> ")
- .append(preferred.x)
- .toString();
- if (preferred.x > size.x) {
- //close the dialog
- button.getShell().dispose();
- Assert.assertTrue(message.toString(), false);
- }
- }
-
- /*
- * Verifies that a given label is large enough to display its text.
- * @param label The label to verify,
- */
- private static void verifyLabelText(Label label) {
- String widget = label.toString();
- Point size = label.getSize();
-
- // compute the size with no line wrapping
- Point preferred = label.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- //if (size.y/preferred.y) == X, then label spans X lines, so divide
- //the calculated value of preferred.x by X
- if (preferred.y * size.y > 0) {
- preferred.y /= countLines(label.getText());
- if (size.y / preferred.y > 1) {
- preferred.x /= (size.y / preferred.y);
- }
- }
- String message = new StringBuffer("Warning: ").append(widget)
- .append("\n\tActual Width -> ").append(size.x)
- .append("\n\tRecommended Width -> ").append(preferred.x).toString();
- if (preferred.x > size.x) {
- //close the dialog
- label.getShell().dispose();
- Assert.assertTrue(message.toString(), false);
- }
- }
-
- /*
- * Counts the number of lines in a given String.
- * For example, if a string contains one (1) newline character,
- * a value of two (2) would be returned.
- * @param text The string to look through.
- * @return int the number of lines in text.
- */
- private static int countLines(String text) {
- int newLines = 1;
- for (int i = 0; i < text.length(); i++) {
- if (text.charAt(i) == '\n') {
- newLines++;
- }
- }
- return newLines;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/ViewTestCase.java b/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/ViewTestCase.java
deleted file mode 100644
index 4b90c6e..0000000
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/ViewTestCase.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.internet.monitor.ui.tests;
-
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import junit.framework.TestCase;
-
-public class ViewTestCase extends TestCase {
- public void testMonitorView() throws Exception {
- IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- IViewPart view = page.showView("org.eclipse.wst.internet.monitor.view");
- page.hideView(view);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/extension/ContentViewersTestCase.java b/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/extension/ContentViewersTestCase.java
deleted file mode 100644
index 30e1fc8..0000000
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/extension/ContentViewersTestCase.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.internet.monitor.ui.tests.extension;
-
-import org.eclipse.wst.internet.monitor.ui.internal.provisional.ContentViewer;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class ContentViewersTestCase extends TestCase {
- protected static ContentViewer viewer;
-
- public static Test suite() {
- return new TestSuite(ContentViewersTestCase.class, "ContentViewersTestCase");
- }
-
- public void test00Create() {
- viewer = new TestContentViewer();
- }
-
- public void test01GetContent() {
- viewer.getContent();
- }
-
- public void test02GetEditable() {
- viewer.getEditable();
- }
-
- public void test03SetContent() {
- viewer.setContent(null);
- }
-
- public void test04SetEditable() {
- viewer.setEditable(false);
- }
-
- public void test05Init() {
- viewer.init(null);
- }
-
- public void test06Dispose() {
- viewer.dispose();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/extension/TestContentViewer.java b/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/extension/TestContentViewer.java
deleted file mode 100644
index c846c9c..0000000
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/extension/TestContentViewer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.internet.monitor.ui.tests.extension;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.internet.monitor.ui.internal.provisional.ContentViewer;
-
-public class TestContentViewer extends ContentViewer {
- public void init(Composite parent) {
- // do nothing
- }
-
- public void setContent(byte[] b) {
- // do nothing
- }
-
- public byte[] getContent() {
- return null;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/test.xml b/tests/org.eclipse.wst.internet.monitor.ui.tests/test.xml
deleted file mode 100644
index abc1288..0000000
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/test.xml
+++ /dev/null
@@ -1,49 +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.wst.internet.monitor.ui.tests"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
-
- <!-- 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="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.internet.monitor.ui.tests.AllTests" />
- <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">
- </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.wst.server.ui.tests/.classpath b/tests/org.eclipse.wst.server.ui.tests/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <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.server.ui.tests/.cvsignore b/tests/org.eclipse.wst.server.ui.tests/.cvsignore
deleted file mode 100644
index 57763eb..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-tests.jar
diff --git a/tests/org.eclipse.wst.server.ui.tests/.project b/tests/org.eclipse.wst.server.ui.tests/.project
deleted file mode 100644
index bc1b2ee..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.server.ui.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.wst.server.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.server.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c9d2f3e..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,47 +0,0 @@
-#Wed May 25 10:52:19 EDT 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/tests/org.eclipse.wst.server.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.server.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index a6b2f1f..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.wst.server.ui.tests
-Bundle-SymbolicName: org.eclipse.wst.server.ui.tests
-Bundle-Version: 1.0.0
-Bundle-ClassPath: tests.jar
-Bundle-Activator: org.eclipse.wst.server.ui.tests.TestsPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.server.ui.tests,
- org.eclipse.wst.server.ui.tests.dialog,
- org.eclipse.wst.server.ui.tests.editor,
- org.eclipse.wst.server.ui.tests.impl,
- org.eclipse.wst.server.ui.tests.wizard
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.junit,
- org.eclipse.ui,
- org.eclipse.ui.forms,
- org.eclipse.debug.core,
- org.eclipse.debug.ui,
- org.eclipse.wst.server.core,
- org.eclipse.wst.server.ui
-Eclipse-AutoStart: true
diff --git a/tests/org.eclipse.wst.server.ui.tests/about.html b/tests/org.eclipse.wst.server.ui.tests/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/about.html
+++ /dev/null
@@ -1,22 +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">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</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/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/build.properties b/tests/org.eclipse.wst.server.ui.tests/build.properties
deleted file mode 100644
index 310beba..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 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
-###############################################################################
-bin.includes = plugin.xml,\
- test.xml,\
- tests.jar,\
- META-INF/,\
- about.html
-jars.compile.order = tests.jar
-source.tests.jar = src/
-output.tests.jar = bin/
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/AbstractOpenEditorTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/AbstractOpenEditorTestCase.java
deleted file mode 100644
index 5066344..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/AbstractOpenEditorTestCase.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**********************************************************************
- * 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
- **********************************************************************/
-package org.eclipse.wst.server.ui.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.ui.internal.editor.ServerEditorInput;
-
-public abstract class AbstractOpenEditorTestCase extends TestCase {
- private final String SERVER_EDITOR_ID = "org.eclipse.wst.server.ui.tests.editor";
-
- public static Test suite() {
- return new TestSuite(AbstractOpenEditorTestCase.class, "OpenEditorTestCase");
- }
-
- public void testOpenEditor() throws Exception {
- IServer server = getServer();
- IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- IEditorPart editor = page.openEditor(new ServerEditorInput(server.getId()), SERVER_EDITOR_ID, true);
- page.closeEditor(editor, false);
- releaseServer(server);
- }
-
- public abstract IServer getServer() throws Exception;
-
- public abstract void releaseServer(IServer server) throws Exception;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/AllTests.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/AllTests.java
deleted file mode 100644
index 2f0b7c5..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/AllTests.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests;
-
-import org.eclipse.wst.server.ui.tests.dialog.*;
-import org.eclipse.wst.server.ui.tests.editor.*;
-import org.eclipse.wst.server.ui.tests.wizard.IWizardHandleTestCase;
-import org.eclipse.wst.server.ui.tests.wizard.TaskWizardTestCase;
-import org.eclipse.wst.server.ui.tests.wizard.WizardFragmentTestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite("Test suite for org.eclipse.wst.server.ui.tests");
- //$JUnit-BEGIN$
- suite.addTestSuite(ExistenceTest.class);
- suite.addTestSuite(ServerUIPreferencesTestCase.class);
-
- suite.addTestSuite(ServerUICoreTestCase.class);
- suite.addTest(new OrderedTestSuite(ServerLaunchConfigurationTabTestCase.class));
-
- suite.addTest(new OrderedTestSuite(IServerEditorPartInputTestCase.class));
- suite.addTest(new OrderedTestSuite(ServerEditorSectionTestCase.class));
- suite.addTest(new OrderedTestSuite(ServerEditorPartTestCase.class));
-
- suite.addTestSuite(DialogsTestCase.class);
- suite.addTestSuite(PreferencesTestCase.class);
- suite.addTestSuite(ViewTestCase.class);
- suite.addTestSuite(WizardTestCase.class);
-
- suite.addTest(new OrderedTestSuite(IOrderedTestCase.class));
- suite.addTest(new OrderedTestSuite(ServerEditorActionFactoryDelegateTestCase.class));
-
- suite.addTestSuite(IWizardHandleTestCase.class);
- suite.addTest(new OrderedTestSuite(TaskWizardTestCase.class));
- suite.addTest(new OrderedTestSuite(WizardFragmentTestCase.class));
- //$JUnit-END$
- return suite;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ExistenceTest.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ExistenceTest.java
deleted file mode 100644
index 5240758..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ExistenceTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests;
-
-import org.eclipse.wst.server.ui.internal.ServerUIPlugin;
-import junit.framework.TestCase;
-
-public class ExistenceTest extends TestCase {
- public void testPluginExists() {
- assertNotNull(ServerUIPlugin.getInstance());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/OrderedTestSuite.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/OrderedTestSuite.java
deleted file mode 100644
index 7b6eda0..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/OrderedTestSuite.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Vector;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class OrderedTestSuite extends TestSuite {
- public OrderedTestSuite(Class theClass, String name) {
- this(theClass);
- setName(name);
- }
-
- public OrderedTestSuite(final Class theClass) {
- super();
- setName(theClass.getName());
- try {
- getTestConstructor(theClass); // Avoid generating multiple error messages
- } catch (NoSuchMethodException e) {
- addTest(warning("Class " + theClass.getName()
- + " has no public constructor TestCase(String name) or TestCase()"));
- return;
- }
- if (!Modifier.isPublic(theClass.getModifiers())) {
- addTest(warning("Class " + theClass.getName() + " is not public"));
- return;
- }
- Class superClass = theClass;
- Vector names = new Vector();
- while (Test.class.isAssignableFrom(superClass)) {
- Method[] methods = superClass.getDeclaredMethods();
- int size = methods.length;
- for (int i = 0; i < size - 1; i++) {
- for (int j = i + 1; j < size; j++) {
- if (methods[i].getName().compareTo(methods[j].getName()) > 0) {
- Method m = methods[i];
- methods[i] = methods[j];
- methods[j] = m;
- }
- }
- }
- for (int i = 0; i < size; i++) {
- addTestMethod(methods[i], names, theClass);
- }
- superClass = superClass.getSuperclass();
- }
- if (!tests().hasMoreElements())
- addTest(warning("No tests found in " + theClass.getName()));
- }
-
- private void addTestMethod(Method m, Vector names, Class theClass) {
- String name = m.getName();
- if (names.contains(name))
- return;
- if (!isPublicTestMethod(m)) {
- if (isTestMethod(m))
- addTest(warning("Test method isn't public: " + m.getName()));
- return;
- }
- names.addElement(name);
- addTest(createTest(theClass, name));
- }
-
- private boolean isPublicTestMethod(Method m) {
- return isTestMethod(m) && Modifier.isPublic(m.getModifiers());
- }
-
- private boolean isTestMethod(Method m) {
- String name = m.getName();
- Class[] parameters = m.getParameterTypes();
- Class returnType = m.getReturnType();
- return parameters.length == 0 && name.startsWith("test") && returnType.equals(Void.TYPE);
- }
-
- private Test warning(final String message) {
- return new TestCase("warning") {
- protected void runTest() {
- fail(message);
- }
- };
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ScanAction.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ScanAction.java
deleted file mode 100644
index 465490f..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ScanAction.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.*;
-/**
- * Test to scan plugins for missing properties.
- */
-public class ScanAction extends TestCase {
- /**
- * ScanAction constructor comment.
- */
- public ScanAction() {
- super();
- }
-
- /* (non-Javadoc)
- *
- */
- public void testIt() {
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- if (projects != null) {
- int size = projects.length;
- for (int i = 0; i < size; i++) {
- scanProject(projects[i]);
- }
- }
- }
-
- protected void scanProject(IProject project) {
- System.out.println("************************************");
- System.out.println("Project: " + project.getName());
-
- IFile file = project.getFile("plugin.properties");
- if (!file.exists()) {
- System.out.println(" plugin.properties not found");
- return;
- }
-
- //System.out.print(" Reading plugin.properties...");
- Properties props = new Properties();
- InputStream in = null;
- try {
- in = file.getContents();
- props.load(in);
- } catch (Exception e) {
- e.printStackTrace();
- return;
- } finally {
- try {
- in.close();
- } catch (Exception e) {
- // ignore
- }
- }
- //System.out.println(props.size() + " found");
-
- List propsFound = new ArrayList();
- List newProps = new ArrayList();
-
- scanContainer(project, props, propsFound, newProps);
-
- System.out.println("Unused properties:");
- if (props.size() == propsFound.size())
- System.out.println(" None");
- else {
- Iterator iterator = props.keySet().iterator();
- while (iterator.hasNext()) {
- String s = (String) iterator.next();
- if (!propsFound.contains(s))
- System.out.println(" " + s);
- }
- }
-
- System.out.println("New properties:");
- if (newProps.size() == 0)
- System.out.println(" None");
- else {
- Iterator iterator = newProps.iterator();
- while (iterator.hasNext()) {
- String s = (String) iterator.next();
- System.out.println(" " + s);
- }
- }
- }
-
- protected void scanContainer(IContainer container, Properties props, List propsFound, List newProps) {
- if (container == null || !container.exists())
- return;
-
- try {
- IResource[] resources = container.members();
- if (resources != null) {
- int size = resources.length;
- for (int i = 0; i < size; i++) {
- if (resources[i] instanceof IFile) {
- String[] found = scanFile((IFile) resources[i]);
- if (found != null) {
- int size2 = found.length;
- for (int j = 0; j < size2; j++) {
- if (props.containsKey(found[j])) {
- if (!propsFound.contains(found[j]))
- propsFound.add(found[j]);
- } else
- newProps.add(found[j]);
- }
- }
- } else if (resources[i] instanceof IContainer) {
- scanContainer((IContainer) resources[i], props, propsFound, newProps);
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * Scan a java file and return all of the "%xxx" found.
- * @param file
- * @return List of matching strings.
- */
- protected String[] scanFile(IFile file) {
- if (file == null || !file.exists())
- return new String[0];
-
- if (!file.getName().endsWith("java") && !file.getName().endsWith("xml"))
- return new String[0];
-
- //System.out.println(" File: " + file.getName());
- List list = new ArrayList();
- BufferedReader br = null;
- try {
- br = new BufferedReader(new InputStreamReader(file.getContents()));
-
- String line = br.readLine();
- while (line != null) {
- int index = line.indexOf("%");
- while (index >= 0) {
- int end = line.indexOf("\"", index + 1);
- if (end >= 0) {
- String s = line.substring(index + 1, end);
- //System.out.println(" Found '" + s + "'");
- list.add(s);
- }
- index = line.indexOf("%", index + 1);
- }
- line = br.readLine();
- }
- } catch (Exception e) {
- e.printStackTrace();
- return new String[0];
- }
-
- String[] s = new String[list.size()];
- list.toArray(s);
- return s;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerLaunchConfigurationTabTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerLaunchConfigurationTabTestCase.java
deleted file mode 100644
index 64bfc3b..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerLaunchConfigurationTabTestCase.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests;
-
-import org.eclipse.wst.server.ui.ServerLaunchConfigurationTab;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class ServerLaunchConfigurationTabTestCase extends TestCase {
- protected static ServerLaunchConfigurationTab tab;
-
- public static Test suite() {
- return new OrderedTestSuite(ServerLaunchConfigurationTabTestCase.class, "ServerLaunchConfigurationTabTestCase");
- }
-
- public void test00CreateTab() {
- tab = new ServerLaunchConfigurationTab();
- }
-
- public void test01CreateTab() {
- tab = new ServerLaunchConfigurationTab(new String[] {"test"});
- }
-
- public void test02CreateControl() {
- try {
- tab.createControl(null);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test03SetDefaults() {
- try {
- tab.setDefaults(null);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test04InitializeFrom() {
- try {
- tab.initializeFrom(null);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test05PerformApply() {
- try {
- tab.performApply(null);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test06IsValid() {
- try {
- tab.isValid(null);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test07GetImage() {
- tab.getImage();
- }
-
- public void test08GetName() {
- tab.getName();
- }
-
- public void test09TestProtectedMethods() {
- class MyLaunchTab extends ServerLaunchConfigurationTab {
- public void testProtected() {
- try {
- handleServerSelection();
- } catch (Exception e) {
- // ignore
- }
- }
- }
- MyLaunchTab mlt = new MyLaunchTab();
- mlt.testProtected();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerUICoreTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerUICoreTestCase.java
deleted file mode 100644
index 5eb8582..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerUICoreTestCase.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests;
-
-import org.eclipse.wst.server.ui.ServerUICore;
-import junit.framework.TestCase;
-
-public class ServerUICoreTestCase extends TestCase {
- public void testLabelProvider() {
- assertNotNull(ServerUICore.getLabelProvider());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerUIPreferencesTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerUIPreferencesTestCase.java
deleted file mode 100644
index 2a5e725..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerUIPreferencesTestCase.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.ui.internal.ServerUIPlugin;
-import org.eclipse.wst.server.ui.internal.ServerUIPreferences;
-
-public class ServerUIPreferencesTestCase extends TestCase {
- protected static ServerUIPreferences prefs;
-
- public static Test suite() {
- return new OrderedTestSuite(ServerUIPreferencesTestCase.class, "ServerUIPreferencesTestCase");
- }
-
- public void test00GetProperties() throws Exception {
- prefs = ServerUIPlugin.getPreferences();
- }
-
- public void test01GetPref() throws Exception {
- prefs.getPromptBeforeIrreversibleChange();
- }
-
- public void test02GetPref() throws Exception {
- prefs.getSaveEditors();
- }
-
- public void test03SetPref() throws Exception {
- prefs.setPromptBeforeIrreversibleChange(false);
- assertFalse(prefs.getPromptBeforeIrreversibleChange());
- }
-
- public void test04SetPref() throws Exception {
- prefs.setPromptBeforeIrreversibleChange(true);
- assertTrue(prefs.getPromptBeforeIrreversibleChange());
- }
-
- public void test05SetPref() throws Exception {
- prefs.setSaveEditors(ServerUIPreferences.SAVE_EDITORS_AUTO);
- assertEquals(prefs.getSaveEditors(), ServerUIPreferences.SAVE_EDITORS_AUTO);
- }
-
- public void test06SetPref() throws Exception {
- prefs.setSaveEditors(ServerUIPreferences.SAVE_EDITORS_NEVER);
- assertEquals(prefs.getSaveEditors(), ServerUIPreferences.SAVE_EDITORS_NEVER);
- }
-
- public void test07SetPref() throws Exception {
- prefs.setSaveEditors(ServerUIPreferences.SAVE_EDITORS_PROMPT);
- assertEquals(prefs.getSaveEditors(), ServerUIPreferences.SAVE_EDITORS_PROMPT);
- }
-
- public void test08DefaultPref() throws Exception {
- prefs.setPromptBeforeIrreversibleChange(prefs.getDefaultPromptBeforeIrreversibleChange());
- assertEquals(prefs.getPromptBeforeIrreversibleChange(), prefs.getDefaultPromptBeforeIrreversibleChange());
- }
-
- public void test09DefaultPref() throws Exception {
- prefs.setSaveEditors(prefs.getDefaultSaveEditors());
- assertEquals(prefs.getSaveEditors(), prefs.getDefaultSaveEditors());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/TestsPlugin.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/TestsPlugin.java
deleted file mode 100644
index d8ee44c..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/TestsPlugin.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests;
-
-import org.eclipse.core.runtime.Plugin;
-/**
- *
- */
-public class TestsPlugin extends Plugin {
- /**
- * The constructor.
- */
- public TestsPlugin() {
- super();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/DialogsTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/DialogsTestCase.java
deleted file mode 100644
index 18d341a..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/DialogsTestCase.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests.dialog;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.ui.internal.DeleteServerDialog;
-import org.eclipse.wst.server.ui.internal.TerminationDialog;
-import junit.framework.TestCase;
-
-public class DialogsTestCase extends TestCase {
- private Shell getShell() {
- return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- }
-
- public void testDeleteServerDialog() {
- DeleteServerDialog dsd = new DeleteServerDialog(getShell(), new IServer[0], new IFolder[0]);
- UITestHelper.assertDialog(dsd);
- }
-
- public void testTerminationDialog() {
- TerminationDialog td = new TerminationDialog(getShell(), "MyServer with a really long name");
- UITestHelper.assertDialog(td);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/PreferencesTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/PreferencesTestCase.java
deleted file mode 100644
index 22c8bcb..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/PreferencesTestCase.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests.dialog;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.dialogs.Dialog;
-
-public class PreferencesTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(PreferencesTestCase.class);
- }
-
- public PreferencesTestCase(String name) {
- super(name);
- }
-
- public void testServerPreferencePage() {
- Dialog dialog = UITestHelper.getPreferenceDialog("org.eclipse.wst.server.ui.preferencePage");
- UITestHelper.assertDialog(dialog);
- }
-
- public void testRuntimePreferencePage() {
- Dialog dialog = UITestHelper.getPreferenceDialog("org.eclipse.wst.server.ui.runtime.preferencePage");
- UITestHelper.assertDialog(dialog);
- }
-
- public void testServerPropertyPage() throws Exception {
- // TODO temporarily disabled due to issues with internal build machine
- /*IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("PropertyTest");
- project.create(null);
- project.open(null);
-
- Dialog dialog = UITestHelper.getPropertyDialog("org.eclipse.wst.server.ui.project.properties", project);
- UITestHelper.assertDialog(dialog);
-
- project.delete(true, true, null);*/
- }
-
- public void testInternetPreferencePage() {
- Dialog dialog = UITestHelper.getPreferenceDialog("org.eclipse.internet");
- UITestHelper.assertDialog(dialog);
- }
-
- public void testAudioPreferencePage() {
- Dialog dialog = UITestHelper.getPreferenceDialog("org.eclipse.wst.audio.preferencePage");
- UITestHelper.assertDialog(dialog);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/UITestHelper.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/UITestHelper.java
deleted file mode 100644
index 343d9a6..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/UITestHelper.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests.dialog;
-
-import java.util.Iterator;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.IPreferenceNode;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.eclipse.ui.internal.dialogs.PropertyDialog;
-import org.eclipse.ui.internal.dialogs.PropertyPageContributorManager;
-import org.eclipse.ui.internal.dialogs.PropertyPageManager;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-
-public class UITestHelper {
- private static class PreferenceDialogWrapper extends PreferenceDialog {
- public PreferenceDialogWrapper(Shell parentShell, PreferenceManager manager) {
- super(parentShell, manager);
- }
- protected boolean showPage(IPreferenceNode node) {
- return super.showPage(node);
- }
- }
-
- private static class PropertyDialogWrapper extends PropertyDialog {
- public PropertyDialogWrapper(Shell parentShell, PreferenceManager manager, ISelection selection) {
- super(parentShell, manager, selection);
- }
- protected boolean showPage(IPreferenceNode node) {
- return super.showPage(node);
- }
- }
-
- protected static Shell getShell() {
- return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- }
-
- public static PreferenceDialog getPreferenceDialog(String id) {
- PreferenceDialogWrapper dialog = null;
- PreferenceManager manager = WorkbenchPlugin.getDefault().getPreferenceManager();
- if (manager != null) {
- dialog = new PreferenceDialogWrapper(getShell(), manager);
- dialog.create();
-
- for (Iterator iterator = manager.getElements(PreferenceManager.PRE_ORDER).iterator();
- iterator.hasNext();)
- {
- IPreferenceNode node = (IPreferenceNode)iterator.next();
- if ( node.getId().equals(id) ) {
- dialog.showPage(node);
- break;
- }
- }
- }
- return dialog;
- }
-
- public static PropertyDialog getPropertyDialog(String id, IAdaptable element) {
- PropertyDialogWrapper dialog = null;
-
- PropertyPageManager manager = new PropertyPageManager();
- String title = "";
- String name = "";
-
- // load pages for the selection
- // fill the manager with contributions from the matching contributors
- PropertyPageContributorManager.getManager().contribute(manager, element);
-
- IWorkbenchAdapter adapter = (IWorkbenchAdapter)element.getAdapter(IWorkbenchAdapter.class);
- if (adapter != null) {
- name = adapter.getLabel(element);
- }
-
- // testing if there are pages in the manager
- Iterator pages = manager.getElements(PreferenceManager.PRE_ORDER).iterator();
- if (!pages.hasNext())
- return null;
-
- title = title = "Title: " + name;
- dialog = new PropertyDialogWrapper(getShell(), manager, new StructuredSelection(element));
- dialog.create();
- dialog.getShell().setText(title);
- for (Iterator iterator = manager.getElements(PreferenceManager.PRE_ORDER).iterator();
- iterator.hasNext();) {
- IPreferenceNode node = (IPreferenceNode)iterator.next();
- if ( node.getId().equals(id) ) {
- dialog.showPage(node);
- break;
- }
- }
- return dialog;
- }
-
- /**
- * Automated test that checks all the labels and buttons of a dialog
- * to make sure there is enough room to display all the text. Any
- * text that wraps is only approximated and is currently not accurate.
- *
- * @param dialog the test dialog to be verified.
- */
- public static void assertDialog(Dialog dialog) {
- Assert.assertNotNull(dialog);
- dialog.setBlockOnOpen(false);
- dialog.open();
- Shell shell = dialog.getShell();
- verifyCompositeText(shell);
- dialog.close();
- }
-
- /*
- * Looks at all the child widgets of a given composite and
- * verifies the text on all labels and widgets.
- * @param composite The composite to look through
- */
- private static void verifyCompositeText(Composite composite) {
- Control children[] = composite.getChildren();
- for (int i = 0; i < children.length; i++) {
- try {
- //verify the text if the child is a button
- verifyButtonText((Button) children[i]);
- } catch (ClassCastException exNotButton) {
- try {
- //child is not a button, maybe a label
- verifyLabelText((Label) children[i]);
- } catch (ClassCastException exNotLabel) {
- try {
- //child is not a label, make a recursive call if it is a composite
- verifyCompositeText((Composite) children[i]);
- } catch (ClassCastException exNotComposite) {
- //the child is not a button, label, or composite - ignore it.
- }
- }
- }
- }
- }
-
- /*
- * Verifies that a given button is large enough to display its text.
- * @param button The button to verify,
- */
- private static void verifyButtonText(Button button) {
- String widget = button.toString();
- Point size = button.getSize();
-
- // compute the size with no line wrapping
- Point preferred = button.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- //if (size.y/preferred.y) == X, then label spans X lines, so divide
- //the calculated value of preferred.x by X
- if (preferred.y * size.y > 0) {
- preferred.y /= countLines(button.getText()); //check for '\n\'
- if (size.y / preferred.y > 1) {
- preferred.x /= (size.y / preferred.y);
- }
- }
-
- String message =
- new StringBuffer("Warning: ")
- .append(widget)
- .append("\n\tActual Width -> ")
- .append(size.x)
- .append("\n\tRecommended Width -> ")
- .append(preferred.x)
- .toString();
- if (preferred.x > size.x) {
- //close the dialog
- button.getShell().dispose();
- Assert.assertTrue(message.toString(), false);
- }
- }
-
- /*
- * Verifies that a given label is large enough to display its text.
- * @param label The label to verify,
- */
- private static void verifyLabelText(Label label) {
- String widget = label.toString();
- Point size = label.getSize();
-
- // compute the size with no line wrapping
- Point preferred = label.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- //if (size.y/preferred.y) == X, then label spans X lines, so divide
- //the calculated value of preferred.x by X
- if (preferred.y * size.y > 0) {
- preferred.y /= countLines(label.getText());
- if (size.y / preferred.y > 1) {
- preferred.x /= (size.y / preferred.y);
- }
- }
- String message = new StringBuffer("Warning: ").append(widget)
- .append("\n\tActual Width -> ").append(size.x)
- .append("\n\tRecommended Width -> ").append(preferred.x).toString();
- if (preferred.x > size.x) {
- //close the dialog
- label.getShell().dispose();
- Assert.assertTrue(message.toString(), false);
- }
- }
-
- /*
- * Counts the number of lines in a given String.
- * For example, if a string contains one (1) newline character,
- * a value of two (2) would be returned.
- * @param text The string to look through.
- * @return int the number of lines in text.
- */
- private static int countLines(String text) {
- int newLines = 1;
- for (int i = 0; i < text.length(); i++) {
- if (text.charAt(i) == '\n') {
- newLines++;
- }
- }
- return newLines;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/ViewTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/ViewTestCase.java
deleted file mode 100644
index b37470c..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/ViewTestCase.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests.dialog;
-
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import junit.framework.TestCase;
-
-public class ViewTestCase extends TestCase {
- public void testServerView() throws Exception {
- IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- IViewPart view = page.showView("org.eclipse.wst.server.ui.ServersView");
- page.hideView(view);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/WizardTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/WizardTestCase.java
deleted file mode 100644
index 831f9cd..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/WizardTestCase.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests.dialog;
-
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.ui.internal.wizard.ClosableWizardDialog;
-import org.eclipse.wst.server.ui.internal.wizard.ModifyModulesWizard;
-import org.eclipse.wst.server.ui.internal.wizard.NewRuntimeWizard;
-import org.eclipse.wst.server.ui.internal.wizard.NewServerWizard;
-import org.eclipse.wst.server.ui.internal.wizard.RunOnServerWizard;
-import org.eclipse.wst.server.ui.internal.wizard.SelectClientWizard;
-import org.eclipse.wst.server.ui.internal.wizard.SelectTasksWizard;
-
-import junit.framework.TestCase;
-
-public class WizardTestCase extends TestCase {
- public static void testRoS(IModule module) {
- Shell shell = UITestHelper.getShell();
- RunOnServerWizard ros = new RunOnServerWizard(module, ILaunchManager.RUN_MODE);
- ClosableWizardDialog dialog = new ClosableWizardDialog(shell, ros);
- UITestHelper.assertDialog(dialog);
- }
-
- public void testRunOnServerWizard() throws Exception {
- testRoS(null);
- }
-
- public void testModifyModulesWizard() throws Exception {
- Shell shell = UITestHelper.getShell();
- ModifyModulesWizard wiz = new ModifyModulesWizard(null);
- ClosableWizardDialog dialog = new ClosableWizardDialog(shell, wiz);
- UITestHelper.assertDialog(dialog);
- }
-
- public void testNewRuntimeWizard() throws Exception {
- Shell shell = UITestHelper.getShell();
- NewRuntimeWizard wiz = new NewRuntimeWizard();
- ClosableWizardDialog dialog = new ClosableWizardDialog(shell, wiz);
- UITestHelper.assertDialog(dialog);
- }
-
- public void testNewServerWizard() throws Exception {
- Shell shell = UITestHelper.getShell();
- NewServerWizard wiz = new NewServerWizard();
- ClosableWizardDialog dialog = new ClosableWizardDialog(shell, wiz);
- UITestHelper.assertDialog(dialog);
- }
-
- public void testSelectClientWizard() throws Exception {
- Shell shell = UITestHelper.getShell();
- SelectClientWizard wiz = new SelectClientWizard(null);
- ClosableWizardDialog dialog = new ClosableWizardDialog(shell, wiz);
- UITestHelper.assertDialog(dialog);
- }
-
- public void testSelectTasksWizard() throws Exception {
- Shell shell = UITestHelper.getShell();
- SelectTasksWizard wiz = new SelectTasksWizard(null);
- ClosableWizardDialog dialog = new ClosableWizardDialog(shell, wiz);
- UITestHelper.assertDialog(dialog);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/IOrderedTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/IOrderedTestCase.java
deleted file mode 100644
index b797f46..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/IOrderedTestCase.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests.editor;
-
-import org.eclipse.wst.server.ui.internal.editor.IOrdered;
-import org.eclipse.wst.server.ui.tests.OrderedTestSuite;
-import org.eclipse.wst.server.ui.tests.impl.TestOrdered;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class IOrderedTestCase extends TestCase {
- protected static IOrdered ordered;
-
- public static Test suite() {
- return new OrderedTestSuite(IOrderedTestCase.class, "IOrderedTestCase");
- }
-
- public void test00Create() {
- ordered = new TestOrdered();
- }
-
- public void test01GetOrder() {
- ordered.getOrder();
- }
-}
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/IServerEditorPartInputTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/IServerEditorPartInputTestCase.java
deleted file mode 100644
index e0650b1..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/IServerEditorPartInputTestCase.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests.editor;
-
-import org.eclipse.wst.server.ui.editor.IServerEditorPartInput;
-import org.eclipse.wst.server.ui.tests.OrderedTestSuite;
-import org.eclipse.wst.server.ui.tests.impl.TestServerEditorPartInput;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class IServerEditorPartInputTestCase extends TestCase {
- protected static IServerEditorPartInput input;
-
- public static Test suite() {
- return new OrderedTestSuite(IServerEditorPartInputTestCase.class, "IServerEditorPartInputTestCase");
- }
-
- public void test00Create() {
- input = new TestServerEditorPartInput();
- }
-
- public void test01GetServer() {
- input.getServer();
- }
-
- public void test02IsServerReadOnly() {
- input.isServerReadOnly();
- }
-
- public void test04Exists() {
- input.exists();
- }
-
- public void test05GetImageDescriptor() {
- input.getImageDescriptor();
- }
-
- public void test06GetName() {
- input.getName();
- }
-
- public void test07GetPersistable() {
- input.getPersistable();
- }
-
- public void test08GetToolTipText() {
- input.getToolTipText();
- }
-
- public void test09GetAdapter() {
- input.getAdapter(null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/ServerEditorActionFactoryDelegateTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/ServerEditorActionFactoryDelegateTestCase.java
deleted file mode 100644
index 955ad10..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/ServerEditorActionFactoryDelegateTestCase.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests.editor;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.ui.internal.provisional.ServerEditorActionFactoryDelegate;
-import org.eclipse.wst.server.ui.tests.OrderedTestSuite;
-import org.eclipse.wst.server.ui.tests.impl.TestServerEditorActionFactoryDelegate;
-
-public class ServerEditorActionFactoryDelegateTestCase extends TestCase {
- protected static ServerEditorActionFactoryDelegate delegate;
-
- public static Test suite() {
- return new OrderedTestSuite(ServerEditorActionFactoryDelegateTestCase.class, "ServerEditorActionFactoryDelegateTestCase");
- }
-
- public void test00CreateDelegate() throws Exception {
- delegate = new TestServerEditorActionFactoryDelegate();
- }
-
- public void test01ShouldDisplay() throws Exception {
- delegate.shouldDisplay(null);
- }
-
- public void test02CreateAction() throws Exception {
- delegate.createAction(null, null);
- }
-}
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/ServerEditorPartTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/ServerEditorPartTestCase.java
deleted file mode 100644
index e13286b..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/ServerEditorPartTestCase.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests.editor;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.server.ui.editor.ServerEditorPart;
-import org.eclipse.wst.server.ui.tests.OrderedTestSuite;
-
-public class ServerEditorPartTestCase extends TestCase {
- protected static ServerEditorPart editor;
-
- public static Test suite() {
- return new OrderedTestSuite(ServerEditorPartTestCase.class, "ServerEditorPartTestCase");
- }
-
- public void test00CreateEditor() {
- editor = new ServerEditorPart() {
- public void createPartControl(Composite parent) {
- // do nothing
- }
-
- public void setFocus() {
- // do nothing
- }
- };
- }
-
- public void test02DoSave() {
- editor.doSave(null);
- }
-
- public void test03SaveAs() {
- editor.doSaveAs();
- }
-
- public void test04IsDirty() {
- editor.isDirty();
- }
-
- public void test05IsSaveAsAllowed() {
- editor.isSaveAsAllowed();
- }
-
- public void test06SetErrorMessage() {
- editor.setErrorMessage(null);
- }
-
- public void test07UpdateErrorMessage() {
- editor.updateErrorMessage();
- }
-
- public void test08GetErrorMessage() {
- try {
- editor.getErrorMessage();
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test09GetSaveStatus() {
- editor.getSaveStatus();
- }
-
- public void test10Init() {
- try {
- editor.init(null, null);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test11GetServer() {
- editor.getServer();
- }
-
- public void test12InsertSections() {
- editor.insertSections(null, null);
- }
-
- public void test12Dispose() {
- editor.dispose();
- }
-
- public void test13TestProtectedMethods() {
- class MyServerEditorPart extends ServerEditorPart {
- public void testProtected() {
- try {
- getFormToolkit(null);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void createPartControl(Composite parent) {
- // do nothing
- }
-
- public void setFocus() {
- // do nothing
- }
- }
- MyServerEditorPart msep = new MyServerEditorPart();
- msep.testProtected();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/ServerEditorSectionTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/ServerEditorSectionTestCase.java
deleted file mode 100644
index d7bd2cf..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/ServerEditorSectionTestCase.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests.editor;
-
-import org.eclipse.wst.server.ui.editor.ServerEditorSection;
-import org.eclipse.wst.server.ui.tests.OrderedTestSuite;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class ServerEditorSectionTestCase extends TestCase {
- protected static ServerEditorSection section;
-
- public static Test suite() {
- return new OrderedTestSuite(ServerEditorSectionTestCase.class, "ServerEditorSectionTestCase");
- }
-
- public void test00Create() {
- section = new ServerEditorSection() {
- // do nothing
- };
- }
-
- public void test01Init() {
- section.init(null, null);
- }
-
- public void test02CreateSection() {
- section.createSection(null);
- }
-
- public void test03Dispose() {
- section.dispose();
- }
-
- public void test04GetErrorMessage() {
- section.getErrorMessage();
- }
-
- public void test05GetSaveStatus() {
- section.getSaveStatus();
- }
-
- public void test06GetShell() {
- try {
- section.getShell();
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test07SetServerEditorPart() {
- section.setServerEditorPart(null);
- }
-
- public void test08SetErrorMessage() {
- section.setErrorMessage(null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/impl/TestOrdered.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/impl/TestOrdered.java
deleted file mode 100644
index 121a569..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/impl/TestOrdered.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests.impl;
-
-import org.eclipse.wst.server.ui.internal.editor.IOrdered;
-
-public class TestOrdered implements IOrdered {
-
- public int getOrder() {
- return 0;
- }
-}
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/impl/TestServerEditorActionFactoryDelegate.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/impl/TestServerEditorActionFactoryDelegate.java
deleted file mode 100644
index 0dfeb6f..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/impl/TestServerEditorActionFactoryDelegate.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests.impl;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.wst.server.ui.editor.IServerEditorPartInput;
-import org.eclipse.wst.server.ui.internal.provisional.ServerEditorActionFactoryDelegate;
-
-public class TestServerEditorActionFactoryDelegate extends ServerEditorActionFactoryDelegate {
-
- public IAction createAction(IEditorSite site, IServerEditorPartInput input) {
- return null;
- }
-}
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/impl/TestServerEditorPartInput.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/impl/TestServerEditorPartInput.java
deleted file mode 100644
index 0fbfa04..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/impl/TestServerEditorPartInput.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests.impl;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.ui.editor.IServerEditorPartInput;
-
-public class TestServerEditorPartInput implements IServerEditorPartInput{
- public IServerWorkingCopy getServer() {
- return null;
- }
-
- public boolean isServerReadOnly() {
- return false;
- }
-
- public boolean exists() {
- return false;
- }
-
- public ImageDescriptor getImageDescriptor() {
- return null;
- }
-
- public String getName() {
- return null;
- }
-
- public IPersistableElement getPersistable() {
- return null;
- }
-
- public String getToolTipText() {
- return null;
- }
-
- public Object getAdapter(Class adapter) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/impl/TestWizardHandle.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/impl/TestWizardHandle.java
deleted file mode 100644
index a688192..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/impl/TestWizardHandle.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests.impl;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.wst.server.ui.wizard.IWizardHandle;
-
-public class TestWizardHandle implements IWizardHandle {
- private String message = null;
- private int messageType = IMessageProvider.NONE;
-
- public void update() {
- // ignore
- }
-
- public void setTitle(String title) {
- // ignore
- }
-
- public void setDescription(String desc) {
- // ignore
- }
-
- public void setImageDescriptor(ImageDescriptor image) {
- // ignore
- }
-
- public void setMessage(String newMessage, int newType) {
- message = newMessage;
- messageType = newType;
- }
-
- public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InterruptedException, InvocationTargetException {
- // ignore
- }
-
- public String getMessage() {
- return message;
- }
-
- public int getMessageType() {
- return messageType;
- }
-}
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/wizard/IWizardHandleTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/wizard/IWizardHandleTestCase.java
deleted file mode 100644
index 53d6a04..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/wizard/IWizardHandleTestCase.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests.wizard;
-
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.wst.server.ui.tests.OrderedTestSuite;
-import org.eclipse.wst.server.ui.tests.impl.TestWizardHandle;
-import org.eclipse.wst.server.ui.wizard.IWizardHandle;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class IWizardHandleTestCase extends TestCase {
- protected static IWizardHandle wizardHandle;
- private final String sampleMessage = "Sample message";
- private final int sampleMessageType = IMessageProvider.ERROR;
-
- public static Test suite() {
- return new OrderedTestSuite(IWizardHandleTestCase.class, "IWizardHandleTestCase");
- }
-
- public void test00Create() {
- wizardHandle = new TestWizardHandle();
- }
-
- public void test01Run() throws Exception {
- wizardHandle.run(true, true, null);
- }
-
- public void test02SetDescription() {
- wizardHandle.setDescription(null);
- }
-
- public void test03SetImageDescriptor() {
- wizardHandle.setImageDescriptor(null);
- }
-
- public void test04SetMessage() {
- wizardHandle.setMessage(sampleMessage, sampleMessageType);
- }
-
- public void test05SetTitle() {
- wizardHandle.setTitle(null);
- }
-
- public void test06Update() {
- wizardHandle.update();
- }
-
- public void test07GetMessage() {
- assertEquals(sampleMessage, wizardHandle.getMessage());
- }
-
- public void test08GetMessageType() {
- assertEquals(sampleMessageType, wizardHandle.getMessageType());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/wizard/TaskWizardTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/wizard/TaskWizardTestCase.java
deleted file mode 100644
index 131ea6b..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/wizard/TaskWizardTestCase.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests.wizard;
-
-import org.eclipse.wst.server.ui.internal.wizard.TaskWizard;
-import org.eclipse.wst.server.ui.tests.OrderedTestSuite;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class TaskWizardTestCase extends TestCase {
- protected static TaskWizard wizard;
-
- public static Test suite() {
- return new OrderedTestSuite(TaskWizardTestCase.class, "TaskWizardTestCase");
- }
-
- public void test00Create() {
- wizard = new TaskWizard("title", null, null);
- }
-
- public void test02Create() {
- wizard = new TaskWizard("title", null);
- }
-
- public void test04GetContainer() {
- wizard.getContainer();
- }
-
- public void test05SetRootFragment() {
- wizard.setRootFragment(null);
- }
-
- public void test06GetRootFragment() {
- wizard.getRootFragment();
- }
-
- public void test07PerformCancel() {
- try {
- wizard.performCancel();
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test08PerformFinish() {
- try {
- wizard.performFinish();
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test09AddPage() {
- try {
- wizard.addPage(null);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test10AddPages() {
- wizard.addPages();
- }
-
- public void test11CanFinish() {
- wizard.canFinish();
- }
-
- public void test12CreatePageControls() {
- wizard.createPageControls(null);
- }
-
- public void test13Dispose() {
- wizard.dispose();
- }
-
- public void test14GetDefaultPageImage() {
- wizard.getDefaultPageImage();
- }
-
- public void test15GetDialogSettings() {
- wizard.getDialogSettings();
- }
-
- public void test16GetNextPage() {
- wizard.getNextPage(null);
- }
-
- public void test17GetPage() {
- wizard.getPage(null);
- }
-
- public void test18GetPageCount() {
- wizard.getPageCount();
- }
-
- public void test19GetPages() {
- wizard.getPages();
- }
-
- public void test20GetPreviousPage() {
- wizard.getPreviousPage(null);
- }
-
- public void test21GetStartingPage() {
- wizard.getStartingPage();
- }
-
- public void test22GetTitleBarColor() {
- wizard.getTitleBarColor();
- }
-
- public void test23GetWindowTitle() {
- wizard.getWindowTitle();
- }
-
- public void test24IsHelpAvailable() {
- wizard.isHelpAvailable();
- }
-
- public void test25NeedsPreviousAndNextButtons() {
- wizard.needsPreviousAndNextButtons();
- }
-
- public void test26NeedsProgressMonitor() {
- wizard.needsProgressMonitor();
- }
-
- public void test27SetContainer() {
- wizard.setContainer(null);
- }
-
- public void test28SetDialogSettings() {
- wizard.setDialogSettings(null);
- }
-
- public void test29SetNeedsProgressMonitor() {
- wizard.setNeedsProgressMonitor(false);
- }
-
- public void test30SetForcePreviousAndNextButtons() {
- wizard.setForcePreviousAndNextButtons(false);
- }
-
- public void test31SetWindowTitle() {
- wizard.setWindowTitle("title");
- }
-
- public void test32TestProtected() {
- class MyTaskWizard extends TaskWizard {
- public MyTaskWizard() {
- super(null, null, null);
- }
-
- public void testProtected() {
- try {
- executeTask(null, (byte)0, null);
- } catch (Exception e) {
- // ignore
- }
- getCurrentWizardFragment();
- try {
- switchWizardFragment(null);
- } catch (Exception e) {
- // ignore
- }
- updatePages();
- useJob();
- getJobTitle();
- }
- }
- MyTaskWizard mtw = new MyTaskWizard();
- mtw.testProtected();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/wizard/WizardFragmentTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/wizard/WizardFragmentTestCase.java
deleted file mode 100644
index a350769..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/wizard/WizardFragmentTestCase.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * 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
- *******************************************************************************/
-package org.eclipse.wst.server.ui.tests.wizard;
-
-import org.eclipse.wst.server.ui.tests.OrderedTestSuite;
-import org.eclipse.wst.server.ui.wizard.WizardFragment;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class WizardFragmentTestCase extends TestCase {
- protected static WizardFragment fragment;
-
- public static Test suite() {
- return new OrderedTestSuite(WizardFragmentTestCase.class, "WizardFragmentTestCase");
- }
-
- public void test00CreateFragment() {
- fragment = new WizardFragment() {
- // do nothing
- };
- }
-
- public void test01HasComposite() {
- fragment.hasComposite();
- }
-
- public void test02CreateComposite() {
- fragment.createComposite(null, null);
- }
-
- public void test03SetTaskModel() {
- fragment.setTaskModel(null);
- }
-
- public void test04GetTaskModel() {
- fragment.getTaskModel();
- }
-
- public void test05Enter() {
- fragment.enter();
- }
-
- public void test06Exit() {
- fragment.exit();
- }
-
- public void test09GetChildFragments() {
- fragment.getChildFragments();
- }
-
- public void test10IsComplete() {
- fragment.isComplete();
- }
-
- public void test11TestProtected() {
- class MyWizardFragment extends WizardFragment {
- public void testProtected() {
- updateChildFragments();
- createChildFragments(null);
- setComplete(false);
- }
- }
- MyWizardFragment mwf = new MyWizardFragment();
- mwf.testProtected();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.ui.tests/test.xml b/tests/org.eclipse.wst.server.ui.tests/test.xml
deleted file mode 100644
index f57c5c8..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/test.xml
+++ /dev/null
@@ -1,49 +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.wst.server.ui.tests"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
-
- <!-- 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="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.server.ui.tests.AllTests" />
- <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">
- </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.wst.server.util.tests/.project b/tests/org.eclipse.wst.server.util.tests/.project
deleted file mode 100644
index be26a53..0000000
--- a/tests/org.eclipse.wst.server.util.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.server.util.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>
