This commit was manufactured by cvs2svn to create tag 'v200610151942'.
diff --git a/tests/org.eclipse.jst.server.core.tests/.classpath b/tests/org.eclipse.jst.server.core.tests/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.jst.server.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.core.tests/.cvsignore b/tests/org.eclipse.jst.server.core.tests/.cvsignore
deleted file mode 100644
index 6c1b57a..0000000
--- a/tests/org.eclipse.jst.server.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.core.tests/.project b/tests/org.eclipse.jst.server.core.tests/.project
deleted file mode 100644
index f4924aa..0000000
--- a/tests/org.eclipse.jst.server.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.server.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.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.server.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index bc71085..0000000
--- a/tests/org.eclipse.jst.server.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,47 +0,0 @@
-#Thu May 26 14:34:45 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.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.server.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 787918b..0000000
--- a/tests/org.eclipse.jst.server.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.core.tests
-Bundle-SymbolicName: org.eclipse.jst.server.core.tests
-Bundle-Version: 1.0.102.qualifier
-Bundle-ClassPath: tests.jar
-Bundle-Activator: org.eclipse.jst.server.core.tests.TestsPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.server.core.tests,
- org.eclipse.jst.server.core.tests.impl
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.junit,
- org.eclipse.jdt.core,
- org.eclipse.jdt.launching,
- org.eclipse.wst.server.core,
- org.eclipse.jst.server.core
-Eclipse-LazyStart: true
diff --git a/tests/org.eclipse.jst.server.core.tests/about.html b/tests/org.eclipse.jst.server.core.tests/about.html
deleted file mode 100644
index 4ec5989..0000000
--- a/tests/org.eclipse.jst.server.core.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.server.core.tests/build.properties b/tests/org.eclipse.jst.server.core.tests/build.properties
deleted file mode 100644
index d18562a..0000000
--- a/tests/org.eclipse.jst.server.core.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 = test.xml,\
- tests.jar,\
- META-INF/,\
- about.html,\
- data/
-jars.compile.order = tests.jar
-source.tests.jar = src/
-output.tests.jar = bin/
diff --git a/tests/org.eclipse.jst.server.core.tests/data/PublishEAR.zip b/tests/org.eclipse.jst.server.core.tests/data/PublishEAR.zip
deleted file mode 100644
index 57083ba..0000000
--- a/tests/org.eclipse.jst.server.core.tests/data/PublishEAR.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.server.core.tests/data/PublishEARNoSource.zip b/tests/org.eclipse.jst.server.core.tests/data/PublishEARNoSource.zip
deleted file mode 100644
index b83ce95..0000000
--- a/tests/org.eclipse.jst.server.core.tests/data/PublishEARNoSource.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.server.core.tests/data/PublishTestBinary.zip b/tests/org.eclipse.jst.server.core.tests/data/PublishTestBinary.zip
deleted file mode 100644
index 490214d..0000000
--- a/tests/org.eclipse.jst.server.core.tests/data/PublishTestBinary.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/AllTests.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/AllTests.java
deleted file mode 100644
index 900a7ec..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/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.core.tests;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
- public static IPath runtimeLocation;
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.jst.server.core.tests");
- //$JUnit-BEGIN$
- System.setProperty("wtp.autotest.noninteractive", "true");
-
- suite.addTestSuite(ExistenceTest.class);
- suite.addTest(new OrderedTestSuite(GenericRuntimeTestCase.class));
-
- suite.addTest(new OrderedTestSuite(J2EEModuleTestCase.class));
- suite.addTest(new OrderedTestSuite(ApplicationClientTestCase.class));
- suite.addTest(new OrderedTestSuite(ConnectorModuleTestCase.class));
- suite.addTest(new OrderedTestSuite(EJBModuleTestCase.class));
- suite.addTest(new OrderedTestSuite(WebModuleTestCase.class));
- suite.addTest(new OrderedTestSuite(EnterpriseApplicationTestCase.class));
-
- suite.addTest(new OrderedTestSuite(EJBBeanTestCase.class));
- suite.addTest(new OrderedTestSuite(ServletTestCase.class));
- suite.addTest(new OrderedTestSuite(JndiObjectTestCase.class));
- suite.addTest(new OrderedTestSuite(JndiLaunchableTestCase.class));
-
- suite.addTest(new OrderedTestSuite(RuntimeClasspathProviderDelegateTestCase.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) {
- if (!s.endsWith(File.separator))
- s += File.separator;
- runtimeLocation = new Path(s + "lib");
- }
- s = System.getProperty("org.eclipse.jst.server.tomcat.40");
- if (s != null && s.length() > 0) {
- if (!s.endsWith(File.separator))
- s += File.separator;
- runtimeLocation = new Path(s + "common" + File.separator + "lib");
- }
-
- // bug 160848
- /*
- if (runtimeLocation != null)
- suite.addTest(new OrderedTestSuite(ModuleTestCase.class));
-
- suite.addTest(new OrderedTestSuite(NoSourceTestCase.class));
- suite.addTest(new OrderedTestSuite(BinaryTestCase.class));
- */
- //$JUnit-END$
- return suite;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ApplicationClientTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ApplicationClientTestCase.java
deleted file mode 100644
index 7ab5a15..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ApplicationClientTestCase.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.jst.server.core.tests;
-
-import org.eclipse.jst.server.core.IApplicationClientModule;
-import org.eclipse.jst.server.core.tests.impl.TestApplicationClientModule;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class ApplicationClientTestCase extends TestCase {
- protected static IApplicationClientModule module;
-
- public static Test suite() {
- return new OrderedTestSuite(ApplicationClientTestCase.class, "ApplicationClientTestCase");
- }
-
- public void test00Create() {
- module = new TestApplicationClientModule();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ConnectorModuleTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ConnectorModuleTestCase.java
deleted file mode 100644
index b4bd5cc..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ConnectorModuleTestCase.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.jst.server.core.tests;
-
-import org.eclipse.jst.server.core.IConnectorModule;
-import org.eclipse.jst.server.core.tests.impl.TestConnectorModule;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class ConnectorModuleTestCase extends TestCase {
- protected static IConnectorModule module;
-
- public static Test suite() {
- return new OrderedTestSuite(ConnectorModuleTestCase.class, "ConnectorModuleTestCase");
- }
-
- public void test00Create() {
- module = new TestConnectorModule();
- }
-
- public void test04Classpath() {
- module.getClasspath();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/EJBBeanTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/EJBBeanTestCase.java
deleted file mode 100644
index 8529c17..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/EJBBeanTestCase.java
+++ /dev/null
@@ -1,43 +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.core.tests;
-
-import org.eclipse.jst.server.core.EJBBean;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class EJBBeanTestCase extends TestCase {
- protected static EJBBean bean;
-
- public static Test suite() {
- return new OrderedTestSuite(EJBBeanTestCase.class, "EJBBeanTestCase");
- }
-
- public void test00Create() {
- bean = new EJBBean(null, "test", false, true);
- }
-
- public void test01GetModule() {
- assertNull(bean.getModule());
- }
-
- public void test02GetJNDIName() {
- assertEquals(bean.getJndiName(), "test");
- }
-
- public void test03Local() {
- assertTrue(bean.hasLocalInterface());
- }
-
- public void test04Remote() {
- assertFalse(bean.hasRemoteInterface());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/EJBModuleTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/EJBModuleTestCase.java
deleted file mode 100644
index e5e34ae..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/EJBModuleTestCase.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.jst.server.core.tests;
-
-import org.eclipse.jst.server.core.IEJBModule;
-import org.eclipse.jst.server.core.tests.impl.TestEJBModule;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class EJBModuleTestCase extends TestCase {
- protected static IEJBModule module;
-
- public static Test suite() {
- return new OrderedTestSuite(EJBModuleTestCase.class, "EJBModuleTestCase");
- }
-
- public void test00Create() {
- module = new TestEJBModule();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/EnterpriseApplicationTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/EnterpriseApplicationTestCase.java
deleted file mode 100644
index 16a7ebb..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/EnterpriseApplicationTestCase.java
+++ /dev/null
@@ -1,37 +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.core.tests;
-
-import org.eclipse.jst.server.core.IEnterpriseApplication;
-import org.eclipse.jst.server.core.tests.impl.TestEnterpriseApplication;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class EnterpriseApplicationTestCase extends TestCase {
- protected static IEnterpriseApplication app;
-
- public static Test suite() {
- return new OrderedTestSuite(EnterpriseApplicationTestCase.class, "EnterpriseApplicationTestCase");
- }
-
- public void test00Create() {
- app = new TestEnterpriseApplication();
- }
-
- public void test03Modules() {
- app.getModules();
- }
-
- public void test04URI() {
- app.getURI(null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ExistenceTest.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ExistenceTest.java
deleted file mode 100644
index bf33320..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/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.core.tests;
-
-import org.eclipse.jst.server.core.internal.JavaServerPlugin;
-import junit.framework.TestCase;
-
-public class ExistenceTest extends TestCase {
- public void testPluginExists() {
- assertNotNull(JavaServerPlugin.getInstance());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/GenericRuntimeTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/GenericRuntimeTestCase.java
deleted file mode 100644
index 90ca50f..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/GenericRuntimeTestCase.java
+++ /dev/null
@@ -1,89 +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.core.tests;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.server.core.internal.GenericRuntimeUtil;
-import org.eclipse.jst.server.core.internal.IGenericRuntime;
-import org.eclipse.jst.server.core.internal.IGenericRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.*;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class GenericRuntimeTestCase extends TestCase {
- private static final String RUNTIME_TYPE_ID = "org.eclipse.jst.server.core.runtimeType";
-
- protected static IRuntime runtime;
- protected static IRuntime runtimeWC;
- protected static IGenericRuntime genericRuntime;
- protected static IGenericRuntimeWorkingCopy genericRuntimeWC;
-
- public static Test suite() {
- return new OrderedTestSuite(GenericRuntimeTestCase.class, "GenericRuntimeTestCase");
- }
-
- public void test00CreateRuntime() throws Exception {
- IRuntimeType rt = ServerCore.findRuntimeType(RUNTIME_TYPE_ID);
- IRuntimeWorkingCopy wc = rt.createRuntime("a", null);
- wc.setLocation(new Path("c://test"));
- runtime = wc.save(false, null);
-
- assertTrue(!runtime.isWorkingCopy());
- }
-
- public void test01ValidateRuntime() throws Exception {
- IStatus status = runtime.validate(null);
- assertTrue(!status.isOK());
- }
-
- public void test02Util() throws Exception {
- assertTrue(GenericRuntimeUtil.isGenericJ2EERuntime(runtime));
- }
-
- public void test03Adapt() throws Exception {
- genericRuntime = (IGenericRuntime) runtime.getAdapter(IGenericRuntime.class);
- assertNotNull(genericRuntime);
- }
-
- public void test04Adapt() throws Exception {
- assertNotNull(runtime.getAdapter(IGenericRuntimeWorkingCopy.class));
- }
-
- public void test05GetJVM() throws Exception {
- assertNotNull(genericRuntime.getVMInstall());
- }
-
- public void test06Adapt() throws Exception {
- runtimeWC = runtime.createWorkingCopy();
- genericRuntimeWC = (IGenericRuntimeWorkingCopy) runtimeWC.loadAdapter(IGenericRuntimeWorkingCopy.class, null);
- assertNotNull(genericRuntimeWC);
- }
-
- public void test07Adapt() throws Exception {
- assertNotNull(runtimeWC.loadAdapter(IGenericRuntime.class, null));
- }
-
- public void test08SetJVM() throws Exception {
- assertNotNull(genericRuntimeWC.getVMInstall());
- genericRuntimeWC.setVMInstall(null);
- assertNotNull(genericRuntimeWC.getVMInstall());
- }
-
- public void test09DeleteRuntime() throws Exception {
- runtime.delete();
- runtime = null;
- runtimeWC = null;
- genericRuntime = null;
- genericRuntimeWC = null;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/J2EEModuleTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/J2EEModuleTestCase.java
deleted file mode 100644
index fb1e630..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/J2EEModuleTestCase.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.jst.server.core.tests;
-
-import org.eclipse.jst.server.core.IJ2EEModule;
-import org.eclipse.jst.server.core.tests.impl.TestJ2EEModule;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class J2EEModuleTestCase extends TestCase {
- protected static IJ2EEModule module;
-
- public static Test suite() {
- return new OrderedTestSuite(J2EEModuleTestCase.class, "J2EEModuleTestCase");
- }
-
- public void test00Create() {
- module = new TestJ2EEModule();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/JndiLaunchableTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/JndiLaunchableTestCase.java
deleted file mode 100644
index c4828b9..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/JndiLaunchableTestCase.java
+++ /dev/null
@@ -1,35 +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.core.tests;
-
-import org.eclipse.jst.server.core.JndiLaunchable;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class JndiLaunchableTestCase extends TestCase {
- protected static JndiLaunchable launch;
-
- public static Test suite() {
- return new OrderedTestSuite(JndiLaunchableTestCase.class, "JndiLaunchableTestCase");
- }
-
- public void test00Create() {
- launch = new JndiLaunchable(null, "test");
- }
-
- public void test01GetProperties() {
- assertNull(launch.getProperties());
- }
-
- public void test02GetJNDIName() {
- assertEquals(launch.getJNDIName(), "test");
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/JndiObjectTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/JndiObjectTestCase.java
deleted file mode 100644
index f3bf45a..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/JndiObjectTestCase.java
+++ /dev/null
@@ -1,35 +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.core.tests;
-
-import org.eclipse.jst.server.core.JndiObject;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class JndiObjectTestCase extends TestCase {
- protected static JndiObject obj;
-
- public static Test suite() {
- return new OrderedTestSuite(JndiObjectTestCase.class, "JndiObjectTestCase");
- }
-
- public void test00Create() {
- obj = new JndiObject(null, "test");
- }
-
- public void test01GetModule() {
- assertNull(obj.getModule());
- }
-
- public void test02GetJNDIName() {
- assertEquals(obj.getJndiName(), "test");
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/OrderedTestSuite.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/OrderedTestSuite.java
deleted file mode 100644
index c5abe59..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/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.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();
- 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.core.tests/src/org/eclipse/jst/server/core/tests/RuntimeClasspathProviderDelegateTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/RuntimeClasspathProviderDelegateTestCase.java
deleted file mode 100644
index 6ec8746..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/RuntimeClasspathProviderDelegateTestCase.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.jst.server.core.tests;
-
-import org.eclipse.jst.server.core.RuntimeClasspathProviderDelegate;
-import org.eclipse.jst.server.core.tests.impl.TestRuntimeClasspathProviderDelegate;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class RuntimeClasspathProviderDelegateTestCase extends TestCase {
- protected static RuntimeClasspathProviderDelegate handler;
-
- public static Test suite() {
- return new OrderedTestSuite(RuntimeClasspathProviderDelegateTestCase.class, "RuntimeClasspathProviderDelegateTestCase");
- }
-
- public void test00Create() {
- handler = new TestRuntimeClasspathProviderDelegate();
- }
-
- public void test01ResolveClasspathContainer() {
- handler.resolveClasspathContainer(null);
- }
-
- public void test02ResolveClasspathContainer() {
- handler.resolveClasspathContainer(null, null);
- }
-
- public void test03ResolveClasspathContainerImpl() {
- handler.resolveClasspathContainerImpl(null);
- }
-
- public void test04ResolveClasspathContainerImpl() {
- handler.resolveClasspathContainerImpl(null, null);
- }
-
- public void test05TestAddMethods() {
- ((TestRuntimeClasspathProviderDelegate) handler).testAddMethods();
- }
-
- public void test06RequestClasspathContainerUpdate() {
- handler.requestClasspathContainerUpdate(null, null);
- }
-
- public void test07HasRuntimeClasspathChanged() {
- handler.hasRuntimeClasspathChanged(null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ServletTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ServletTestCase.java
deleted file mode 100644
index a410d8e..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ServletTestCase.java
+++ /dev/null
@@ -1,43 +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.core.tests;
-
-import org.eclipse.jst.server.core.Servlet;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class ServletTestCase extends TestCase {
- protected static Servlet servlet;
-
- public static Test suite() {
- return new OrderedTestSuite(ServletTestCase.class, "ServletTestCase");
- }
-
- public void test00Create() {
- servlet = new Servlet(null, "class", "alias");
- }
-
- public void test01GetModule() {
- assertNull(servlet.getModule());
- }
-
- public void test02GetClassName() {
- assertEquals(servlet.getServletClassName(), "class");
- }
-
- public void test02GetAlias() {
- assertEquals(servlet.getAlias(), "alias");
- }
-
- public void test03ToString() {
- servlet.toString();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/TestsPlugin.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/TestsPlugin.java
deleted file mode 100644
index c1a27fa..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/TestsPlugin.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.core.tests;
-
-import org.eclipse.core.runtime.Plugin;
-/**
- *
- */
-public class TestsPlugin extends Plugin {
- public static TestsPlugin instance;
-
- /**
- * The constructor.
- */
- public TestsPlugin() {
- super();
- instance = this;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/WebModuleTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/WebModuleTestCase.java
deleted file mode 100644
index 6e9b304..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/WebModuleTestCase.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.jst.server.core.tests;
-
-import org.eclipse.jst.server.core.IWebModule;
-import org.eclipse.jst.server.core.tests.impl.TestWebModule;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class WebModuleTestCase extends TestCase {
- protected static IWebModule module;
-
- public static Test suite() {
- return new OrderedTestSuite(WebModuleTestCase.class, "WebModuleTestCase");
- }
-
- public void test00Create() {
- module = new TestWebModule();
- }
-
- public void test06ContextRoot() {
- module.getContextRoot();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestApplicationClientModule.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestApplicationClientModule.java
deleted file mode 100644
index 19369c5..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestApplicationClientModule.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.core.tests.impl;
-
-import org.eclipse.jst.server.core.IApplicationClientModule;
-
-public class TestApplicationClientModule extends TestJ2EEModule implements IApplicationClientModule {
- // no additonal methods
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestConnectorModule.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestConnectorModule.java
deleted file mode 100644
index 152ec14..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestConnectorModule.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.core.tests.impl;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.server.core.IConnectorModule;
-
-public class TestConnectorModule extends TestJ2EEModule implements IConnectorModule {
- public IPath[] getClasspath() {
- return null;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestEJBModule.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestEJBModule.java
deleted file mode 100644
index 7676c6c..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestEJBModule.java
+++ /dev/null
@@ -1,19 +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.core.tests.impl;
-
-import org.eclipse.jst.server.core.IEJBModule;
-
-public class TestEJBModule extends TestJ2EEModule implements IEJBModule {
- public String getEJBSpecificationVersion() {
- return null;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestEnterpriseApplication.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestEnterpriseApplication.java
deleted file mode 100644
index 3064bbe..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestEnterpriseApplication.java
+++ /dev/null
@@ -1,47 +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.core.tests.impl;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.server.core.IEnterpriseApplication;
-import org.eclipse.jst.server.core.IJ2EEModule;
-import org.eclipse.wst.server.core.IModule;
-
-public class TestEnterpriseApplication implements IEnterpriseApplication {
- public String getJ2EESpecificationVersion() {
- return null;
- }
-
- public IPath getLocation() {
- return null;
- }
-
- public IModule[] getModules() {
- return null;
- }
-
- public String getURI(IJ2EEModule module) {
- return null;
- }
-
- public boolean containsLooseModules() {
- return false;
- }
-
- public String getURI(IModule module) {
- return null;
- }
-
- public IContainer[] getResourceFolders() {
- return null;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestJ2EEModule.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestJ2EEModule.java
deleted file mode 100644
index 6566ffc..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestJ2EEModule.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.jst.server.core.tests.impl;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.jst.server.core.IJ2EEModule;
-
-public class TestJ2EEModule implements IJ2EEModule {
- public boolean isBinary() {
- return false;
- }
-
- public IContainer[] getResourceFolders() {
- return null;
- }
-
- public IContainer[] getJavaOutputFolders() {
- return null;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestRuntimeClasspathProviderDelegate.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestRuntimeClasspathProviderDelegate.java
deleted file mode 100644
index a7f1077..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestRuntimeClasspathProviderDelegate.java
+++ /dev/null
@@ -1,37 +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.core.tests.impl;
-
-import java.util.*;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jst.server.core.RuntimeClasspathProviderDelegate;
-import org.eclipse.wst.server.core.IRuntime;
-/**
- *
- */
-public class TestRuntimeClasspathProviderDelegate extends RuntimeClasspathProviderDelegate {
- public String getClasspathContainerLabel(IRuntime runtime, String id) {
- return null;
- }
-
- public IClasspathEntry[] resolveClasspathContainer(IRuntime runtime, String id) {
- return null;
- }
-
- public void testAddMethods() {
- List list = new ArrayList();
- try {
- addLibraryEntries(list, null, false);
- } catch (Exception e) {
- // ignore
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestWebModule.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestWebModule.java
deleted file mode 100644
index e433410..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestWebModule.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.core.tests.impl;
-
-import org.eclipse.jst.server.core.IWebModule;
-import org.eclipse.wst.server.core.IModule;
-
-public class TestWebModule extends TestJ2EEModule implements IWebModule {
- public String getServletSpecificationVersion() {
- return null;
- }
-
- public String getJSPSpecificationVersion() {
- return null;
- }
-
- public String getContextRoot() {
- return null;
- }
-
- public boolean isPublishRequired() {
- return false;
- }
-
- public IModule[] getModules() {
- return null;
- }
-
- public String getURI(IModule module) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/BinaryTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/BinaryTestCase.java
deleted file mode 100644
index 88074ba..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/BinaryTestCase.java
+++ /dev/null
@@ -1,369 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.server.core.tests.j2ee;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.server.core.IEnterpriseApplication;
-import org.eclipse.jst.server.core.IJ2EEModule;
-import org.eclipse.jst.server.core.IWebModule;
-import org.eclipse.jst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.*;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class BinaryTestCase extends TestCase {
- private static final String[] PROJECT_NAMES = new String[] {
- "PublishTestEAR", "PublishTestEJB", "test", "test2",
- "PublishTestWeb", "PublishTestWeb2", "PublishTestConnector", "PublishTestClient"
- };
-
- protected static IRuntime runtime;
- protected static IModule module;
- protected static IEnterpriseApplication ent;
- protected static IWebModule webModule;
- protected static IJ2EEModule j2eeModule;
-
- public static Test suite() {
- return new OrderedTestSuite(BinaryTestCase.class, "BinaryTestCase");
- }
-
- public void test001ImportModules() throws Exception {
- ModuleHelper.importProject("PublishTestBinary.zip", new String[] { PROJECT_NAMES[0] } );
- }
-
- public void test002IncrementalBuild() throws Exception {
- ModuleHelper.buildIncremental();
- }
-
- public void test003NumModules() throws Exception {
- assertEquals(ServerUtil.getModules("jst.ear").length, 1);
- }
-
- public void test004NumModules() throws Exception {
- assertEquals(ServerUtil.getModules("jst.web").length, 2);
- }
-
- public void test005NumModules() throws Exception {
- assertEquals(ServerUtil.getModules("jst.ejb").length, 1);
- }
-
- public void test006NumModules() throws Exception {
- assertEquals(ServerUtil.getModules("jst.utility").length, 0);
- }
-
- public void test007NumModules() throws Exception {
- assertEquals(ServerUtil.getModules("jst.appclient").length, 1);
- }
-
- public void test008NumModules() throws Exception {
- assertEquals(ServerUtil.getModules("jst.connector").length, 1);
- }
-
-
- // ---------- EAR tests ----------
-
- public void test020EAR() throws Exception {
- //module = ModuleHelper.getModuleFromProject("PublishTestEAR");
- module = ModuleHelper.getModule("jst.ear", "PublishTestEAR");
- assertNotNull(module);
- }
-
- public void test021EAR() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/application.xml"))
- fail();
- }
-
- public void test022EAR() throws Exception {
- if (!ModuleHelper.fileExists(module, "PublishTestUtil2.jar"))
- fail();
- }
-
- public void test023EAR() throws Exception {
- assertEquals(ModuleHelper.countFiles(module), 4);
- }
-
- public void test024EAR() throws Exception {
- assertEquals(ModuleHelper.countFolders(module), 1);
- }
-
- public void test025EAR() throws Exception {
- assertEquals(module.getModuleType().getId(), "jst.ear");
- }
-
- public void test026EAR() throws Exception {
- ent = (IEnterpriseApplication) module.loadAdapter(IEnterpriseApplication.class, null);
- assertNotNull(ent);
- }
-
- public void test027EAR() throws Exception {
- assertEquals(ent.getResourceFolders().length, 1);
- }
-
- public void test028EAR() throws Exception {
- assertEquals(ent.getModules().length, 5);
- }
-
- public void test029EAR() throws Exception {
- IModule[] modules = ent.getModules();
- int size = modules.length;
- List list = new ArrayList(size);
- for (int i = 0; i < size; i++) {
- list.add(modules[i].getName());
- }
-
- String[] s = new String[] {
- "PublishTestEJB.jar", "PublishTestWeb.war",
- "PublishTestWeb2.war", "PublishTestConnector.rar", "PublishTestClient.jar"
- };
-
- size = s.length;
- for (int i = 0; i < size; i++) {
- if (!list.contains("lib/PublishTestEAR/EarContent/" + s[i]))
- fail("EAR does not contain " + s[i]);
- }
- }
-
-
- // ---------- EJB tests ----------
-
- public void test080EJB() throws Exception {
- module = ModuleHelper.getModule("jst.ejb", "lib/PublishTestEAR/EarContent/PublishTestEJB.jar");
- assertNotNull(module);
- }
-
- public void test081EJB() throws Exception {
- if (!ModuleHelper.fileExists(module, "PublishTestEJB.jar"))
- fail();
- }
-
- public void test084EJB() throws Exception {
- assertEquals(ModuleHelper.countFiles(module), 1);
- }
-
- public void test085EJB() throws Exception {
- assertEquals(ModuleHelper.countFolders(module), 0);
- }
-
- public void test086EJB() throws Exception {
- assertEquals(module.getModuleType().getId(), "jst.ejb");
- }
-
- public void test087EJB() throws Exception {
- j2eeModule = (IJ2EEModule) module.loadAdapter(IJ2EEModule.class, null);
- assertNotNull(j2eeModule);
- }
-
- public void test088EJB() throws Exception {
- assertEquals(j2eeModule.getResourceFolders().length, 1);
- }
-
- public void test089EJB() throws Exception {
- assertEquals(j2eeModule.getJavaOutputFolders().length, 0);
- }
-
- public void test090EJB() throws Exception {
- assertTrue(j2eeModule.isBinary());
- }
-
-
- // ---------- Connector tests ----------
-
- public void test100Connector() throws Exception {
- module = ModuleHelper.getModule("jst.connector", "lib/PublishTestEAR/EarContent/PublishTestConnector.rar");
- assertNotNull(module);
- }
-
- public void test101Connector() throws Exception {
- if (!ModuleHelper.fileExists(module, "PublishTestConnector.rar"))
- fail();
- }
-
- public void test104Connector() throws Exception {
- assertEquals(ModuleHelper.countFiles(module), 1);
- }
-
- public void test105Connector() throws Exception {
- assertEquals(ModuleHelper.countFolders(module), 0);
- }
-
- public void test106Connector() throws Exception {
- assertEquals(module.getModuleType().getId(), "jst.connector");
- }
-
- public void test107Connector() throws Exception {
- j2eeModule = (IJ2EEModule) module.loadAdapter(IJ2EEModule.class, null);
- assertNotNull(j2eeModule);
- }
-
- public void test108Connector() throws Exception {
- assertEquals(j2eeModule.getResourceFolders().length, 1);
- }
-
- public void test109Connector() throws Exception {
- assertEquals(j2eeModule.getJavaOutputFolders().length, 0);
- }
-
- public void test110Connector() throws Exception {
- assertTrue(j2eeModule.isBinary());
- }
-
-
- // ---------- Client tests ----------
-
- public void test120Client() throws Exception {
- module = ModuleHelper.getModule("jst.appclient", "lib/PublishTestEAR/EarContent/PublishTestClient.jar");
- assertNotNull(module);
- }
-
- public void test121Client() throws Exception {
- if (!ModuleHelper.fileExists(module, "PublishTestClient.jar"))
- fail();
- }
-
- public void test125Client() throws Exception {
- assertEquals(ModuleHelper.countFiles(module), 1);
- }
-
- public void test126Client() throws Exception {
- assertEquals(ModuleHelper.countFolders(module), 0);
- }
-
- public void test127Client() throws Exception {
- assertEquals(module.getModuleType().getId(), "jst.appclient");
- }
-
- public void test128Client() throws Exception {
- j2eeModule = (IJ2EEModule) module.loadAdapter(IJ2EEModule.class, null);
- assertNotNull(j2eeModule);
- }
-
- public void test129Client() throws Exception {
- assertEquals(j2eeModule.getResourceFolders().length, 1);
- }
-
- public void test130Client() throws Exception {
- assertEquals(j2eeModule.getJavaOutputFolders().length, 0);
- }
-
- public void test131Client() throws Exception {
- assertTrue(j2eeModule.isBinary());
- }
-
-
- // ---------- Web 1 tests ----------
-
- public void test140Web() throws Exception {
- module = ModuleHelper.getModule("jst.web", "lib/PublishTestEAR/EarContent/PublishTestWeb.war");
- assertNotNull(module);
- }
-
- public void test141Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "PublishTestWeb.war"))
- fail();
- }
-
- public void test147Web() throws Exception {
- assertEquals(ModuleHelper.countFiles(module), 1);
- }
-
- public void test148Web() throws Exception {
- assertEquals(ModuleHelper.countFolders(module), 0);
- }
-
- public void test149Web() throws Exception {
- assertEquals(module.getModuleType().getId(), "jst.web");
- }
-
- public void test150Web() throws Exception {
- webModule = (IWebModule) module.loadAdapter(IWebModule.class, null);
- j2eeModule = webModule;
- assertNotNull(j2eeModule);
- }
-
- public void test151Web() throws Exception {
- assertEquals(j2eeModule.getResourceFolders().length, 1);
- }
-
- public void test152Web() throws Exception {
- assertEquals(j2eeModule.getJavaOutputFolders().length, 0);
- }
-
- public void test153Web() throws Exception {
- assertEquals(webModule.getModules().length, 0);
- }
-
- public void _test154Web() throws Exception {
- assertEquals(webModule.getContextRoot(), "PublishTestWeb");
- }
-
- public void test155Web() throws Exception {
- assertTrue(webModule.isBinary());
- }
-
-
- // ---------- Web 2 tests ----------
-
- public void test160Web() throws Exception {
- module = ModuleHelper.getModule("jst.web", "lib/PublishTestEAR/EarContent/PublishTestWeb2.war");
- assertNotNull(module);
- }
-
- public void test161Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "PublishTestWeb2.war"))
- fail();
- }
-
- public void test166Web() throws Exception {
- assertEquals(ModuleHelper.countFiles(module), 1);
- }
-
- public void test167Web() throws Exception {
- assertEquals(ModuleHelper.countFolders(module), 0);
- }
-
- public void test168Web() throws Exception {
- assertEquals(module.getModuleType().getId(), "jst.web");
- }
-
- public void test169Web() throws Exception {
- webModule = (IWebModule) module.loadAdapter(IWebModule.class, null);
- j2eeModule = webModule;
- assertNotNull(j2eeModule);
- }
-
- public void test170Web() throws Exception {
- assertEquals(j2eeModule.getResourceFolders().length, 1);
- }
-
- public void test171Web() throws Exception {
- assertEquals(j2eeModule.getJavaOutputFolders().length, 0);
- }
-
- public void test172Web() throws Exception {
- assertEquals(webModule.getModules().length, 0);
- }
-
- public void _test173Web() throws Exception {
- assertEquals(webModule.getContextRoot(), "PublishTestWeb2");
- }
-
- public void test174Client() throws Exception {
- assertTrue(webModule.isBinary());
- }
-
-
- public void test199Cleanup() throws Exception {
- ModuleHelper.deleteProject(PROJECT_NAMES[0]);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/DeleteModuleTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/DeleteModuleTestCase.java
deleted file mode 100644
index 404cfad..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/DeleteModuleTestCase.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.server.core.tests.j2ee;
-
-import org.eclipse.jst.server.core.tests.OrderedTestSuite;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class DeleteModuleTestCase extends TestCase {
- public static Test suite() {
- return new OrderedTestSuite(DeleteModuleTestCase.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.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/ModuleHelper.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/ModuleHelper.java
deleted file mode 100644
index 0f33027..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/ModuleHelper.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.server.core.tests.j2ee;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jst.server.core.tests.TestsPlugin;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.*;
-import org.eclipse.wst.server.core.util.ProjectModule;
-
-public class ModuleHelper {
- protected static IPath getLocalPath(IPath path) {
- try {
- URL url = FileLocator.find(TestsPlugin.instance.getBundle(), path, null);
- url = FileLocator.toFileURL(url);
- return new Path(url.getPath());
- } catch (IOException e) {
- e.printStackTrace();
- return null;
- }
- }
-
- public static boolean importProject(String zipName, String[] projectNames) {
- IPath zipPath = getLocalPath(new Path("data").append(zipName));
- ProjectUnzipUtil util = new ProjectUnzipUtil(zipPath, projectNames);
- return util.createProjects();
- }
-
- public static void deleteProject(final String projectName) throws Exception {
- class DeleteJob extends Job {
- public DeleteJob() {
- super("Deleting project");
-
- IResourceRuleFactory ruleFactory = ResourcesPlugin.getWorkspace().getRuleFactory();
- setRule(ruleFactory.createRule(ResourcesPlugin.getWorkspace().getRoot()));
- }
-
- protected IStatus run(IProgressMonitor monitor) {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- try {
- project.delete(true, null);
- } catch (CoreException ce) {
- return ce.getStatus();
- }
- return Status.OK_STATUS;
- }
- }
-
- Job job = new DeleteJob();
- job.schedule();
- job.join();
- //IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- //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 getModuleFromProject(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 project");
-
- return module;
- }
-
- public static IModule getModule(String type, String name) throws Exception {
- IModule[] module = ServerUtil.getModules(type);
- int size = module.length;
- for (int i = 0; i < size; i++) {
- if (module[i].getName().equals(name))
- return module[i];
- }
-
- return null;
- }
-
- public static int countFiles(IModule module) throws CoreException {
- ProjectModule pm = (ProjectModule) module.loadAdapter(ProjectModule.class, null);
- IModuleResource[] mr = pm.members();
-
- int count = 0;
- int size = mr.length;
- for (int i = 0; i < size; i++) {
- if (mr[i] instanceof IModuleFolder)
- count += countFiles((IModuleFolder) mr[i]);
- else
- count++;
- }
-
- return count;
- }
-
- protected static int countFiles(IModuleFolder mf) {
- int count = 0;
- IModuleResource[] mr = mf.members();
- if (mr == null)
- return 0;
-
- int size = mr.length;
- for (int i = 0; i < size; i++) {
- if (mr[i] instanceof IModuleFolder)
- count += countFiles((IModuleFolder) mr[i]);
- else
- count++;
- }
-
- return count;
- }
-
- public static int countFolders(IModule module) throws CoreException {
- ProjectModule pm = (ProjectModule) module.loadAdapter(ProjectModule.class, null);
- IModuleResource[] mr = pm.members();
-
- int count = 0;
- int size = mr.length;
- for (int i = 0; i < size; i++) {
- if (mr[i] instanceof IModuleFolder) {
- count++;
- count += countFolders((IModuleFolder) mr[i]);
- }
- }
-
- return count;
- }
-
- protected static int countFolders(IModuleFolder mf) {
- int count = 0;
- IModuleResource[] mr = mf.members();
- if (mr == null)
- return 0;
-
- int size = mr.length;
- for (int i = 0; i < size; i++) {
- if (mr[i] instanceof IModuleFolder) {
- count ++;
- count += countFolders((IModuleFolder) mr[i]);
- }
- }
-
- return count;
- }
-
- public static int countFilesInDelta(IModuleResourceDelta delta) throws CoreException {
- int count = 0;
- if (delta.getModuleResource() instanceof IModuleFile)
- count++;
-
- IModuleResourceDelta[] children = delta.getAffectedChildren();
- int size = children.length;
- for (int i = 0; i < size; i++) {
- count += countFilesInDelta(children[i]);
- }
-
- return count;
- }
-
- public static IModuleFile getModuleFile(IModule module, IPath path) throws CoreException {
- ProjectModule pm = (ProjectModule) module.loadAdapter(ProjectModule.class, null);
- IModuleResource[] mr = pm.members();
-
- int size = mr.length;
- for (int i = 0; i < size; i++) {
- if (mr[i].getModuleRelativePath().append(mr[i].getName()).equals(path)) {
- if (mr[i] instanceof IModuleFile)
- return (IModuleFile) mr[i];
- return null;
- } else if (mr[i].getModuleRelativePath().isPrefixOf(path) && mr[i] instanceof IModuleFolder) {
- IModuleFile mf2 = getModuleFile((IModuleFolder) mr[i], path);
- if (mf2 != null)
- return mf2;
- }
- }
-
- return null;
- }
-
- protected static IModuleFile getModuleFile(IModuleFolder mf, IPath path) {
- IModuleResource[] mr = mf.members();
- if (mr == null)
- return null;
-
- int size = mr.length;
- for (int i = 0; i < size; i++) {
- if (mr[i].getModuleRelativePath().append(mr[i].getName()).equals(path)) {
- if (mr[i] instanceof IModuleFile)
- return (IModuleFile) mr[i];
- return null;
- } else if (mr[i].getModuleRelativePath().isPrefixOf(path) && mr[i] instanceof IModuleFolder) {
- IModuleFile mf2 = getModuleFile((IModuleFolder) mr[i], path);
- if (mf2 != null)
- return mf2;
- }
- }
-
- return null;
- }
-
- public static boolean fileExists(IModule module, IPath path) throws CoreException {
- return getModuleFile(module, path) != null;
- }
-
- public static boolean fileExists(IModule module, String path) throws CoreException {
- return fileExists(module, new Path(path));
- }
-
- public static IModuleFolder getModuleFolder(IModule module, IPath path) throws CoreException {
- ProjectModule pm = (ProjectModule) module.loadAdapter(ProjectModule.class, null);
- IModuleResource[] mr = pm.members();
-
- int size = mr.length;
- for (int i = 0; i < size; i++) {
- if (mr[i].getModuleRelativePath().append(mr[i].getName()).equals(path)) {
- if (mr[i] instanceof IModuleFolder)
- return (IModuleFolder) mr[i];
- return null;
- } else if (mr[i].getModuleRelativePath().isPrefixOf(path) && mr[i] instanceof IModuleFolder) {
- IModuleFolder mf2 = getModuleFolder((IModuleFolder) mr[i], path);
- if (mf2 != null)
- return mf2;
- }
- }
-
- return null;
- }
-
- protected static IModuleFolder getModuleFolder(IModuleFolder mf, IPath path) {
- IModuleResource[] mr = mf.members();
- if (mr == null)
- return null;
-
- int size = mr.length;
- for (int i = 0; i < size; i++) {
- if (mr[i].getModuleRelativePath().append(mr[i].getName()).equals(path)) {
- if (mr[i] instanceof IModuleFolder)
- return (IModuleFolder) mr[i];
- return null;
- } else if (mr[i].getModuleRelativePath().isPrefixOf(path) && mr[i] instanceof IModuleFolder) {
- IModuleFolder mf2 = getModuleFolder((IModuleFolder) mr[i], path);
- if (mf2 != null)
- return mf2;
- }
- }
-
- return null;
- }
-
- public static boolean folderExists(IModule module, IPath path) throws CoreException {
- return getModuleFile(module, path) != null;
- }
-
- public static boolean folderExists(IModule module, String path) throws CoreException {
- return folderExists(module, new Path(path));
- }
-
- public static void listModule(IModule module) throws CoreException {
- System.out.println("--- Contents of " + module.getName() + "/" + module.getId() + "---");
- ProjectModule pm = (ProjectModule) module.loadAdapter(ProjectModule.class, null);
- IModuleResource[] mr = pm.members();
-
- int size = mr.length;
- for (int i = 0; i < size; i++) {
- if (mr[i] instanceof IModuleFile) {
- System.out.println(mr[i].getName());
- } else {
- System.out.println(mr[i].getName() + "/");
- listFolder((IModuleFolder) mr[i], " ");
- }
- }
- System.out.println("------");
- }
-
- protected static void listFolder(IModuleFolder mf, String pad) {
- IModuleResource[] mr = mf.members();
- if (mr == null)
- return;
-
- int size = mr.length;
- for (int i = 0; i < size; i++) {
- if (mr[i] instanceof IModuleFile) {
- System.out.println(pad + mr[i].getName());
- } else {
- System.out.println(pad + mr[i].getName() + "/");
- listFolder((IModuleFolder) mr[i], pad + " ");
- }
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/ModuleTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/ModuleTestCase.java
deleted file mode 100644
index 9b4a1aa..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/ModuleTestCase.java
+++ /dev/null
@@ -1,578 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.server.core.tests.j2ee;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.server.core.IEnterpriseApplication;
-import org.eclipse.jst.server.core.IJ2EEModule;
-import org.eclipse.jst.server.core.IWebModule;
-import org.eclipse.jst.server.core.tests.AllTests;
-import org.eclipse.jst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.*;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-/**
- * TODO Tests left to do:
- * migrated modules
- * flat project structure
- * complex .component structures
- * external jar references for EAR or WEB
- */
-public class ModuleTestCase extends TestCase {
- private static final String RUNTIME_TYPE_ID = "org.eclipse.jst.server.core.runtimeType";
-
- private static final String[] PROJECT_NAMES = new String[] {
- "PublishTestEAR", "PublishTestEJB", "PublishTestUtil", "PublishTestUtil2",
- "PublishTestWeb", "PublishTestWeb2", "PublishTestConnector", "PublishTestClient"
- };
-
- protected static IRuntime runtime;
- protected static IModule module;
- protected static IEnterpriseApplication ent;
- protected static IWebModule webModule;
- protected static IJ2EEModule j2eeModule;
-
- public static Test suite() {
- return new OrderedTestSuite(ModuleTestCase.class, "ModuleTestCase");
- }
-
- public void test000CreateRuntime() throws Exception {
- IRuntimeType rt = ServerCore.findRuntimeType(RUNTIME_TYPE_ID);
- IRuntimeWorkingCopy wc = rt.createRuntime("RuntimeLibraries", null);
- wc.setLocation(AllTests.runtimeLocation);
- wc.setName("RuntimeLibraries");
- runtime = wc.save(false, null);
-
- assertTrue(!runtime.isWorkingCopy());
- }
-
- public void test001ImportModules() throws Exception {
- ModuleHelper.importProject("PublishEAR.zip", PROJECT_NAMES);
- }
-
- public void test002IncrementalBuild() throws Exception {
- ModuleHelper.buildIncremental();
- }
-
- public void test003NumModules() throws Exception {
- assertEquals(ServerUtil.getModules("jst.ear").length, 1);
- }
-
- public void test004NumModules() throws Exception {
- assertEquals(ServerUtil.getModules("jst.web").length, 2);
- }
-
- public void test005NumModules() throws Exception {
- assertEquals(ServerUtil.getModules("jst.ejb").length, 1);
- }
-
- public void test006NumModules() throws Exception {
- assertEquals(ServerUtil.getModules("jst.utility").length, 2);
- }
-
- public void test007NumModules() throws Exception {
- assertEquals(ServerUtil.getModules("jst.appclient").length, 1);
- }
-
- public void test008NumModules() throws Exception {
- assertEquals(ServerUtil.getModules("jst.connector").length, 1);
- }
-
-
- // ---------- EAR tests ----------
-
- public void test020EAR() throws Exception {
- module = ModuleHelper.getModuleFromProject("PublishTestEAR");
- assertNotNull(module);
- }
-
- public void test021EAR() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/application.xml"))
- fail();
- }
-
- public void test022EAR() throws Exception {
- if (!ModuleHelper.fileExists(module, "test.jar"))
- fail();
- }
-
- public void test023EAR() throws Exception {
- if (!ModuleHelper.fileExists(module, "jarfolder/test3.jar"))
- fail();
- }
-
- public void test024EAR() throws Exception {
- assertEquals(ModuleHelper.countFiles(module), 3);
- }
-
- public void test025EAR() throws Exception {
- assertEquals(ModuleHelper.countFolders(module), 2);
- }
-
- public void test026EAR() throws Exception {
- assertEquals(module.getModuleType().getId(), "jst.ear");
- }
-
- public void test027EAR() throws Exception {
- ent = (IEnterpriseApplication) module.loadAdapter(IEnterpriseApplication.class, null);
- assertNotNull(ent);
- }
-
- public void test028EAR() throws Exception {
- assertEquals(ent.getResourceFolders().length, 1);
- }
-
- public void test029EAR() throws Exception {
- assertEquals(ent.getModules().length, 6);
- }
-
- public void _test030EAR() throws Exception {
- IModule[] modules = ent.getModules();
- int size = modules.length;
- List list = new ArrayList(size);
- for (int i = 0; i < size; i++) {
- System.out.println(modules[i].getName());
- list.add(modules[i].getName());
- }
-
- String[] s = new String[] {
- "PublishTestEJB", "PublishTestUtil2", "PublishTestWeb",
- "PublishTestWeb2", "PublishTestConnector", "PublishTestClient"
- };
-
- size = s.length;
- for (int i = 0; i < size; i++) {
- if (!list.contains(s[i]))
- fail("EAR does not contain " + s[i]);
- }
- }
-
-
- // ---------- Utility 1 tests ----------
-
- public void test040Util() throws Exception {
- module = ModuleHelper.getModuleFromProject("PublishTestUtil");
- assertNotNull(module);
- }
-
- public void test041Util() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/MANIFEST.MF"))
- fail();
- }
-
- public void test042Util() throws Exception {
- if (!ModuleHelper.fileExists(module, "test.properties"))
- fail();
- }
-
- public void test043Util() throws Exception {
- if (!ModuleHelper.fileExists(module, "publish/TestUtil.class"))
- fail();
- }
-
- public void test044Util() throws Exception {
- assertEquals(ModuleHelper.countFiles(module), 3);
- }
-
- public void test045Util() throws Exception {
- assertEquals(ModuleHelper.countFolders(module), 2);
- }
-
- public void test046Util() throws Exception {
- assertEquals(module.getModuleType().getId(), "jst.utility");
- }
-
- public void test047Util() throws Exception {
- j2eeModule = (IJ2EEModule) module.loadAdapter(IJ2EEModule.class, null);
- assertNotNull(j2eeModule);
- }
-
- public void test048Util() throws Exception {
- assertEquals(j2eeModule.getResourceFolders().length, 1);
- }
-
- public void test049Util() throws Exception {
- assertEquals(j2eeModule.getJavaOutputFolders().length, 1);
- }
-
- public void test050Util() throws Exception {
- assertFalse(j2eeModule.isBinary());
- }
-
-
- // ---------- Utility 2 tests ----------
-
- public void test060Util() throws Exception {
- module = ModuleHelper.getModuleFromProject("PublishTestUtil2");
- assertNotNull(module);
- }
-
- public void test061Util() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/MANIFEST.MF"))
- fail();
- }
-
- public void test062Util() throws Exception {
- if (!ModuleHelper.fileExists(module, "temp/test.properties"))
- fail();
- }
-
- public void test063Util() throws Exception {
- if (!ModuleHelper.fileExists(module, "publish/TestUtil2.class"))
- fail();
- }
-
- public void test064Util() throws Exception {
- assertEquals(ModuleHelper.countFiles(module), 3);
- }
-
- public void test065Util() throws Exception {
- assertEquals(ModuleHelper.countFolders(module), 3);
- }
-
- public void test066Util() throws Exception {
- assertEquals(module.getModuleType().getId(), "jst.utility");
- }
-
- public void test067Util() throws Exception {
- j2eeModule = (IJ2EEModule) module.loadAdapter(IJ2EEModule.class, null);
- assertNotNull(j2eeModule);
- }
-
- public void test068Util() throws Exception {
- assertEquals(j2eeModule.getResourceFolders().length, 1);
- }
-
- public void test069Util() throws Exception {
- assertEquals(j2eeModule.getJavaOutputFolders().length, 1);
- }
-
- public void test070Util() throws Exception {
- assertFalse(j2eeModule.isBinary());
- }
-
-
- // ---------- EJB tests ----------
-
- public void test080EJB() throws Exception {
- module = ModuleHelper.getModuleFromProject("PublishTestEJB");
- assertNotNull(module);
- }
-
- public void test081EJB() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/MANIFEST.MF"))
- fail();
- }
-
- public void test082EJB() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/ejb-jar.xml"))
- fail();
- }
-
- public void test083EJB() throws Exception {
- if (!ModuleHelper.fileExists(module, "ejbs/MyBeanLocalHome.class"))
- fail();
- }
-
- public void test084EJB() throws Exception {
- assertEquals(ModuleHelper.countFiles(module), 7);
- }
-
- public void test085EJB() throws Exception {
- assertEquals(ModuleHelper.countFolders(module), 2);
- }
-
- public void test086EJB() throws Exception {
- assertEquals(module.getModuleType().getId(), "jst.ejb");
- }
-
- public void test087EJB() throws Exception {
- j2eeModule = (IJ2EEModule) module.loadAdapter(IJ2EEModule.class, null);
- assertNotNull(j2eeModule);
- }
-
- public void test088EJB() throws Exception {
- assertEquals(j2eeModule.getResourceFolders().length, 1);
- }
-
- public void test089EJB() throws Exception {
- assertEquals(j2eeModule.getJavaOutputFolders().length, 1);
- }
-
- public void test090EJB() throws Exception {
- assertFalse(j2eeModule.isBinary());
- }
-
-
- // ---------- Connector tests ----------
-
- public void test100Connector() throws Exception {
- module = ModuleHelper.getModuleFromProject("PublishTestConnector");
- assertNotNull(module);
- }
-
- public void test101Connector() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/MANIFEST.MF"))
- fail();
- }
-
- public void test102Connector() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/ra.xml"))
- fail();
- }
-
- public void test103Connector() throws Exception {
- if (!ModuleHelper.fileExists(module, "test/MyOtherConnectorClass.class"))
- fail();
- }
-
- public void test104Connector() throws Exception {
- assertEquals(ModuleHelper.countFiles(module), 5);
- }
-
- public void test105Connector() throws Exception {
- assertEquals(ModuleHelper.countFolders(module), 3);
- }
-
- public void test106Connector() throws Exception {
- assertEquals(module.getModuleType().getId(), "jst.connector");
- }
-
- public void test107Connector() throws Exception {
- j2eeModule = (IJ2EEModule) module.loadAdapter(IJ2EEModule.class, null);
- assertNotNull(j2eeModule);
- }
-
- public void test108Connector() throws Exception {
- assertEquals(j2eeModule.getResourceFolders().length, 1);
- }
-
- public void test109Connector() throws Exception {
- assertEquals(j2eeModule.getJavaOutputFolders().length, 1);
- }
-
- public void test110Connector() throws Exception {
- assertFalse(j2eeModule.isBinary());
- }
-
-
- // ---------- Client tests ----------
-
- public void test120Client() throws Exception {
- module = ModuleHelper.getModuleFromProject("PublishTestClient");
- assertNotNull(module);
- }
-
- public void test121Client() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/MANIFEST.MF"))
- fail();
- }
-
- public void test122Client() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/application-client.xml"))
- fail();
- }
-
- public void test123Client() throws Exception {
- if (!ModuleHelper.fileExists(module, "Main.class"))
- fail();
- }
-
- public void test124Client() throws Exception {
- if (!ModuleHelper.fileExists(module, "Main2.class"))
- fail();
- }
-
- public void test125Client() throws Exception {
- assertEquals(ModuleHelper.countFiles(module), 4);
- }
-
- public void test126Client() throws Exception {
- assertEquals(ModuleHelper.countFolders(module), 1);
- }
-
- public void test127Client() throws Exception {
- assertEquals(module.getModuleType().getId(), "jst.appclient");
- }
-
- public void test128Client() throws Exception {
- j2eeModule = (IJ2EEModule) module.loadAdapter(IJ2EEModule.class, null);
- assertNotNull(j2eeModule);
- }
-
- public void test129Client() throws Exception {
- assertEquals(j2eeModule.getResourceFolders().length, 1);
- }
-
- public void test130Client() throws Exception {
- assertEquals(j2eeModule.getJavaOutputFolders().length, 1);
- }
-
- public void test131Client() throws Exception {
- assertFalse(j2eeModule.isBinary());
- }
-
-
- // ---------- Web 1 tests ----------
-
- public void test140Web() throws Exception {
- module = ModuleHelper.getModuleFromProject("PublishTestWeb");
- assertNotNull(module);
- }
-
- public void test141Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/MANIFEST.MF"))
- fail();
- }
-
- public void test142Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "WEB-INF/web.xml"))
- fail();
- }
-
- public void test143Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "test.jsp"))
- fail();
- }
-
- public void test144Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "WEB-INF/classes/servtest/TestServlet2.class"))
- fail();
- }
-
- public void test145Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "WEB-INF/classes/servtest/TestServlet.class"))
- fail();
- }
-
- public void test146Web() throws Exception {
- assertEquals(ModuleHelper.countFiles(module), 5);
- }
-
- public void test147Web() throws Exception {
- assertEquals(ModuleHelper.countFolders(module), 5);
- }
-
- public void test148Web() throws Exception {
- assertEquals(module.getModuleType().getId(), "jst.web");
- }
-
- public void test149Web() throws Exception {
- webModule = (IWebModule) module.loadAdapter(IWebModule.class, null);
- j2eeModule = webModule;
- assertNotNull(j2eeModule);
- }
-
- public void test150Web() throws Exception {
- assertEquals(j2eeModule.getResourceFolders().length, 1);
- }
-
- public void test151Web() throws Exception {
- assertEquals(j2eeModule.getJavaOutputFolders().length, 1);
- }
-
- public void test152Web() throws Exception {
- assertEquals(webModule.getModules().length, 1);
- }
-
- public void test153Web() throws Exception {
- assertEquals(webModule.getModules()[0].getName(), "PublishTestUtil");
- }
-
- public void test154Web() throws Exception {
- assertEquals(webModule.getContextRoot(), "PublishTestWeb");
- }
-
- public void test155Web() throws Exception {
- assertFalse(webModule.isBinary());
- }
-
- // ---------- Web 2 tests ----------
-
- public void test160Web() throws Exception {
- module = ModuleHelper.getModuleFromProject("PublishTestWeb2");
- assertNotNull(module);
- }
-
- public void test161Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/MANIFEST.MF"))
- fail();
- }
-
- public void test162Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "WEB-INF/web.xml"))
- fail();
- }
-
- public void test163Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "WEB-INF/lib/test.jar"))
- fail();
- }
-
- public void test164Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "WEB-INF/classes/serv/AServlet.class"))
- fail();
- }
-
- public void test165Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "WEB-INF/classes/serv/BServlet.class"))
- fail();
- }
-
- public void test166Web() throws Exception {
- assertEquals(ModuleHelper.countFiles(module), 5);
- }
-
- public void test167Web() throws Exception {
- assertEquals(ModuleHelper.countFolders(module), 5);
- }
-
- public void test168Web() throws Exception {
- assertEquals(module.getModuleType().getId(), "jst.web");
- }
-
- public void test169Web() throws Exception {
- webModule = (IWebModule) module.loadAdapter(IWebModule.class, null);
- j2eeModule = webModule;
- assertNotNull(j2eeModule);
- }
-
- public void test170Web() throws Exception {
- assertEquals(j2eeModule.getResourceFolders().length, 1);
- }
-
- public void test171Web() throws Exception {
- assertEquals(j2eeModule.getJavaOutputFolders().length, 1);
- }
-
- public void test172Web() throws Exception {
- assertEquals(webModule.getModules().length, 0);
- }
-
- public void test173Web() throws Exception {
- assertEquals(webModule.getContextRoot(), "PublishTestWeb2");
- }
-
- public void test174Web() throws Exception {
- assertFalse(webModule.isBinary());
- }
-
-
- public void test199Cleanup() throws Exception {
- int size = PROJECT_NAMES.length;
- for (int i = 0; i < size; i++) {
- ModuleHelper.deleteProject(PROJECT_NAMES[i]);
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/NoSourceTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/NoSourceTestCase.java
deleted file mode 100644
index 95416e6..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/NoSourceTestCase.java
+++ /dev/null
@@ -1,558 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.server.core.tests.j2ee;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.server.core.IEnterpriseApplication;
-import org.eclipse.jst.server.core.IJ2EEModule;
-import org.eclipse.jst.server.core.IWebModule;
-import org.eclipse.jst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.*;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class NoSourceTestCase extends TestCase {
- private static final String[] PROJECT_NAMES = new String[] {
- "PublishTestEAR", "PublishTestEJB", "test", "test2",
- "PublishTestWeb", "PublishTestWeb2", "PublishTestConnector", "PublishTestClient"
- };
-
- protected static IRuntime runtime;
- protected static IModule module;
- protected static IEnterpriseApplication ent;
- protected static IWebModule webModule;
- protected static IJ2EEModule j2eeModule;
-
- public static Test suite() {
- return new OrderedTestSuite(NoSourceTestCase.class, "NoSourceTestCase");
- }
-
- public void test001ImportModules() throws Exception {
- ModuleHelper.importProject("PublishEARNoSource.zip", PROJECT_NAMES);
- }
-
- public void test002IncrementalBuild() throws Exception {
- ModuleHelper.buildIncremental();
- }
-
- public void test003NumModules() throws Exception {
- assertEquals(ServerUtil.getModules("jst.ear").length, 1);
- }
-
- public void test004NumModules() throws Exception {
- assertEquals(ServerUtil.getModules("jst.web").length, 2);
- }
-
- public void test005NumModules() throws Exception {
- assertEquals(ServerUtil.getModules("jst.ejb").length, 1);
- }
-
- public void test006NumModules() throws Exception {
- assertEquals(ServerUtil.getModules("jst.utility").length, 2);
- }
-
- public void test007NumModules() throws Exception {
- assertEquals(ServerUtil.getModules("jst.appclient").length, 1);
- }
-
- public void test008NumModules() throws Exception {
- assertEquals(ServerUtil.getModules("jst.connector").length, 1);
- }
-
-
- // ---------- EAR tests ----------
-
- public void test020EAR() throws Exception {
- module = ModuleHelper.getModuleFromProject("PublishTestEAR");
- assertNotNull(module);
- }
-
- public void test021EAR() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/application.xml"))
- fail();
- }
-
- public void test022EAR() throws Exception {
- if (!ModuleHelper.fileExists(module, "PublishTestUtil2.jar"))
- fail();
- }
-
- public void test023EAR() throws Exception {
- assertEquals(ModuleHelper.countFiles(module), 3);
- }
-
- public void test024EAR() throws Exception {
- assertEquals(ModuleHelper.countFolders(module), 1);
- }
-
- public void test025EAR() throws Exception {
- assertEquals(module.getModuleType().getId(), "jst.ear");
- }
-
- public void test026EAR() throws Exception {
- ent = (IEnterpriseApplication) module.loadAdapter(IEnterpriseApplication.class, null);
- assertNotNull(ent);
- }
-
- public void test027EAR() throws Exception {
- assertEquals(ent.getResourceFolders().length, 1);
- }
-
- public void test028EAR() throws Exception {
- assertEquals(ent.getModules().length, 6);
- }
-
- public void test029EAR() throws Exception {
- IModule[] modules = ent.getModules();
- int size = modules.length;
- List list = new ArrayList(size);
- for (int i = 0; i < size; i++)
- list.add(modules[i].getName());
-
- String[] s = new String[] {
- "PublishTestEJB", "test2", "PublishTestWeb",
- "PublishTestWeb2", "PublishTestConnector", "PublishTestClient"
- };
-
- size = s.length;
- for (int i = 0; i < size; i++) {
- if (!list.contains(s[i]))
- fail("EAR does not contain " + s[i]);
- }
- }
-
-
- // ---------- Utility 1 tests ----------
-
- public void test040Util() throws Exception {
- module = ModuleHelper.getModuleFromProject("test");
- assertNotNull(module);
- }
-
- public void test041Util() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/MANIFEST.MF"))
- fail();
- }
-
- public void test042Util() throws Exception {
- if (!ModuleHelper.fileExists(module, "test.properties"))
- fail();
- }
-
- public void test043Util() throws Exception {
- if (!ModuleHelper.fileExists(module, "publish/TestUtil.class"))
- fail();
- }
-
- public void test044Util() throws Exception {
- assertEquals(ModuleHelper.countFiles(module), 3);
- }
-
- public void test045Util() throws Exception {
- assertEquals(ModuleHelper.countFolders(module), 2);
- }
-
- public void test046Util() throws Exception {
- assertEquals(module.getModuleType().getId(), "jst.utility");
- }
-
- public void test047Util() throws Exception {
- j2eeModule = (IJ2EEModule) module.loadAdapter(IJ2EEModule.class, null);
- assertNotNull(j2eeModule);
- }
-
- public void test048Util() throws Exception {
- assertEquals(j2eeModule.getResourceFolders().length, 2);
- }
-
- public void test049Util() throws Exception {
- assertEquals(j2eeModule.getJavaOutputFolders().length, 1);
- }
-
- public void test050Util() throws Exception {
- assertFalse(j2eeModule.isBinary());
- }
-
-
- // ---------- Utility 2 tests ----------
-
- public void test060Util() throws Exception {
- module = ModuleHelper.getModuleFromProject("test2");
- assertNotNull(module);
- }
-
- public void test061Util() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/MANIFEST.MF"))
- fail();
- }
-
- public void test062Util() throws Exception {
- if (!ModuleHelper.fileExists(module, "test.properties"))
- fail();
- }
-
- public void test063Util() throws Exception {
- if (!ModuleHelper.fileExists(module, "publish/TestUtil.class"))
- fail();
- }
-
- public void test064Util() throws Exception {
- assertEquals(ModuleHelper.countFiles(module), 3);
- }
-
- public void test065Util() throws Exception {
- assertEquals(ModuleHelper.countFolders(module), 2);
- }
-
- public void test066Util() throws Exception {
- assertEquals(module.getModuleType().getId(), "jst.utility");
- }
-
- public void test067Util() throws Exception {
- j2eeModule = (IJ2EEModule) module.loadAdapter(IJ2EEModule.class, null);
- assertNotNull(j2eeModule);
- }
-
- public void test068Util() throws Exception {
- assertEquals(j2eeModule.getResourceFolders().length, 2);
- }
-
- public void test069Util() throws Exception {
- assertEquals(j2eeModule.getJavaOutputFolders().length, 1);
- }
-
- public void test070Util() throws Exception {
- assertFalse(j2eeModule.isBinary());
- }
-
-
- // ---------- EJB tests ----------
-
- public void test080EJB() throws Exception {
- module = ModuleHelper.getModuleFromProject("PublishTestEJB");
- assertNotNull(module);
- }
-
- public void test081EJB() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/MANIFEST.MF"))
- fail();
- }
-
- public void test082EJB() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/ejb-jar.xml"))
- fail();
- }
-
- public void test083EJB() throws Exception {
- if (!ModuleHelper.fileExists(module, "ejbs/MyBeanLocalHome.class"))
- fail();
- }
-
- public void test084EJB() throws Exception {
- assertEquals(ModuleHelper.countFiles(module), 7);
- }
-
- public void test085EJB() throws Exception {
- assertEquals(ModuleHelper.countFolders(module), 2);
- }
-
- public void test086EJB() throws Exception {
- assertEquals(module.getModuleType().getId(), "jst.ejb");
- }
-
- public void test087EJB() throws Exception {
- j2eeModule = (IJ2EEModule) module.loadAdapter(IJ2EEModule.class, null);
- assertNotNull(j2eeModule);
- }
-
- public void test088EJB() throws Exception {
- assertEquals(j2eeModule.getResourceFolders().length, 2);
- }
-
- public void test089EJB() throws Exception {
- assertEquals(j2eeModule.getJavaOutputFolders().length, 1);
- }
-
- public void test090EJB() throws Exception {
- assertFalse(j2eeModule.isBinary());
- }
-
-
- // ---------- Connector tests ----------
-
- public void test100Connector() throws Exception {
- module = ModuleHelper.getModuleFromProject("PublishTestConnector");
- assertNotNull(module);
- }
-
- public void test101Connector() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/MANIFEST.MF"))
- fail();
- }
-
- public void test102Connector() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/ra.xml"))
- fail();
- }
-
- public void _test103Connector() throws Exception {
- if (!ModuleHelper.fileExists(module, "test/MyOtherConnectorClass.class"))
- fail();
- }
-
- public void _test104Connector() throws Exception {
- assertEquals(ModuleHelper.countFiles(module), 5);
- }
-
- public void _test105Connector() throws Exception {
- assertEquals(ModuleHelper.countFolders(module), 3);
- }
-
- public void test106Connector() throws Exception {
- assertEquals(module.getModuleType().getId(), "jst.connector");
- }
-
- public void test107Connector() throws Exception {
- j2eeModule = (IJ2EEModule) module.loadAdapter(IJ2EEModule.class, null);
- assertNotNull(j2eeModule);
- }
-
- public void test108Connector() throws Exception {
- assertEquals(j2eeModule.getResourceFolders().length, 1);
- }
-
- public void test109Connector() throws Exception {
- assertEquals(j2eeModule.getJavaOutputFolders().length, 1);
- }
-
- public void test110Connector() throws Exception {
- assertFalse(j2eeModule.isBinary());
- }
-
-
- // ---------- Client tests ----------
-
- public void test120Client() throws Exception {
- module = ModuleHelper.getModuleFromProject("PublishTestClient");
- assertNotNull(module);
- }
-
- public void test121Client() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/MANIFEST.MF"))
- fail();
- }
-
- public void test122Client() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/application-client.xml"))
- fail();
- }
-
- public void test123Client() throws Exception {
- if (!ModuleHelper.fileExists(module, "Main.class"))
- fail();
- }
-
- public void test124Client() throws Exception {
- if (!ModuleHelper.fileExists(module, "Main2.class"))
- fail();
- }
-
- public void _test125Client() throws Exception {
- assertEquals(ModuleHelper.countFiles(module), 4);
- }
-
- public void test126Client() throws Exception {
- assertEquals(ModuleHelper.countFolders(module), 1);
- }
-
- public void test127Client() throws Exception {
- assertEquals(module.getModuleType().getId(), "jst.appclient");
- }
-
- public void test128Client() throws Exception {
- j2eeModule = (IJ2EEModule) module.loadAdapter(IJ2EEModule.class, null);
- assertNotNull(j2eeModule);
- }
-
- public void test129Client() throws Exception {
- assertEquals(j2eeModule.getResourceFolders().length, 2);
- }
-
- public void test130Client() throws Exception {
- assertEquals(j2eeModule.getJavaOutputFolders().length, 1);
- }
-
- public void test131Client() throws Exception {
- assertFalse(j2eeModule.isBinary());
- }
-
-
- // ---------- Web 1 tests ----------
-
- public void test140Web() throws Exception {
- module = ModuleHelper.getModuleFromProject("PublishTestWeb");
- assertNotNull(module);
- }
-
- public void test141Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/MANIFEST.MF"))
- fail();
- }
-
- public void test142Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "WEB-INF/web.xml"))
- fail();
- }
-
- public void test143Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "test.jsp"))
- fail();
- }
-
- public void test144Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "WEB-INF/classes/servtest/TestServlet2.class"))
- fail();
- }
-
- public void test145Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "WEB-INF/classes/servtest/TestServlet.class"))
- fail();
- }
-
- public void test146Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "WEB-INF/lib/PublishTestUtil.jar"))
- fail();
- }
-
- public void _test147Web() throws Exception {
- assertEquals(ModuleHelper.countFiles(module), 6);
- }
-
- public void _test148Web() throws Exception {
- assertEquals(ModuleHelper.countFolders(module), 5);
- }
-
- public void test149Web() throws Exception {
- assertEquals(module.getModuleType().getId(), "jst.web");
- }
-
- public void test150Web() throws Exception {
- webModule = (IWebModule) module.loadAdapter(IWebModule.class, null);
- j2eeModule = webModule;
- assertNotNull(j2eeModule);
- }
-
- public void test151Web() throws Exception {
- assertEquals(j2eeModule.getResourceFolders().length, 1);
- }
-
- public void test152Web() throws Exception {
- assertEquals(j2eeModule.getJavaOutputFolders().length, 1);
- }
-
- public void test153Web() throws Exception {
- assertEquals(webModule.getModules().length, 0);
- }
-
- public void test154Web() throws Exception {
- assertEquals(webModule.getContextRoot(), "PublishTestWeb");
- }
-
- public void test155Web() throws Exception {
- assertFalse(webModule.isBinary());
- }
-
-
- // ---------- Web 2 tests ----------
-
- public void test160Web() throws Exception {
- module = ModuleHelper.getModuleFromProject("PublishTestWeb2");
- assertNotNull(module);
- }
-
- public void test161Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "META-INF/MANIFEST.MF"))
- fail();
- }
-
- public void test162Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "WEB-INF/web.xml"))
- fail();
- }
-
- public void test163Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "WEB-INF/lib/test.jar"))
- fail();
- }
-
- public void test164Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "WEB-INF/classes/serv/AServlet.class"))
- fail();
- }
-
- public void test165Web() throws Exception {
- if (!ModuleHelper.fileExists(module, "WEB-INF/classes/serv/BServlet.class"))
- fail();
- }
-
- public void test166Web() throws Exception {
- assertEquals(ModuleHelper.countFiles(module), 5);
- }
-
- public void test167Web() throws Exception {
- assertEquals(ModuleHelper.countFolders(module), 5);
- }
-
- public void test168Web() throws Exception {
- assertEquals(module.getModuleType().getId(), "jst.web");
- }
-
- public void test169Web() throws Exception {
- webModule = (IWebModule) module.loadAdapter(IWebModule.class, null);
- j2eeModule = webModule;
- assertNotNull(j2eeModule);
- }
-
- public void test170Web() throws Exception {
- assertEquals(j2eeModule.getResourceFolders().length, 1);
- }
-
- public void test171Web() throws Exception {
- assertEquals(j2eeModule.getJavaOutputFolders().length, 1);
- }
-
- public void test172Web() throws Exception {
- assertEquals(webModule.getModules().length, 1);
- }
-
- public void test173Web() throws Exception {
- assertEquals(webModule.getModules()[0].getName(), "test");
- }
-
- public void test174Web() throws Exception {
- assertEquals(webModule.getContextRoot(), "PublishTestWeb2");
- }
-
- public void test175Web() throws Exception {
- assertFalse(webModule.isBinary());
- }
-
-
- public void test199Cleanup() throws Exception {
- int size = PROJECT_NAMES.length;
- for (int i = 0; i < size; i++) { // don't delete the ear - leave for binary tests
- ModuleHelper.deleteProject(PROJECT_NAMES[i]);
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/ProjectUnzipUtil.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/ProjectUnzipUtil.java
deleted file mode 100644
index 71073d9..0000000
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/j2ee/ProjectUnzipUtil.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.server.core.tests.j2ee;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.internal.resources.ProjectDescription;
-import org.eclipse.core.internal.resources.ProjectDescriptionReader;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-
-public class ProjectUnzipUtil {
- private IPath zipLocation;
- private String[] projectNames;
- private static final String META_PROJECT_NAME = ".project";
-
- public ProjectUnzipUtil(IPath aZipLocation, String[] aProjectNames) {
- zipLocation = aZipLocation;
- projectNames = aProjectNames;
- }
-
- public boolean createProjects() {
- try {
- expandZip();
- ResourcesPlugin.getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, null);
- buildProjects();
- } catch (CoreException e) {
- e.printStackTrace();
- return false;
- } catch (IOException e) {
- e.printStackTrace();
- return false;
- }
-
- return true;
- }
-
- private void expandZip() throws CoreException, IOException {
- ZipFile zipFile = null;
- try {
- zipFile = new ZipFile(zipLocation.toFile());
- } catch (IOException e1) {
- throw e1;
- }
- Enumeration entries = zipFile.entries();
- while (entries.hasMoreElements()) {
- ZipEntry entry = (ZipEntry) entries.nextElement();
- File aFile = computeLocation(entry.getName()).toFile();
- File parentFile = null;
- try {
- if (entry.isDirectory()) {
- aFile.mkdirs();
- } else {
- parentFile = aFile.getParentFile();
- if (!parentFile.exists())
- parentFile.mkdirs();
- if (!aFile.exists())
- aFile.createNewFile();
- copy(zipFile.getInputStream(entry), new FileOutputStream(aFile));
- if (entry.getTime() > 0)
- aFile.setLastModified(entry.getTime());
- }
- } catch (IOException e) {
- throw e;
- }
- }
- }
-
- private IPath computeLocation(String name) {
- return ResourcesPlugin.getWorkspace().getRoot().getLocation().append(name);
- }
-
- private static void copy(InputStream in, OutputStream out) throws IOException {
- byte[] buffer = new byte[1024];
- try {
- int n = in.read(buffer);
- while (n > 0) {
- out.write(buffer, 0, n);
- n = in.read(buffer);
- }
- } finally {
- in.close();
- out.close();
- }
- }
-
- private void buildProjects() throws IOException, CoreException {
- for (int i = 0; i < projectNames.length; i++) {
- ProjectDescriptionReader pd = new ProjectDescriptionReader();
- IPath projectPath = new Path("/" + projectNames[i] + "/" + META_PROJECT_NAME);
- IPath path = ResourcesPlugin.getWorkspace().getRoot().getLocation().append(projectPath);
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectNames[i]);
- ProjectDescription description;
- try {
- description = pd.read(path);
- project.create(description, new NullProgressMonitor());
- project.open(new NullProgressMonitor());
- } catch (IOException e) {
- throw e;
- } catch (CoreException e) {
- throw e;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/test.xml b/tests/org.eclipse.jst.server.core.tests/test.xml
deleted file mode 100644
index 1926ae0..0000000
--- a/tests/org.eclipse.jst.server.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.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.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.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 4ec5989..0000000
--- a/tests/org.eclipse.jst.server.geronimo.core.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.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 4ec5989..0000000
--- a/tests/org.eclipse.jst.server.geronimo.ui.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.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 628c563..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +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.100.qualifier
-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;x-internal:=true,
- 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.wst.common.project.facet.core,
- org.eclipse.jst.j2ee,
- org.eclipse.jdt.launching,
- org.eclipse.core.resources,
- org.eclipse.jst.server.core
-Eclipse-LazyStart: 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 4ec5989..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/build.properties b/tests/org.eclipse.jst.server.tomcat.core.tests/build.properties
deleted file mode 100644
index dc4e95e..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/build.properties
+++ /dev/null
@@ -1,17 +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 = 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 60a51a3..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 85fc88d..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 cbdc6ad..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 0672f4a..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 ba73580..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 2eea8f7..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 55d8a3b..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 4e4493a..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 5bdbac6..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/ModuleHelper.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.server.tomcat.core.tests.module;
-
-import java.io.ByteArrayInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.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;
-import org.eclipse.wst.server.core.internal.IMemento;
-import org.eclipse.wst.server.core.internal.XMLMemento;
-import org.eclipse.wst.server.core.model.*;
-import org.eclipse.wst.server.core.util.ProjectModule;
-import org.osgi.framework.Bundle;
-
-public class ModuleHelper {
- // size of the buffer
- private static final int BUFFER = 10240;
-
- // the buffer
- private static byte[] buf = new byte[BUFFER];
-
- public static void createModule(String name) throws Exception {
- IDataModel dataModel = DataModelFactory.createDataModel(new WebFacetProjectCreationDataModelProvider());
- dataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, name);
- dataModel.setBooleanProperty(IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR, false);
-
- FacetDataModelMap map = (FacetDataModelMap) dataModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel webModel = map.getFacetDataModel(J2EEProjectUtilities.DYNAMIC_WEB);
- webModel.setStringProperty(IFacetDataModelProperties.FACET_VERSION_STR, "22");
-
- 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("src").append("Test" + i + ".java"));
- String content = "public class Test" + i + " { }";
- ByteArrayInputStream in = new ByteArrayInputStream(content.getBytes());
- file.create(in, true, null);
- }
-
- public static void createJarContent(String name, int num, IPath path) throws Exception {
- if (!path.toFile().exists())
- path.toFile().mkdirs();
-
- // create external jars
- for (int i = 0; i < num; i++) {
- Bundle bundle = Platform.getBundle("org.eclipse.core.runtime");
- URL url = bundle.getEntry("/");
- url = FileLocator.resolve(url);
- String s = url.toString();
- url = new URL(s.substring(4, s.length() - 2));
- InputStream in = url.openStream();
- IPath path2 = path.append("external_jar" + i + ".jar");
- copyFile(in, path2.toOSString());
- }
-
- // update component file
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- IFile file = project.getFile(new Path(".settings").append("org.eclipse.wst.common.component"));
-
- InputStream in = null;
- XMLMemento memento = null;
- try {
- in = file.getContents();
- memento = (XMLMemento) XMLMemento.loadMemento(in);
- IMemento child = memento.getChild("project-modules");
- child = memento.getChild("wb-module");
-
- for (int i = 0; i < num; i++) {
- IMemento newChild = child.createChild("dependent-module");
- newChild.putString("deploy-path", "/WEB-INF/lib");
- IPath path2 = path.append("external_jar" + i + ".jar");
- newChild.putString("handle", "module:/classpath/lib/" + path2.toOSString());
- XMLMemento child2 = (XMLMemento) newChild.createChild("dependency-type");
- child2.putTextData("uses");
- }
-/* <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib/C:/Documents and Settings/Administrator/Desktop/com.ibm.version.adder_1.0.0.jar">
- <dependency-type>uses</dependency-type>
- </dependent-module>*/
- } finally {
- try {
- in.close();
- } catch (Exception ex) {
- // ignore
- }
- }
- //ByteArrayInputStream in = new ByteArrayInputStream(memento.getBytes());
- in = memento.getInputStream();
- file.setContents(in, true, 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;
- }
-
- public static int countFilesInModule(IModule module) throws CoreException {
- ProjectModule pm = (ProjectModule) module.loadAdapter(ProjectModule.class, null);
- IModuleResource[] mr = pm.members();
-
- int count = 0;
- int size = mr.length;
- for (int i = 0; i < size; i++) {
- if (mr[i] instanceof IModuleFolder)
- count += countFilesInFolder((IModuleFolder) mr[i]);
- else
- count++;
- }
-
- return count;
- }
-
- protected static int countFilesInFolder(IModuleFolder mf) {
- int count = 0;
- IModuleResource[] mr = mf.members();
- if (mr == null)
- return 0;
-
- int size = mr.length;
- for (int i = 0; i < size; i++) {
- if (mr[i] instanceof IModuleFolder)
- count += countFilesInFolder((IModuleFolder) mr[i]);
- else
- count++;
- }
-
- return count;
- }
-
- public static int countFilesInDelta(IModuleResourceDelta delta) throws CoreException {
- int count = 0;
- if (delta.getModuleResource() instanceof IModuleFile)
- count++;
-
- IModuleResourceDelta[] children = delta.getAffectedChildren();
- int size = children.length;
- for (int i = 0; i < size; i++) {
- count += countFilesInDelta(children[i]);
- }
-
- return count;
- }
-
- public static IModuleFile getModuleFile(IModule module, IPath path) throws CoreException {
- ProjectModule pm = (ProjectModule) module.loadAdapter(ProjectModule.class, null);
- IModuleResource[] mr = pm.members();
-
- int size = mr.length;
- for (int i = 0; i < size; i++) {
- if (mr[i].getModuleRelativePath().equals(path)) {
- if (mr[i] instanceof IModuleFile)
- return (IModuleFile) mr[i];
- return null;
- } else if (mr[i].getModuleRelativePath().isPrefixOf(path))
- return getModuleFile((IModuleFolder) mr[i], path);
- }
-
- return null;
- }
-
- protected static IModuleFile getModuleFile(IModuleFolder mf, IPath path) {
- IModuleResource[] mr = mf.members();
- if (mr == null)
- return null;
-
- int size = mr.length;
- for (int i = 0; i < size; i++) {
- if (mr[i].getModuleRelativePath().equals(path)) {
- if (mr[i] instanceof IModuleFile)
- return (IModuleFile) mr[i];
- return null;
- } else if (mr[i].getModuleRelativePath().isPrefixOf(path))
- return getModuleFile((IModuleFolder) mr[i], path);
- }
-
- return null;
- }
-
- /**
- * Copy a file from a to b. Closes the input stream after use.
- *
- * @param in java.io.InputStream
- * @param to java.lang.String
- */
- private static void copyFile(InputStream in, String to) throws IOException {
- OutputStream out = null;
-
- try {
- out = new FileOutputStream(to);
-
- int avail = in.read(buf);
- while (avail > 0) {
- out.write(buf, 0, avail);
- avail = in.read(buf);
- }
- } catch (Exception e) {
- throw new IOException("Error copying file");
- } finally {
- try {
- if (in != null)
- in.close();
- } catch (Exception ex) {
- // ignore
- }
- try {
- if (out != null)
- out.close();
- } catch (Exception ex) {
- // ignore
- }
- }
- }
-}
\ 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 1a2ef1f..0000000
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/src/org/eclipse/jst/server/tomcat/core/tests/module/ModuleTestCase.java
+++ /dev/null
@@ -1,44 +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);
- }
-
- public void test05CountFilesInModule() throws Exception {
- assertEquals(ModuleHelper.countFilesInModule(webModule), 3);
- }
-}
\ 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 dd14360..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-Vendor: Eclipse.org
-Bundle-Name: Server Tomcat Performance Plug-in
-Bundle-SymbolicName: org.eclipse.jst.server.tomcat.tests.performance
-Bundle-Version: 1.0.100.qualifier
-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-LazyStart: true
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 4ec5989..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/build.properties b/tests/org.eclipse.jst.server.tomcat.tests.performance/build.properties
deleted file mode 100644
index 2ba3289..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/build.properties
+++ /dev/null
@@ -1,16 +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,\
- 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 b3258f8..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/AllTests.java
+++ /dev/null
@@ -1,75 +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.25";
- 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);
-
- suite.addTestSuite(CreateHugeModuleTestCase.class);
-
- if (s != null && s.length() > 0) {
- suite.addTestSuite(PublishTestCase.class);
- suite.addTestSuite(PublishHugeModuleTestCase.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/CreateHugeModuleTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateHugeModuleTestCase.java
deleted file mode 100644
index 2103c46..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/CreateHugeModuleTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.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.IPath;
-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;
-import org.eclipse.wst.server.core.internal.ServerPlugin;
-
-public class CreateHugeModuleTestCase extends TestCase {
- protected static final String WEB_MODULE_NAME = "HugeModule";
- protected static final int NUM_RESOURCES = 2000;
- protected static final int NUM_EXTERNAL_JARS = 100;
-
- public static Test suite() {
- return new TestSuite(CreateHugeModuleTestCase.class, "CreateHugeModuleTestCase");
- }
-
- public void testCreateHugeWebModule() throws Exception {
- ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- try {
- ModuleHelper.createModule(WEB_MODULE_NAME);
- for (int i = 0; i < NUM_RESOURCES; i++)
- ModuleHelper.createWebContent(WEB_MODULE_NAME, i);
- for (int i = 0; i < NUM_RESOURCES; i++)
- ModuleHelper.createJavaContent(WEB_MODULE_NAME, i);
- for (int i = 0; i < NUM_RESOURCES; i++)
- ModuleHelper.createXMLContent(WEB_MODULE_NAME, i);
-
- // add external jars
- IPath path = ServerPlugin.getInstance().getStateLocation().append("jars");
- ModuleHelper.createJarContent(WEB_MODULE_NAME, NUM_EXTERNAL_JARS, path);
- } catch (Exception e) {
- e.printStackTrace();
- throw new CoreException(new Status(IStatus.ERROR, null, 0, "Error creating resources", e));
- }
- }
- }, null);
-
- ModuleHelper.buildIncremental();
- }
-}
\ 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/PublishHugeModuleTestCase.java b/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/PublishHugeModuleTestCase.java
deleted file mode 100644
index 90d0d49..0000000
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/performance/org/eclipse/jst/server/tomcat/tests/performance/tomcat50/PublishHugeModuleTestCase.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.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 PublishHugeModuleTestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(PublishHugeModuleTestCase.class, "PublishHugeModuleTestCase");
- }
-
- public void testHugePublish() throws Exception {
- Dimension[] dims = new Dimension[] { Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP };
- tagAsSummary("Publish huge module to Tomcat", dims);
-
- IServer server = AbstractTomcatServerTestCase.server;
- IServerWorkingCopy wc = server.createWorkingCopy();
-
- // remove previous apps
- IModule[] remove = server.getModules();
- wc.modifyModules(null, remove, null);
- wc.save(true, null);
- server.publish(IServer.PUBLISH_FULL, null);
-
- for (int i = 0; i < 5; i++) {
- // add huge app
- IModule[] add = new IModule[1];
- add[0] = ModuleHelper.getModule(CreateHugeModuleTestCase.WEB_MODULE_NAME);
- wc.modifyModules(add, null, null);
- wc.save(true, null);
-
- // publish huge app
- startMeasuring();
- server.publish(IServer.PUBLISH_FULL, null);
- stopMeasuring();
-
- // remove huge app and republish
- remove = server.getModules();
- wc.modifyModules(null, add, null);
- wc.save(true, null);
- server.publish(IServer.PUBLISH_FULL, null);
- }
-
- 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/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 789756f..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 testPublish() 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 5dcac94..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.100.qualifier
-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-LazyStart: 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 4ec5989..0000000
--- a/tests/org.eclipse.jst.server.tomcat.ui.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.server.tomcat.ui.tests/build.properties b/tests/org.eclipse.jst.server.tomcat.ui.tests/build.properties
deleted file mode 100644
index 0e2ceee..0000000
--- a/tests/org.eclipse.jst.server.tomcat.ui.tests/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 = 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 3e5dba8..0000000
--- a/tests/org.eclipse.jst.server.tomcat.ui.tests/src/org/eclipse/jst/server/tomcat/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.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: " + 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 cff7773..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.100.qualifier
-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-LazyStart: 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 4ec5989..0000000
--- a/tests/org.eclipse.jst.server.ui.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.server.ui.tests/build.properties b/tests/org.eclipse.jst.server.ui.tests/build.properties
deleted file mode 100644
index dc4e95e..0000000
--- a/tests/org.eclipse.jst.server.ui.tests/build.properties
+++ /dev/null
@@ -1,17 +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 = 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 74d09c7..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.100.qualifier
-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-LazyStart: 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 4ec5989..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/build.properties b/tests/org.eclipse.wst.internet.monitor.core.tests/build.properties
deleted file mode 100644
index e40316c..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/build.properties
+++ /dev/null
@@ -1,17 +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 = 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 10b43bb..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/AllTests.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.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 b38e6bd..0000000
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/RequestTestCase.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005,2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.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 final String CONNECT_TIMEOUT = "sun.net.client.defaultConnectTimeout";
- private static final String READ_TIMEOUT = "sun.net.client.defaultReadTimeout";
-
- 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 {
- String connectTimeout = System.getProperty(CONNECT_TIMEOUT);
- String readTimeout = System.getProperty(READ_TIMEOUT);
-
- System.setProperty(CONNECT_TIMEOUT, "10000"); // 10000ms = 10s
- System.setProperty(READ_TIMEOUT, "10000");
-
- 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 ---------------------------");
-
- try {
- System.setProperty(CONNECT_TIMEOUT, connectTimeout);
- System.setProperty(READ_TIMEOUT, readTimeout);
- } catch (Exception e) {
- // ignore - JDK bug on some systems doesn't allow null
- }
- }
-
- 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 28d2ba5..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.100.qualifier
-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-LazyStart: 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 4ec5989..0000000
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/build.properties b/tests/org.eclipse.wst.internet.monitor.ui.tests/build.properties
deleted file mode 100644
index e40316c..0000000
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/build.properties
+++ /dev/null
@@ -1,17 +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 = 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 fd176e4..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.core.tests/.classpath b/tests/org.eclipse.wst.server.core.tests/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.wst.server.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.server.core.tests/.cvsignore b/tests/org.eclipse.wst.server.core.tests/.cvsignore
deleted file mode 100644
index 8470d8e..0000000
--- a/tests/org.eclipse.wst.server.core.tests/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-servertests.jar
diff --git a/tests/org.eclipse.wst.server.core.tests/.project b/tests/org.eclipse.wst.server.core.tests/.project
deleted file mode 100644
index e0d60d9..0000000
--- a/tests/org.eclipse.wst.server.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.server.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.server.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.server.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f8d658f..0000000
--- a/tests/org.eclipse.wst.server.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,47 +0,0 @@
-#Thu May 26 14:35:06 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.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.server.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 2c303f2..0000000
--- a/tests/org.eclipse.wst.server.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.wst.server.core.tests
-Bundle-SymbolicName: org.eclipse.wst.server.core.tests
-Bundle-Version: 1.0.100.qualifier
-Bundle-ClassPath: servertests.jar
-Bundle-Activator: org.eclipse.wst.server.core.tests.TestsPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.server.core.tests,
- org.eclipse.wst.server.core.tests.ext,
- org.eclipse.wst.server.core.tests.extension,
- org.eclipse.wst.server.core.tests.impl,
- org.eclipse.wst.server.core.tests.model,
- org.eclipse.wst.server.core.tests.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.junit,
- org.eclipse.wst.server.core
-Eclipse-LazyStart: true
diff --git a/tests/org.eclipse.wst.server.core.tests/about.html b/tests/org.eclipse.wst.server.core.tests/about.html
deleted file mode 100644
index 4ec5989..0000000
--- a/tests/org.eclipse.wst.server.core.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.server.core.tests/build.properties b/tests/org.eclipse.wst.server.core.tests/build.properties
deleted file mode 100644
index e7156b9..0000000
--- a/tests/org.eclipse.wst.server.core.tests/build.properties
+++ /dev/null
@@ -1,16 +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
-###############################################################################
-source.servertests.jar = src/
-output.servertests.jar = bin/
-bin.includes = servertests.jar,\
- test.xml,\
- META-INF/,\
- about.html
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/AllTests.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/AllTests.java
deleted file mode 100644
index 49f3898..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/AllTests.java
+++ /dev/null
@@ -1,110 +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 Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
-*
-* Contributors:
-* Deniz Secilir - 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.wst.server.core.tests;
-
-import org.eclipse.wst.server.core.tests.extension.*;
-import org.eclipse.wst.server.core.tests.model.*;
-import org.eclipse.wst.server.core.tests.util.*;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.wtp.wst.server.core.tests");
- //$JUnit-BEGIN$
-
- // TODO - should add tests for specific module adapters and other extension points
- // that exist in WTP
- suite.addTestSuite(ExistenceTest.class);
- suite.addTestSuite(StartupExtensionTestCase.class);
- suite.addTestSuite(ModuleFactoriesTestCase.class);
- suite.addTestSuite(RuntimeTypesTestCase.class);
- suite.addTestSuite(RuntimeLocatorsTestCase.class);
- suite.addTestSuite(ServerTypesTestCase.class);
- suite.addTestSuite(ServerTasksTestCase.class);
- suite.addTestSuite(ServerLocatorsTestCase.class);
- suite.addTestSuite(LaunchableAdaptersTestCase.class);
- suite.addTestSuite(ClientsTestCase.class);
-
- suite.addTestSuite(ServerCoreTestCase.class);
- suite.addTestSuite(ServerUtilTestCase.class);
- suite.addTest(new OrderedTestSuite(ProjectPropertiesTestCase.class));
- suite.addTest(new OrderedTestSuite(ServerPreferencesTestCase.class));
- suite.addTest(new OrderedTestSuite(ServerPortTestCase.class));
- suite.addTestSuite(ServerOperationTestCase.class);
-
- suite.addTestSuite(IModuleTestCase.class);
- suite.addTestSuite(IModuleArtifactTestCase.class);
- suite.addTestSuite(IModuleTypeTestCase.class);
- suite.addTestSuite(PublishOperationTestCase.class);
- suite.addTestSuite(TaskModelTestCase.class);
-
- suite.addTestSuite(RuntimeLifecycleListenerTestCase.class);
- suite.addTestSuite(ServerLifecycleListenerTestCase.class);
- suite.addTestSuite(PublishListenerTestCase.class);
- suite.addTestSuite(ServerListenerTestCase.class);
- suite.addTest(new OrderedTestSuite(ServerEventTestCase.class));
-
- suite.addTest(new OrderedTestSuite(ClientDelegateTestCase.class));
- suite.addTest(new OrderedTestSuite(RuntimeLocatorDelegateTestCase.class));
- suite.addTest(new OrderedTestSuite(ModuleDelegateTestCase.class));
- suite.addTest(new OrderedTestSuite(RuntimeDelegateTestCase.class));
- suite.addTest(new OrderedTestSuite(ServerDelegateTestCase.class));
- suite.addTest(new OrderedTestSuite(ServerBehaviourDelegateTestCase.class));
- suite.addTest(new OrderedTestSuite(ServerTaskDelegateTestCase.class));
- suite.addTest(new OrderedTestSuite(ServerLocatorDelegateTestCase.class));
- suite.addTest(new OrderedTestSuite(ModuleFileTestCase.class));
- suite.addTest(new OrderedTestSuite(ModuleFolderTestCase.class));
- suite.addTest(new OrderedTestSuite(ModuleResourceTestCase.class));
- suite.addTest(new OrderedTestSuite(ModuleResourceDeltaTestCase.class));
- suite.addTest(new OrderedTestSuite(ModuleResourceDeltaVisitorTestCase.class));
- suite.addTest(new OrderedTestSuite(ModuleArtifactAdapterDelegateTestCase.class));
- suite.addTest(new OrderedTestSuite(LaunchableAdapterDelegateTestCase.class));
- suite.addTest(new OrderedTestSuite(ModuleListenerTestCase.class));
- suite.addTest(new OrderedTestSuite(ModuleEventTestCase.class));
- suite.addTest(new OrderedTestSuite(ModuleFactoryEventTestCase.class));
- suite.addTest(new OrderedTestSuite(ModuleFactoryDelegateTestCase.class));
-
- suite.addTest(new OrderedTestSuite(ProjectModuleTestCase.class));
- suite.addTest(new OrderedTestSuite(ProjectModuleFactoryDelegateTestCase.class));
-
- suite.addTest(new OrderedTestSuite(HTTPLaunchableTestCase.class));
- suite.addTest(new OrderedTestSuite(StaticWebTestCase.class));
- suite.addTest(new OrderedTestSuite(WebResourceTestCase.class));
- suite.addTest(new OrderedTestSuite(NullModuleArtifactTestCase.class));
- suite.addTestSuite(SocketUtilTestCase.class);
- suite.addTestSuite(RuntimeLifecycleAdapterTestCase.class);
- suite.addTestSuite(ServerLifecycleAdapterTestCase.class);
- suite.addTestSuite(PublishAdapterTestCase.class);
- //$JUnit-END$
- return suite;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ExistenceTest.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ExistenceTest.java
deleted file mode 100644
index 755d3a6..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ExistenceTest.java
+++ /dev/null
@@ -1,40 +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 Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
-*
-* Contributors:
-* Deniz Secilir - 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.wst.server.core.tests;
-
-import org.eclipse.wst.server.core.internal.ServerPlugin;
-
-import junit.framework.TestCase;
-
-public class ExistenceTest extends TestCase {
- public void testPluginExists() {
- assertNotNull(ServerPlugin.getInstance());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/IModuleArtifactTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/IModuleArtifactTestCase.java
deleted file mode 100644
index ea758f3..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/IModuleArtifactTestCase.java
+++ /dev/null
@@ -1,30 +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.core.tests;
-
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleArtifact;
-
-import junit.framework.TestCase;
-
-public class IModuleArtifactTestCase extends TestCase {
- protected static IModuleArtifact artifact;
-
- public void testCreate() {
- artifact = new IModuleArtifact() {
- public IModule getModule() {
- return null;
- }
- };
-
- artifact.getModule();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/IModuleTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/IModuleTestCase.java
deleted file mode 100644
index 384f4b9..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/IModuleTestCase.java
+++ /dev/null
@@ -1,57 +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.core.tests;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleType;
-
-import junit.framework.TestCase;
-
-public class IModuleTestCase extends TestCase {
- protected static IModule module;
-
- public void testCreate() {
- module = new IModule() {
- public String getId() {
- return null;
- }
-
- public String getName() {
- return null;
- }
-
- public IModuleType getModuleType() {
- return null;
- }
-
- public IProject getProject() {
- return null;
- }
-
- public Object getAdapter(Class adapter) {
- return null;
- }
-
- public Object loadAdapter(Class adapter, IProgressMonitor monitor) {
- return null;
- }
- };
-
- module.getId();
- module.getName();
- module.getModuleType();
- module.getProject();
- module.getAdapter(null);
- module.loadAdapter(null, null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/IModuleTypeTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/IModuleTypeTestCase.java
deleted file mode 100644
index e7df9f9..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/IModuleTypeTestCase.java
+++ /dev/null
@@ -1,39 +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.core.tests;
-
-import org.eclipse.wst.server.core.IModuleType;
-
-import junit.framework.TestCase;
-
-public class IModuleTypeTestCase extends TestCase {
- protected static IModuleType type;
-
- public void testCreate() {
- type = new IModuleType() {
- public String getId() {
- return null;
- }
-
- public String getName() {
- return null;
- }
-
- public String getVersion() {
- return null;
- }
- };
-
- type.getId();
- type.getName();
- type.getVersion();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ModificationStampTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ModificationStampTestCase.java
deleted file mode 100644
index e456ded..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ModificationStampTestCase.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.core.tests;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-/**
- * Do not run - test was created solely to show a JDT compilation problem (modification
- * stamps do not get updated in the output directory) which WTP has worked around.
- */
-public class ModificationStampTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(ModificationStampTestCase.class, "ModificationStampTestCase");
- }
-
- public void testModificationStamp() throws Exception {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("Test");
- if (!project.exists())
- project.create(null);
-
- if (!project.isOpen())
- project.open(null);
-
- IFile fileA = project.getFile("testA.txt");
- fileA.create(new ByteArrayInputStream("Initial contents".getBytes()), true, null);
-
- IFile fileB = project.getFile("testB.txt");
- fileA.copy(fileB.getProjectRelativePath(), true, null);
-
- long a1 = fileA.getModificationStamp();
- long b1 = fileB.getModificationStamp();
-
- System.out.println("Modification stamps: " + a1 + " " + b1);
-
- System.out.print("B's initial contents: ");
- InputStream in = fileB.getContents();
- byte[] bb = new byte[50];
- int n = in.read(bb);
- in.close();
- System.out.println(new String(bb, 0, n));
-
- fileA.setContents(new ByteArrayInputStream("New contents".getBytes()), false, false, null);
- fileB.delete(false, null);
- fileA.copy(fileB.getProjectRelativePath(), false, null);
-
- System.out.print("B's new contents: ");
- in = fileB.getContents();
- n = in.read(bb);
- in.close();
- System.out.println(new String(bb, 0, n));
-
- long a2 = fileA.getModificationStamp();
- long b2 = fileB.getModificationStamp();
-
- System.out.println("Modification stamps: " + a2 + " " + b2);
-
- assertFalse(a1 == a2);
- assertFalse(b1 == b2);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/OrderedTestSuite.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/OrderedTestSuite.java
deleted file mode 100644
index 73406cc..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/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.server.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();
- 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.core.tests/src/org/eclipse/wst/server/core/tests/ProjectPropertiesTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ProjectPropertiesTestCase.java
deleted file mode 100644
index 38b7314..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ProjectPropertiesTestCase.java
+++ /dev/null
@@ -1,59 +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.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.server.core.internal.ProjectProperties;
-import org.eclipse.wst.server.core.internal.ServerPlugin;
-
-public class ProjectPropertiesTestCase extends TestCase {
- protected static IProject project;
- protected static ProjectProperties props;
-
- public static Test suite() {
- return new OrderedTestSuite(ProjectPropertiesTestCase.class, "AbstractServerTestCase");
- }
-
- public void test00GetProperties() throws Exception {
- project = ResourcesPlugin.getWorkspace().getRoot().getProject("test");
- if (project != null && !project.exists()) {
- project.create(null);
- project.open(null);
- }
- props = ServerPlugin.getProjectProperties(project);
- }
-
- public void test03GetRuntime() throws Exception {
- assertNull(props.getRuntimeTarget());
- }
-
- public void test04GetServerProject() throws Exception {
- assertFalse(props.isServerProject());
- }
-
- public void test10SetServerProject() throws Exception {
- props.setServerProject(true, null);
- assertTrue(props.isServerProject());
- }
-
- public void test11UnsetServerProject() throws Exception {
- props.setServerProject(false, null);
- assertFalse(props.isServerProject());
- }
-
- public void test14End() throws Exception {
- project.delete(true, true, null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/PublishListenerTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/PublishListenerTestCase.java
deleted file mode 100644
index 272f704..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/PublishListenerTestCase.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.core.tests;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.server.core.IPublishListener;
-import org.eclipse.wst.server.core.IServer;
-
-import junit.framework.TestCase;
-
-public class PublishListenerTestCase extends TestCase {
- public void testListener() {
- IPublishListener listener = new IPublishListener() {
- public void publishStarted(IServer server) {
- // ignore
- }
-
- public void publishFinished(IServer server, IStatus status) {
- // ignore
- }
- };
-
- listener.publishStarted(null);
- listener.publishFinished(null, null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/RuntimeLifecycleListenerTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/RuntimeLifecycleListenerTestCase.java
deleted file mode 100644
index 9c970e5..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/RuntimeLifecycleListenerTestCase.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.core.tests;
-
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeLifecycleListener;
-
-import junit.framework.TestCase;
-
-public class RuntimeLifecycleListenerTestCase extends TestCase {
- public void testListener() {
- IRuntimeLifecycleListener listener = new IRuntimeLifecycleListener() {
- public void runtimeAdded(IRuntime runtime) {
- // ignore
- }
-
- public void runtimeChanged(IRuntime runtime) {
- // ignore
- }
-
- public void runtimeRemoved(IRuntime runtime) {
- // ignore
- }
- };
-
- listener.runtimeAdded(null);
- listener.runtimeChanged(null);
- listener.runtimeRemoved(null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerCoreTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerCoreTestCase.java
deleted file mode 100644
index a0f17fb..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerCoreTestCase.java
+++ /dev/null
@@ -1,85 +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.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class ServerCoreTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(ServerCoreTestCase.class, "RuntimeLocatorDelegateTestCase");
- }
-
- public void testGetRuntimesExtension() throws Exception {
- IRuntime[] runtimes = ServerCore.getRuntimes();
- if (runtimes != null) {
- int size = runtimes.length;
- for (int i = 0; i < size; i++)
- System.out.println(runtimes[i].getId() + " - " + runtimes[i].getName());
- }
- }
-
- public void testGetServersExtension() throws Exception {
- IServer[] servers = ServerCore.getServers();
- if (servers != null) {
- int size = servers.length;
- for (int i = 0; i < size; i++)
- System.out.println(servers[i].getId() + " - " + servers[i].getName());
- }
- }
-
- public void testFindRuntimes0Extension() throws Exception {
- try {
- ServerCore.findRuntime(null);
- assertTrue("Should throw exception", false);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void testFindRuntimes1Extension() throws Exception {
- assertTrue(ServerCore.findRuntime("x") == null);
- }
-
- public void testFindServers0Extension() throws Exception {
- try {
- ServerCore.findServer(null);
- assertTrue("Should throw exception", false);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void testFindServers1Extension() throws Exception {
- assertTrue(ServerCore.findServer("x") == null);
- }
-
- public void testAddRuntimeLifecycleListener() {
- ServerCore.addRuntimeLifecycleListener(null);
- }
-
- public void testRemoveRuntimeLifecycleListener() {
- ServerCore.removeRuntimeLifecycleListener(null);
- }
-
- public void testAddServerLifecycleListener() {
- ServerCore.addServerLifecycleListener(null);
- }
-
- public void testRemoveServerLifecycleListener() {
- ServerCore.removeServerLifecycleListener(null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerEventTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerEventTestCase.java
deleted file mode 100644
index 07e8d6b..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerEventTestCase.java
+++ /dev/null
@@ -1,245 +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.core.tests;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.server.core.*;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class ServerEventTestCase extends TestCase {
- private static ServerEvent event;
-
- private static int SAMPLE_KIND = ServerEvent.STATE_CHANGE;
- private static IServer SAMPLE_SERVER = createSampleServer();
- private static IModule[] SAMPLE_MODULE_TREE = new IModule[] { null };
- private static int SAMPLE_STATE = 1;
- private static int SAMPLE_PUBLISHING_STATE = 2;
- private static boolean SAMPLE_RESTART_STATE = true;
-
- public static Test suite() {
- return new OrderedTestSuite(ServerEventTestCase.class, "ServerEventTestCase");
- }
-
- public static IServer createSampleServer() {
- return new IServer() {
- public int getServerState() {
- return 0;
- }
- public String getMode() {
- return null;
- }
- public int getServerPublishState() {
- return 0;
- }
- public int getModulePublishState(IModule[] module) {
- return 0;
- }
- public void addServerListener(IServerListener listener) {
- // do nothing.
- }
- public void addServerListener(IServerListener listener, int eventMask) {
- // do nothing.
- }
- public void removeServerListener(IServerListener listener) {
- // do nothing.
- }
- public IStatus canPublish() {
- return null;
- }
- public IStatus publish(int kind, IProgressMonitor monitor) {
- return null;
- }
- public IStatus canStart(String launchMode) {
- return null;
- }
- public void start(String launchMode, IProgressMonitor monitor) throws CoreException {
- // do nothing
- }
- public void start(String launchMode, IServer.IOperationListener listener) {
- // do nothing
- }
- public void synchronousStart(String launchMode, IProgressMonitor monitor) throws CoreException {
- // do nothing
- }
- public IStatus canRestart(String mode) {
- return null;
- }
- public boolean getServerRestartState() {
- return false;
- }
- public void restart(String mode, IProgressMonitor monitor) {
- // do nothing
- }
- public void restart(String mode, IServer.IOperationListener listener) {
- // do nothing
- }
- public void synchronousRestart(String launchMode, IProgressMonitor monitor) throws CoreException {
- // do nothing
- }
- public IStatus canStop() {
- return null;
- }
- public void stop(boolean force) {
- // do nothing
- }
- public void stop(boolean force, IServer.IOperationListener listener) {
- // do nothing
- }
- public void synchronousStop(boolean force) {
- // do nothing
- }
- public IStatus canControlModule(IModule[] module, IProgressMonitor monitor) {
- return null;
- }
- public boolean getModuleRestartState(IModule[] module) {
- return false;
- }
- public int getModuleState(IModule[] module) {
- return 0;
- }
- public String getName() {
- return null;
- }
- public String getId() {
- return null;
- }
- public void delete() throws CoreException {
- // do nothing
- }
- public boolean isReadOnly() {
- return false;
- }
- public boolean isWorkingCopy() {
- return false;
- }
- public Object loadAdapter(Class c, IProgressMonitor monitor) {
- return null;
- }
- public String getHost() {
- return null;
- }
- public IRuntime getRuntime() {
- return null;
- }
- public IServerType getServerType() {
- return null;
- }
- public IFolder getServerConfiguration() {
- return null;
- }
- public IServerWorkingCopy createWorkingCopy() {
- return null;
- }
- public IModule[] getModules() {
- return null;
- }
- public IStatus canModifyModules(IModule[] add, IModule[] remove, IProgressMonitor monitor) {
- return null;
- }
- public IModule[] getChildModules(IModule[] module, IProgressMonitor monitor) {
- return null;
- }
- public IModule[] getRootModules(IModule module, IProgressMonitor monitor) throws CoreException {
- return null;
- }
- public ServerPort[] getServerPorts(IProgressMonitor monitor) {
- return null;
- }
- public Object getAdapter(Class adapter) {
- return null;
- }
- public void startModule(IModule[] module, IServer.IOperationListener listener) {
- // do nothing
- }
- public void stopModule(IModule[] module, IServer.IOperationListener listener) {
- // do nothing
- }
- public void restartModule(IModule[] module, IServer.IOperationListener listener) {
- // do nothing
- }
- public void addPublishListener(IPublishListener listener) {
- // do nothing
- }
- public void removePublishListener(IPublishListener listener) {
- // do nothing
- }
- };
- }
-
- public static ServerEvent createSampleServerEvent() {
- return new ServerEvent(SAMPLE_KIND, SAMPLE_SERVER, SAMPLE_STATE, SAMPLE_PUBLISHING_STATE, SAMPLE_RESTART_STATE);
- }
-
- public void test010CreateServerEvent() {
- event = ServerEventTestCase.createSampleServerEvent();
- }
-
- public void test011ServerGetKind() {
- assertTrue((event.getKind() & (ServerEvent.SERVER_CHANGE | SAMPLE_KIND)) != 0);
- }
-
- public void test013ServerGetPublishingState() {
- assertEquals(SAMPLE_PUBLISHING_STATE, event.getPublishState());
- }
-
- public void test014ServerGetRestartState() {
- assertEquals(SAMPLE_RESTART_STATE, event.getRestartState());
- }
-
- public void test015ServerGetServer() {
- assertEquals(SAMPLE_SERVER, event.getServer());
- }
-
- public void test016ServerGetState() {
- assertEquals(SAMPLE_STATE,event.getState());
- }
-
- public void test110CreateModuleEvent() {
- try {
- event = new ServerEvent(SAMPLE_KIND, SAMPLE_SERVER, SAMPLE_MODULE_TREE, SAMPLE_STATE, SAMPLE_PUBLISHING_STATE, SAMPLE_RESTART_STATE);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test111ModuleGetKind() {
- assertTrue((event.getKind() & (ServerEvent.MODULE_CHANGE | SAMPLE_KIND)) != 0);
- }
-
- public void test112ModuleGetModuleTree() {
- try {
- assertEquals(SAMPLE_MODULE_TREE, event.getModule());
- } catch (Exception e) {
- // allow failure for now - will need to fix this test
- }
- }
-
- public void test113ModuleGetPublishingState() {
- assertEquals(SAMPLE_PUBLISHING_STATE, event.getPublishState());
- }
-
- public void test114ModuleGetRestartState() {
- assertEquals(SAMPLE_RESTART_STATE, event.getRestartState());
- }
-
- public void test115ModuleGetServer() {
- assertEquals(SAMPLE_SERVER, event.getServer());
- }
-
- public void test116ModuleGetState() {
- assertEquals(SAMPLE_STATE,event.getState());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerLifecycleListenerTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerLifecycleListenerTestCase.java
deleted file mode 100644
index 592d7ad..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerLifecycleListenerTestCase.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.core.tests;
-
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerLifecycleListener;
-
-import junit.framework.TestCase;
-
-public class ServerLifecycleListenerTestCase extends TestCase {
- public void testListener() {
- IServerLifecycleListener listener = new IServerLifecycleListener() {
- public void serverAdded(IServer server) {
- // ignore
- }
-
- public void serverChanged(IServer server) {
- // ignore
- }
-
- public void serverRemoved(IServer server) {
- // ignore
- }
- };
-
- listener.serverAdded(null);
- listener.serverChanged(null);
- listener.serverRemoved(null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerListenerTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerListenerTestCase.java
deleted file mode 100644
index 29314b4..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerListenerTestCase.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.server.core.tests;
-
-import org.eclipse.wst.server.core.IServerListener;
-import org.eclipse.wst.server.core.ServerEvent;
-
-import junit.framework.TestCase;
-
-public class ServerListenerTestCase extends TestCase {
- public void testListener() {
- IServerListener listener = new IServerListener() {
- public void serverChanged(ServerEvent event) {
- // do nothing
- }
- };
- listener.serverChanged(null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerOperationTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerOperationTestCase.java
deleted file mode 100644
index 495e88e..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerOperationTestCase.java
+++ /dev/null
@@ -1,36 +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.core.tests;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.server.core.IServer;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class ServerOperationTestCase extends TestCase {
- protected static IServer.IOperationListener listener;
-
- public static Test suite() {
- return new OrderedTestSuite(ServerOperationTestCase.class, "ServerOperationTestCase");
- }
-
- public void test00Create() throws Exception {
- listener = new IServer.IOperationListener() {
- public void done(IStatus result) {
- // ignore
- }
- };
- }
-
- public void test01Done() throws Exception {
- listener.done(null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerPortTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerPortTestCase.java
deleted file mode 100644
index 3208da6..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerPortTestCase.java
+++ /dev/null
@@ -1,30 +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.core.tests;
-
-import org.eclipse.wst.server.core.ServerPort;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class ServerPortTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(ServerPortTestCase.class, "ServerPortTestCase");
- }
-
- public void test00CreatePort() throws Exception {
- new ServerPort(null, null, 0, null);
- }
-
- public void test02CreatePort() throws Exception {
- new ServerPort(null, null, 0, null, null, false);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerPreferencesTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerPreferencesTestCase.java
deleted file mode 100644
index 1cbdbed..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerPreferencesTestCase.java
+++ /dev/null
@@ -1,66 +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.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.core.internal.ServerPreferences;
-
-public class ServerPreferencesTestCase extends TestCase {
- protected static ServerPreferences prefs;
-
- public static Test suite() {
- return new OrderedTestSuite(ServerPreferencesTestCase.class, "ServerPreferencesTestCase");
- }
-
- public void test00GetProperties() throws Exception {
- prefs = ServerPreferences.getInstance();
- }
-
- public void test01GetPref() throws Exception {
- prefs.isAutoPublishing();
- }
-
- public void test02GetPref() throws Exception {
- prefs.isAutoRestarting();
- }
-
- public void test04SetPref() throws Exception {
- prefs.setAutoPublishing(false);
- assertFalse(prefs.isAutoPublishing());
- }
-
- public void test05SetPref() throws Exception {
- prefs.setAutoPublishing(true);
- assertTrue(prefs.isAutoPublishing());
- }
-
- public void test06SetPref() throws Exception {
- prefs.setAutoRestarting(false);
- assertFalse(prefs.isAutoRestarting());
- }
-
- public void test07SetPref() throws Exception {
- prefs.setAutoRestarting(true);
- assertTrue(prefs.isAutoRestarting());
- }
-
- public void test10DefaultPref() throws Exception {
- prefs.setAutoPublishing(prefs.isDefaultAutoPublishing());
- assertEquals(prefs.isAutoPublishing(), prefs.isDefaultAutoPublishing());
- }
-
- public void test11DefaultPref() throws Exception {
- prefs.setAutoRestarting(prefs.isDefaultAutoRestarting());
- assertEquals(prefs.isAutoRestarting(), prefs.isDefaultAutoRestarting());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerUtilTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerUtilTestCase.java
deleted file mode 100644
index 482ca04..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ServerUtilTestCase.java
+++ /dev/null
@@ -1,156 +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.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.server.core.IModuleType;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.internal.ResourceManager;
-
-public class ServerUtilTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(ServerUtilTestCase.class, "ServerUtilTestCase");
- }
-
- public void testFindServer0Extension() throws Exception {
- try {
- ResourceManager.findServer(null);
- assertTrue("Should throw exception", false);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void testFindServer1Extension() throws Exception {
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("missingproject/test"));
- assertTrue(ResourceManager.findServer(file) == null);
- }
-
- public void testGetModule1() throws Exception {
- try {
- ServerUtil.getModule((String)null);
- assertTrue("Should throw exception", false);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void testGetModule2() throws Exception {
- ServerUtil.getModule("x");
- }
-
- public void testGetModules0() throws Exception {
- ServerUtil.getModules((IModuleType[]) null);
- }
-
- public void testGetModules1() throws Exception {
- try {
- ServerUtil.getModule((IProject) null);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void testGetModules2() throws Exception {
- ServerUtil.getModules((String) null);
- }
-
- public void testIsSupportedModule0() throws Exception {
- try {
- ServerUtil.isSupportedModule((IModuleType) null, null);
- assertTrue("Should throw exception", false);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void testIsSupportedModule1() throws Exception {
- try {
- ServerUtil.isSupportedModule((IModuleType[]) null, null);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void testIsSupportedModule2() throws Exception {
- ServerUtil.isSupportedModule(null, null, null);
- }
-
- public void testModifyModules() throws Exception {
- try {
- ServerUtil.modifyModules(null, null, null, null);
- assertTrue("Should throw exception", false);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void testSetServerDefaultName() throws Exception {
- try {
- ServerUtil.setServerDefaultName(null);
- assertTrue("Should throw exception", false);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void testGetUnusedServerFile() throws Exception {
- try {
- ServerUtil.getUnusedServerFile(null, null);
- assertTrue("Should throw exception", false);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void testGetRuntimes() throws Exception {
- ServerUtil.getRuntimes(null, null);
- }
-
- public void testGetRuntimeTypes() throws Exception {
- ServerUtil.getRuntimeTypes(null, null, null);
- }
-
- public void testGetAvailableServersForModule() throws Exception {
- ServerUtil.getAvailableServersForModule(null, false, null);
- }
-
- public void testGetServersByModule() throws Exception {
- ServerUtil.getServersByModule(null, null);
- }
-
- public void testContainsModule() throws Exception {
- ServerUtil.containsModule(null, null, null);
- }
-
- public void testGetServer() throws Exception {
- try {
- ServerUtil.getServer(null);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void testValidateEdit() throws Exception {
- try {
- ServerUtil.validateEdit(null, null);
- } catch (Exception e) {
- // ignore
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/TaskModelTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/TaskModelTestCase.java
deleted file mode 100644
index bb6fec1..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/TaskModelTestCase.java
+++ /dev/null
@@ -1,25 +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.core.tests;
-
-import org.eclipse.wst.server.core.TaskModel;
-
-import junit.framework.TestCase;
-
-public class TaskModelTestCase extends TestCase {
- protected static TaskModel taskModel;
-
- public void testCreate() {
- taskModel = new TaskModel();
- taskModel.getObject("test");
- taskModel.putObject("test", "test");
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/TestsPlugin.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/TestsPlugin.java
deleted file mode 100644
index 74142c9..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/TestsPlugin.java
+++ /dev/null
@@ -1,43 +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 Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
-*
-* Contributors:
-* Deniz Secilir - 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.wst.server.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.server.core.tests/src/org/eclipse/wst/server/core/tests/ext/AbstractRuntimeTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ext/AbstractRuntimeTestCase.java
deleted file mode 100644
index 5826fc7..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ext/AbstractRuntimeTestCase.java
+++ /dev/null
@@ -1,180 +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.core.tests.ext;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.server.core.*;
-import org.eclipse.wst.server.core.internal.ProjectProperties;
-import org.eclipse.wst.server.core.internal.Runtime;
-import org.eclipse.wst.server.core.internal.ServerPlugin;
-import org.eclipse.wst.server.core.model.RuntimeDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-/**
- * Abstract runtime test case. Use this harness to test a specific runtime.
- * All you have to do is extend this class, implement the abstract
- * method(s) and add the test case to your suite.
- * <p>
- * You are welcome to add type-specific tests to this method. The test
- * method numbers (i.e. the XX in testXX()) should be between 200 and 1000.
- * </p>
- */
-public abstract class AbstractRuntimeTestCase extends TestCase {
- protected static IProject project;
- protected static ProjectProperties props;
-
- protected static IRuntime runtime;
- protected static IRuntimeWorkingCopy runtimeWC;
-
- private static final PropertyChangeListener pcl = new PropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent arg0) {
- // ignore
- }
- };
-
- public static Test suite() {
- return new OrderedTestSuite(AbstractRuntimeTestCase.class, "AbstractRuntimeTestCase");
- }
-
- protected IRuntime getRuntime() throws Exception {
- if (runtime == null)
- runtime = createRuntime();
-
- return runtime;
- }
-
- public abstract IRuntime createRuntime() throws Exception;
-
- public abstract void deleteRuntime(IRuntime runtime2) throws Exception;
-
- public void test0000GetProperties() throws Exception {
- project = ResourcesPlugin.getWorkspace().getRoot().getProject("test");
- if (project != null && !project.exists()) {
- project.create(null);
- project.open(null);
- }
- props = ServerPlugin.getProjectProperties(project);
- }
-
- public void test0001GetRuntime() throws Exception {
- assertNull(props.getRuntimeTarget());
- }
-
- public void test0003End() throws Exception {
- project.delete(true, true, null);
- }
-
- public void test0004GetAdapter() throws Exception {
- getRuntime().getAdapter(RuntimeDelegate.class);
- }
-
- public void test0005LoadAdapter() throws Exception {
- getRuntime().loadAdapter(RuntimeDelegate.class, null);
- }
-
- public void test0006Validate() throws Exception {
- IStatus status = getRuntime().validate(null);
- assertTrue(status.isOK() || status.getSeverity() == IStatus.WARNING);
- }
-
- public void test0007Validate() throws Exception {
- IRuntimeWorkingCopy wc = getRuntime().createWorkingCopy();
- wc.setLocation(null);
- IStatus status = wc.validate(null);
- assertTrue(!status.isOK());
- }
-
- public void test0008ModifyRuntime() throws Exception {
- IRuntimeWorkingCopy wc = getRuntime().createWorkingCopy();
- String name = wc.getName();
- wc.setName(name + "x");
- wc.setName(name);
- wc.save(false, null);
- }
-
- public void test0009IsPrivate() {
- ((Runtime)runtime).isPrivate();
- }
-
- public void test0010IsReadOnly() {
- runtime.isReadOnly();
- }
-
- public void test0011GetId() {
- runtime.getId();
- }
-
- public void test0011GetName() {
- runtime.getName();
- }
-
- public void test0012GetTimestamp() {
- ((Runtime)runtime).getTimestamp();
- }
-
- public void test0013GetRuntimeType() {
- assertNotNull(runtime.getRuntimeType());
- }
-
- public void test0014GetLocation() {
- assertNotNull(runtime.getLocation());
- }
-
- public void test0015IsStub() {
- runtime.isStub();
- }
-
- public void test0016CreateWorkingCopy() {
- runtimeWC = runtime.createWorkingCopy();
- }
-
- public void test0017IsDirty() {
- assertFalse(runtimeWC.isDirty());
- }
-
- public void test0018SetReadOnly() {
- runtimeWC.setReadOnly(true);
- runtimeWC.setReadOnly(false);
- }
-
- public void test0019SetStub() {
- runtimeWC.setStub(true);
- runtimeWC.setStub(false);
- }
-
- public void test0019IsDirty() {
- assertTrue(runtimeWC.isDirty());
- }
-
- public void test0020AddPropertyChangeListener() {
- runtimeWC.addPropertyChangeListener(pcl);
- }
-
- public void test0020RemovePropertyChangeListener() {
- runtimeWC.removePropertyChangeListener(pcl);
- }
-
- public void test0021Clear() {
- runtimeWC = null;
- }
-
- public void test1001Delete() throws Exception {
- deleteRuntime(getRuntime());
- runtime = null;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ext/AbstractServerTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ext/AbstractServerTestCase.java
deleted file mode 100644
index 4681289..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/ext/AbstractServerTestCase.java
+++ /dev/null
@@ -1,371 +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.core.tests.ext;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.wst.server.core.*;
-import org.eclipse.wst.server.core.internal.ProjectProperties;
-import org.eclipse.wst.server.core.internal.ServerPlugin;
-import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
-import org.eclipse.wst.server.core.model.ServerDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-/**
- * Abstract server test case. Use this harness to test a specific server.
- * All you have to do is extend this class, implement the abstract
- * method(s) and add the test case to your suite.
- * <p>
- * You are welcome to add type-specific tests to this method. The test
- * method numbers (i.e. the XX in testXX()) should be between 200 and 1000.
- * </p>
- */
-public abstract class AbstractServerTestCase extends TestCase {
- protected static IProject project;
- protected static ProjectProperties props;
-
- protected static IServer server;
- protected static IServerAttributes serverAttr;
- protected static IServerWorkingCopy serverWC;
-
- private static final PropertyChangeListener pcl = new PropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent arg0) {
- // ignore
- }
- };
-
- private static final IServerListener sl = new IServerListener() {
- public void serverChanged(ServerEvent event) {
- // ignore
- }
- };
-
- public static Test suite() {
- return new OrderedTestSuite(AbstractServerTestCase.class, "AbstractServerTestCase");
- }
-
- protected IServer getServer() throws Exception {
- if (server == null) {
- server = createServer();
-
- // test save all
- IServerWorkingCopy wc = server.createWorkingCopy();
- wc.saveAll(false, null);
- }
-
- return server;
- }
-
- public abstract IServer createServer() throws Exception;
-
- public abstract void deleteServer(IServer server2) throws Exception;
-
- public void test0000GetProperties() throws Exception {
- project = ResourcesPlugin.getWorkspace().getRoot().getProject("test");
- if (project != null && !project.exists()) {
- project.create(null);
- project.open(null);
- }
- props = ServerPlugin.getProjectProperties(project);
- }
-
- public void test0004End() throws Exception {
- project.delete(true, true, null);
- }
-
- public void test0005Delegate() throws Exception {
- getServer().getAdapter(ServerDelegate.class);
- }
-
- public void test0005bDelegate() throws Exception {
- getServer().loadAdapter(ServerDelegate.class, null);
- }
-
- public void test0005cDelegate() throws Exception {
- serverAttr = server;
- serverAttr.getAdapter(ServerDelegate.class);
- }
-
- public void test0005dDelegate() throws Exception {
- serverAttr.loadAdapter(ServerDelegate.class, null);
- }
-
- public void test0006Delegate() throws Exception {
- getServer().getAdapter(ServerBehaviourDelegate.class);
- }
-
- public void test0007Publish() throws Exception {
- getServer().publish(IServer.PUBLISH_FULL, null);
- }
-
- public void test0008CanRun() throws Exception {
- assertTrue(getServer().canStart(ILaunchManager.RUN_MODE).isOK());
- }
-
- public void test0009Run() throws Exception {
- getServer().synchronousStart(ILaunchManager.RUN_MODE, null);
- }
-
- public void test0010CanStop() throws Exception {
- assertTrue(getServer().canStop().isOK());
- }
-
- public void test0011Stop() throws Exception {
- getServer().synchronousStop(false);
- }
-
- public void test0012CanDebug() throws Exception {
- assertTrue(getServer().canStart(ILaunchManager.DEBUG_MODE).isOK());
- }
-
- public void test0013Debug() throws Exception {
- server.synchronousStart(ILaunchManager.DEBUG_MODE, null);
- }
-
- public void test0014CanStop() {
- assertTrue(server.canStop().isOK());
- }
-
- public void test0015Stop() {
- server.synchronousStop(false);
- }
-
- public void test0016GetServerPorts() {
- ServerPort[] ports = server.getServerPorts(null);
- if (ports != null) {
- int size = ports.length;
- for (int i = 0; i < size; i++) {
- ports[i].getId();
- ports[i].getContentTypes();
- ports[i].getName();
- ports[i].getPort();
- ports[i].getProtocol();
- ports[i].isAdvanced();
- ports[i].toString();
- ports[i].equals(null);
- ports[i].hashCode();
- }
- }
- }
-
- public void test0017GetServerState() {
- server.getServerState();
- }
-
- public void test0018GetServerPublishState() {
- server.getServerPublishState();
- }
-
- public void test0019GetServerRestartState() {
- server.getServerRestartState();
- }
-
- public void test0020GetModuleState() {
- try {
- server.getModuleState(null);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test0021GetModulePublishState() {
- try {
- server.getModulePublishState(null);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test0022GetModuleRestartState() {
- try {
- server.getModuleRestartState(null);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test0023GetMode() {
- server.getMode();
- }
-
- public void test0024CanPublish() {
- server.canPublish();
- }
-
- public void test0025CanRestart() {
- server.canRestart("run");
- }
-
- public void test0026CanControlModule() {
- try {
- server.canControlModule(null, null);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test0027AddServerListener() {
- server.addServerListener(sl);
- }
-
- public void test0028AddServerListener() {
- server.addServerListener(sl, 0);
- }
-
- public void test0029RemoveServerListener() {
- server.removeServerListener(sl);
- }
-
- public void test0030GetServerAttributes() {
- serverAttr = server;
- }
-
- public void test0031GetName() {
- serverAttr.getName();
- }
-
- public void test0032GetId() {
- serverAttr.getId();
- }
-
- public void test0033IsReadOnly() {
- serverAttr.isReadOnly();
- }
-
- public void test0034IsWorkingCopy() {
- serverAttr.isWorkingCopy();
- }
-
- public void test0035GetHost() {
- serverAttr.getHost();
- }
-
- public void test0036GetRuntime() {
- serverAttr.getRuntime();
- }
-
- public void test0037GetServerType() {
- serverAttr.getServerType();
- }
-
- public void test0038GetServerConfiguration() {
- serverAttr.getServerConfiguration();
- }
-
- public void test0039CreateWorkingCopy() {
- serverAttr.createWorkingCopy();
- }
-
- public void test0040GetModules() {
- serverAttr.getModules();
- }
-
- public void test0041CanModifyModules() {
- try {
- serverAttr.canModifyModules(null, null, null);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test0042GetChildModules() {
- try {
- serverAttr.getChildModules(null, null);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test0043GetRootModules() {
- try {
- serverAttr.getRootModules(null, null);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test0044GetServerPorts() {
- serverAttr.getServerPorts(null);
- }
-
- public void test0045Delete() {
- try {
- IServerAttributes sa = serverAttr.createWorkingCopy();
- sa.delete();
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test0046CreateWorkingCopy() {
- serverWC = server.createWorkingCopy();
- }
-
- public void test0047IsDirty() {
- assertFalse(serverWC.isDirty());
- }
-
- public void test0048SetName() {
- serverWC.setName("test");
- }
-
- public void test0049SetHost() {
- serverWC.setHost("www.eclipse.org");
- }
-
- public void test0050SetReadOnly() {
- serverWC.setReadOnly(true);
- }
-
- public void test0051IsDirty() {
- assertTrue(serverWC.isDirty());
- }
-
- public void test0052AddPropertyChangeListener() {
- serverWC.addPropertyChangeListener(pcl);
- }
-
- public void test0053RemovePropertyChangeListener() {
- serverWC.removePropertyChangeListener(pcl);
- }
-
- public void test0054GetOriginal() {
- serverWC.getOriginal();
- }
-
- public void test0055SetServerConfiguration() {
- serverWC.setServerConfiguration(null);
- }
-
- public void test0056ModifyModules() {
- try {
- serverWC.modifyModules(null, null, null);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test0057Clear() {
- serverAttr = null;
- serverWC = null;
- }
-
- public void test1001Delete() throws Exception {
- deleteServer(getServer());
- server = null;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ClientsTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ClientsTestCase.java
deleted file mode 100644
index 1e92def..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ClientsTestCase.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.wst.server.core.tests.extension;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.server.core.internal.IClient;
-import org.eclipse.wst.server.core.internal.ServerPlugin;
-
-public class ClientsTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(ClientsTestCase.class, "ClientsTestCase");
- }
-
- public void testClientsExtension() throws Exception {
- IClient[] clients = ServerPlugin.getClients();
- if (clients != null) {
- int size = clients.length;
- for (int i = 0; i < size; i++)
- System.out.println(clients[i].getId() + " - " + clients[i].getName());
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/LaunchableAdaptersTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/LaunchableAdaptersTestCase.java
deleted file mode 100644
index 39601fe..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/LaunchableAdaptersTestCase.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.wst.server.core.tests.extension;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.server.core.internal.ILaunchableAdapter;
-import org.eclipse.wst.server.core.internal.ServerPlugin;
-
-public class LaunchableAdaptersTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(LaunchableAdaptersTestCase.class, "LaunchableAdaptersTestCase");
- }
-
- public void testLaunchableAdaptersExtension() throws Exception {
- ILaunchableAdapter[] la = ServerPlugin.getLaunchableAdapters();
- if (la != null) {
- int size = la.length;
- for (int i = 0; i < size; i++)
- System.out.println(la[i].getId());
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ModuleFactoriesTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ModuleFactoriesTestCase.java
deleted file mode 100644
index d79c5f1..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ModuleFactoriesTestCase.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.wst.server.core.tests.extension;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public class ModuleFactoriesTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(ModuleFactoriesTestCase.class, "ModuleFactoriesTestCase");
- }
-
- public void testModuleFactoriesExtension() throws Exception {
- // get modules
- try {
- ServerUtil.getModule((IProject) null);
- } catch (Exception e) {
- // ignore
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/RuntimeLocatorsTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/RuntimeLocatorsTestCase.java
deleted file mode 100644
index eab5702..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/RuntimeLocatorsTestCase.java
+++ /dev/null
@@ -1,34 +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.core.tests.extension;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.server.core.internal.IRuntimeLocator;
-import org.eclipse.wst.server.core.internal.ServerPlugin;
-
-public class RuntimeLocatorsTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(RuntimeLocatorsTestCase.class, "RuntimeLocatorsTestCase");
- }
-
- public void testRuntimeLocatorsExtension() throws Exception {
- IRuntimeLocator[] runtimeLocators = ServerPlugin.getRuntimeLocators();
- if (runtimeLocators != null) {
- int size = runtimeLocators.length;
- for (int i = 0; i < size; i++) {
- System.out.println(runtimeLocators[i]);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/RuntimeTypesTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/RuntimeTypesTestCase.java
deleted file mode 100644
index fc19605..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/RuntimeTypesTestCase.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.core.tests.extension;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class RuntimeTypesTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(RuntimeTypesTestCase.class, "RuntimeTypesTestCase");
- }
-
- public void testRuntimeTypesExtension() throws Exception {
- IRuntimeType[] runtimeTypes = ServerCore.getRuntimeTypes();
- if (runtimeTypes != null) {
- int size = runtimeTypes.length;
- for (int i = 0; i < size; i++) {
- runtimeTypes[i].getId();
- runtimeTypes[i].getName();
- runtimeTypes[i].canCreate();
- runtimeTypes[i].getDescription();
- runtimeTypes[i].getVendor();
- runtimeTypes[i].getVersion();
- runtimeTypes[i].getModuleTypes();
- }
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerLocatorsTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerLocatorsTestCase.java
deleted file mode 100644
index 3c9ea0d..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerLocatorsTestCase.java
+++ /dev/null
@@ -1,30 +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.core.tests.extension;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class ServerLocatorsTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(ServerLocatorsTestCase.class, "ServerLocatorsTestCase");
- }
-
- public void testServerLocatorsExtension() throws Exception {
- /*IServerLocator[] serverLocators = ServerCore.getser();
- if (runtimeLocators != null) {
- int size = runtimeLocators.length;
- for (int i = 0; i < size; i++)
- System.out.println(runtimeLocators[i].getId() + " - " + runtimeLocators[i].getName());
- }*/
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerTasksTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerTasksTestCase.java
deleted file mode 100644
index 3be4b39..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerTasksTestCase.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.wst.server.core.tests.extension;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.server.core.internal.IPublishTask;
-import org.eclipse.wst.server.core.internal.ServerPlugin;
-
-public class ServerTasksTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(ServerTasksTestCase.class, "ServerTasksTestCase");
- }
-
- public void testServerTasksExtension() throws Exception {
- IPublishTask[] serverTasks = ServerPlugin.getPublishTasks();
- if (serverTasks != null) {
- int size = serverTasks.length;
- for (int i = 0; i < size; i++)
- System.out.println(serverTasks[i].getId());
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerTypesTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerTypesTestCase.java
deleted file mode 100644
index 9a21e08..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerTypesTestCase.java
+++ /dev/null
@@ -1,47 +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.core.tests.extension;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class ServerTypesTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(ServerTypesTestCase.class, "ServerTypesTestCase");
- }
-
- public void testServerTypesExtension() throws Exception {
- IServerType[] serverTypes = ServerCore.getServerTypes();
- if (serverTypes != null) {
- int size = serverTypes.length;
- for (int i = 0; i < size; i++) {
- serverTypes[i].getId();
- serverTypes[i].getName();
- serverTypes[i].getDescription();
- serverTypes[i].getRuntimeType();
- serverTypes[i].hasRuntime();
- serverTypes[i].hasServerConfiguration();
- serverTypes[i].supportsLaunchMode("run");
- serverTypes[i].supportsRemoteHosts();
- try {
- serverTypes[i].createServer(null, null, null);
- serverTypes[i].createServer(null, null, null, null);
- } catch (Exception e) {
- // ignore
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/StartupExtensionTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/StartupExtensionTestCase.java
deleted file mode 100644
index 0c5787d..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/StartupExtensionTestCase.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.wst.server.core.tests.extension;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class StartupExtensionTestCase extends TestCase {
- public static Test suite() {
- return new TestSuite(StartupExtensionTestCase.class, "StartupExtensionTestCase");
- }
-
- public void testStartupExtension() throws Exception {
- // startup
- ServerCore.getServers();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestClientDelegate.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestClientDelegate.java
deleted file mode 100644
index 81f3269..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestClientDelegate.java
+++ /dev/null
@@ -1,26 +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.core.tests.impl;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.model.ClientDelegate;
-
-public class TestClientDelegate extends ClientDelegate {
- public boolean supports(IServer server, Object launchable, String launchMode) {
- return false;
- }
-
- public IStatus launch(IServer server, Object launchable, String launchMode, ILaunch launch) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleDelegate.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleDelegate.java
deleted file mode 100644
index ffdd9f8..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleDelegate.java
+++ /dev/null
@@ -1,31 +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.core.tests.impl;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.model.IModuleResource;
-import org.eclipse.wst.server.core.model.ModuleDelegate;
-
-public class TestModuleDelegate extends ModuleDelegate{
- public IStatus validate() {
- return null;
- }
-
- public IModule[] getChildModules() {
- return null;
- }
-
- public IModuleResource[] members() throws CoreException {
- return null;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleFactoryDelegate.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleFactoryDelegate.java
deleted file mode 100644
index e67a038..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleFactoryDelegate.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.core.tests.impl;
-
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.model.ModuleDelegate;
-import org.eclipse.wst.server.core.model.ModuleFactoryDelegate;
-
-public class TestModuleFactoryDelegate extends ModuleFactoryDelegate {
- public ModuleDelegate getModuleDelegate(IModule module) {
- return null;
- }
-
- public IModule[] getModules() {
- return null;
- }
-
- public void testProtectedMethods() {
- try {
- createModule(null, null, null, null, null);
- getId();
- } catch (Exception e) {
- // ignore
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleListener.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleListener.java
deleted file mode 100644
index c1557b4..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleListener.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.core.tests.impl;
-
-import org.eclipse.wst.server.core.internal.IModuleListener;
-import org.eclipse.wst.server.core.internal.ModuleEvent;
-
-public class TestModuleListener implements IModuleListener {
- public void moduleChanged(ModuleEvent event) {
- // ignore
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleResource.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleResource.java
deleted file mode 100644
index ed58a30..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleResource.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.server.core.tests.impl;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.wst.server.core.model.IModuleResource;
-
-public class TestModuleResource implements IModuleResource {
- public IPath getModuleRelativePath() {
- return null;
- }
-
- public String getName() {
- return null;
- }
-
- public Object getAdapter(Class cl) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleResourceDelta.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleResourceDelta.java
deleted file mode 100644
index 1bf6100..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleResourceDelta.java
+++ /dev/null
@@ -1,33 +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.core.tests.impl;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.wst.server.core.model.IModuleResource;
-import org.eclipse.wst.server.core.model.IModuleResourceDelta;
-
-public class TestModuleResourceDelta implements IModuleResourceDelta {
- public IModuleResource getModuleResource() {
- return null;
- }
-
- public int getKind() {
- return 0;
- }
-
- public IModuleResourceDelta[] getAffectedChildren() {
- return null;
- }
-
- public IPath getModuleRelativePath() {
- return null;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleResourceDeltaVisitor.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleResourceDeltaVisitor.java
deleted file mode 100644
index 8f39054..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleResourceDeltaVisitor.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.server.core.tests.impl;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.server.core.internal.IModuleResourceDeltaVisitor;
-import org.eclipse.wst.server.core.model.IModuleResourceDelta;
-
-public class TestModuleResourceDeltaVisitor implements IModuleResourceDeltaVisitor {
- public boolean visit(IModuleResourceDelta delta) throws CoreException {
- return false;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestProjectModule.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestProjectModule.java
deleted file mode 100644
index f2bbc47..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestProjectModule.java
+++ /dev/null
@@ -1,30 +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.core.tests.impl;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.server.core.model.IModuleResource;
-import org.eclipse.wst.server.core.util.ProjectModule;
-
-public class TestProjectModule extends ProjectModule {
- public TestProjectModule() {
- super();
- }
-
- public TestProjectModule(IProject project) {
- super(project);
- }
-
- public IModuleResource[] members() throws CoreException {
- return null;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestProjectModuleFactoryDelegate.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestProjectModuleFactoryDelegate.java
deleted file mode 100644
index f5a62f6..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestProjectModuleFactoryDelegate.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.core.tests.impl;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.model.ModuleDelegate;
-import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate;
-
-public class TestProjectModuleFactoryDelegate extends ProjectModuleFactoryDelegate {
- public TestProjectModuleFactoryDelegate() {
- super();
- }
-
- public void testProtected() throws Exception {
- createModules(null);
- getListenerPaths();
- isValidModule(null);
- createModule(null, null, null, null, null);
- try {
- handleGlobalProjectChange(null, null);
- } catch (Exception e) {
- // ignore
- }
- }
-
- protected boolean isValidModule(IProject project) {
- return false;
- }
-
- protected IModule[] createModules(IProject project) {
- return null;
- }
-
- public ModuleDelegate getModuleDelegate(IModule module) {
- return null;
- }
-
- protected IModule createModule(IProject project) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestRuntimeDelegate.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestRuntimeDelegate.java
deleted file mode 100644
index a319aae..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestRuntimeDelegate.java
+++ /dev/null
@@ -1,81 +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.core.tests.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import org.eclipse.wst.server.core.model.RuntimeDelegate;
-
-public class TestRuntimeDelegate extends RuntimeDelegate {
- public void testProtected() {
- initialize();
-
- try {
- getAttribute("test", false);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- getAttribute("test", 0);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- getAttribute("test", new ArrayList());
- } catch (Exception e) {
- // ignore
- }
-
- try {
- getAttribute("test", new HashMap());
- } catch (Exception e) {
- // ignore
- }
-
- try {
- getAttribute("test", "test");
- } catch (Exception e) {
- // ignore
- }
-
- try {
- setAttribute("test", false);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- setAttribute("test", 0);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- setAttribute("test", new ArrayList());
- } catch (Exception e) {
- // ignore
- }
-
- try {
- setAttribute("test", new HashMap());
- } catch (Exception e) {
- // ignore
- }
-
- try {
- setAttribute("test", "test");
- } catch (Exception e) {
- // ignore
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestRuntimeLocatorDelegate.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestRuntimeLocatorDelegate.java
deleted file mode 100644
index 26d4efd..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestRuntimeLocatorDelegate.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.server.core.tests.impl;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.server.core.model.RuntimeLocatorDelegate;
-
-public class TestRuntimeLocatorDelegate extends RuntimeLocatorDelegate {
- public void searchForRuntimes(IPath path, IRuntimeSearchListener listener, IProgressMonitor monitor) {
- // do nothing
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestServerBehaviourDelegate.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestServerBehaviourDelegate.java
deleted file mode 100644
index eed30bb..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestServerBehaviourDelegate.java
+++ /dev/null
@@ -1,141 +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.core.tests.impl;
-
-import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
-
-public class TestServerBehaviourDelegate extends ServerBehaviourDelegate {
- public void stop(boolean force) {
- // ignore
- }
-
- public void testProtected() {
- try {
- setMode(null);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- initialize(null);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- publishStart(null);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- publishServer(0, null);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- publishModule(0, null, 0, null);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- publishFinish(null);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- setServerState(0);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- setServerPublishState(0);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- setServerRestartState(false);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- setModuleState(null, 0);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- setModulePublishState(null, 0);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- setModuleRestartState(null, false);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- canControlModule(null);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- getPublishedResourceDelta(null);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- getPublishedResources(null);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- getTempDirectory();
- } catch (Exception e) {
- // ignore
- }
-
- try {
- setServerStatus(null);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- setModuleStatus(null, null);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- startModule(null, null);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- stopModule(null, null);
- } catch (Exception e) {
- // ignore
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestServerDelegate.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestServerDelegate.java
deleted file mode 100644
index c522955..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestServerDelegate.java
+++ /dev/null
@@ -1,101 +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.core.tests.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.model.ServerDelegate;
-
-public class TestServerDelegate extends ServerDelegate {
- public IStatus canModifyModules(IModule[] add, IModule[] remove) {
- return null;
- }
-
- public IModule[] getChildModules(IModule[] module) {
- return null;
- }
-
- public IModule[] getRootModules(IModule module) throws CoreException {
- return null;
- }
-
- public void modifyModules(IModule[] add, IModule[] remove, IProgressMonitor monitor) throws CoreException {
- // do nothing
- }
-
- public void testProtected() {
- initialize();
-
- try {
- getAttribute("test", false);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- getAttribute("test", 0);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- getAttribute("test", new ArrayList());
- } catch (Exception e) {
- // ignore
- }
-
- try {
- getAttribute("test", new HashMap());
- } catch (Exception e) {
- // ignore
- }
-
- try {
- getAttribute("test", "test");
- } catch (Exception e) {
- // ignore
- }
-
- try {
- setAttribute("test", false);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- setAttribute("test", 0);
- } catch (Exception e) {
- // ignore
- }
-
- try {
- setAttribute("test", new ArrayList());
- } catch (Exception e) {
- // ignore
- }
-
- try {
- setAttribute("test", new HashMap());
- } catch (Exception e) {
- // ignore
- }
-
- try {
- setAttribute("test", "test");
- } catch (Exception e) {
- // ignore
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestServerLocatorDelegate.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestServerLocatorDelegate.java
deleted file mode 100644
index efb8ce6..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestServerLocatorDelegate.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.core.tests.impl;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.server.core.internal.provisional.ServerLocatorDelegate;
-
-public class TestServerLocatorDelegate extends ServerLocatorDelegate {
- public void searchForServers(String host, IServerSearchListener listener, IProgressMonitor monitor) {
- // ignore
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestServerTaskDelegate.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestServerTaskDelegate.java
deleted file mode 100644
index b8e4efc..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestServerTaskDelegate.java
+++ /dev/null
@@ -1,22 +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.core.tests.impl;
-
-import java.util.List;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.model.PublishOperation;
-import org.eclipse.wst.server.core.model.PublishTaskDelegate;
-
-public class TestServerTaskDelegate extends PublishTaskDelegate {
- public PublishOperation[] getTasks(IServer server, List modules) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestStaticWeb.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestStaticWeb.java
deleted file mode 100644
index 3bf151b..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestStaticWeb.java
+++ /dev/null
@@ -1,19 +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.core.tests.impl;
-
-import org.eclipse.wst.server.core.util.IStaticWeb;
-
-public class TestStaticWeb implements IStaticWeb {
- public String getContextRoot() {
- return null;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ClientDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ClientDelegateTestCase.java
deleted file mode 100644
index ebba9a0..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ClientDelegateTestCase.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.core.tests.model;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.core.model.ClientDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.tests.impl.TestClientDelegate;
-
-public class ClientDelegateTestCase extends TestCase {
- protected static ClientDelegate delegate;
-
- public static Test suite() {
- return new OrderedTestSuite(ClientDelegateTestCase.class, "ClientDelegateTestCase");
- }
-
- public void test00CreateDelegate() throws Exception {
- delegate = new TestClientDelegate();
- }
-
- public void test01Supports() throws Exception {
- delegate.supports(null, null, null);
- }
-
- public void test02Launch() throws Exception {
- delegate.launch(null, null, null, null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/IURLProviderTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/IURLProviderTestCase.java
deleted file mode 100644
index bf7fb34..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/IURLProviderTestCase.java
+++ /dev/null
@@ -1,39 +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.core.tests.model;
-
-import java.net.URL;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.model.IURLProvider;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-
-public class IURLProviderTestCase extends TestCase {
- protected static IURLProvider urlProvider;
-
- public static Test suite() {
- return new OrderedTestSuite(IURLProviderTestCase.class, "IURLProviderTestCase");
- }
-
- public void test00CreateDelegate() throws Exception {
- urlProvider = new IURLProvider() {
- public URL getModuleRootURL(IModule module) {
- return null;
- }
- };
- }
-
- public void test01GetModuleRootURL() throws Exception {
- urlProvider.getModuleRootURL(null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/LaunchableAdapterDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/LaunchableAdapterDelegateTestCase.java
deleted file mode 100644
index ce918a6..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/LaunchableAdapterDelegateTestCase.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.wst.server.core.tests.model;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.model.LaunchableAdapterDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-
-public class LaunchableAdapterDelegateTestCase extends TestCase {
- protected static LaunchableAdapterDelegate delegate;
-
- public static Test suite() {
- return new OrderedTestSuite(LaunchableAdapterDelegateTestCase.class, "LaunchableAdapterDelegateTestCase");
- }
-
- public void test00CreateDelegate() {
- delegate = new LaunchableAdapterDelegate() {
- public Object getLaunchable(IServer server, IModuleArtifact moduleArtifact) throws CoreException {
- return null;
- }
- };
- }
-
- public void test01GetLaunchable() throws Exception {
- delegate.getLaunchable(null, null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleArtifactAdapterDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleArtifactAdapterDelegateTestCase.java
deleted file mode 100644
index 7d8e6a4..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleArtifactAdapterDelegateTestCase.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.core.tests.model;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-
-public class ModuleArtifactAdapterDelegateTestCase extends TestCase {
- protected static ModuleArtifactAdapterDelegate delegate;
-
- public static Test suite() {
- return new OrderedTestSuite(ModuleArtifactAdapterDelegateTestCase.class, "ModuleArtifactAdapterDelegateTestCase");
- }
-
- public void test00CreateDelegate() {
- delegate = new ModuleArtifactAdapterDelegate() {
- public IModuleArtifact getModuleArtifact(Object obj) {
- return null;
- }
- };
- }
-
- public void test01GetModuleArtifact() {
- delegate.getModuleArtifact(null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleDelegateTestCase.java
deleted file mode 100644
index f92e35a..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleDelegateTestCase.java
+++ /dev/null
@@ -1,54 +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.core.tests.model;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.core.model.ModuleDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.tests.impl.TestModuleDelegate;
-
-public class ModuleDelegateTestCase extends TestCase {
- protected static ModuleDelegate delegate;
-
- public static Test suite() {
- return new OrderedTestSuite(ModuleDelegateTestCase.class, "ModuleDelegateTestCase");
- }
-
- public void test00CreateDelegate() throws Exception {
- delegate = new TestModuleDelegate();
- }
-
- public void test01Initialize() throws Exception {
- delegate.initialize();
- }
-
- public void test02Initialize() throws Exception {
- delegate.initialize(null);
- }
-
- public void test03GetChildModules() throws Exception {
- delegate.getChildModules();
- }
-
- public void test04GetModule() throws Exception {
- delegate.getModule();
- }
-
- public void test05Validate() throws Exception {
- delegate.validate();
- }
-
- public void test06Members() throws Exception {
- delegate.members();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleEventTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleEventTestCase.java
deleted file mode 100644
index 855293f..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleEventTestCase.java
+++ /dev/null
@@ -1,53 +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.core.tests.model;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.core.internal.ModuleEvent;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-
-public class ModuleEventTestCase extends TestCase {
- protected static ModuleEvent event;
-
- public static Test suite() {
- return new OrderedTestSuite(ModuleEventTestCase.class, "ModuleEventTestCase");
- }
-
- public void test00CreateEvent() throws Exception {
- event = new ModuleEvent(null, false, null, null, null);
- }
-
- public void test01GetAddedChildModules() throws Exception {
- event.getAddedChildModules();
- }
-
- public void test02GetChangedChildModules() throws Exception {
- event.getChangedChildModules();
- }
-
- public void test03GetRemovedChildModules() throws Exception {
- event.getRemovedChildModules();
- }
-
- public void test04GetChangedArtifacts() throws Exception {
- event.getChangedArtifacts();
- }
-
- public void test05IsChanged() throws Exception {
- event.isChanged();
- }
-
- public void test06GetModule() throws Exception {
- event.getModule();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFactoryDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFactoryDelegateTestCase.java
deleted file mode 100644
index e544fca..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFactoryDelegateTestCase.java
+++ /dev/null
@@ -1,42 +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.core.tests.model;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.core.model.ModuleFactoryDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.tests.impl.TestModuleFactoryDelegate;
-
-public class ModuleFactoryDelegateTestCase extends TestCase {
- protected static ModuleFactoryDelegate delegate;
-
- public static Test suite() {
- return new OrderedTestSuite(ModuleFactoryDelegateTestCase.class, "ModuleFactoryDelegateTestCase");
- }
-
- public void test00CreateDelegate() throws Exception {
- delegate = new TestModuleFactoryDelegate();
- }
-
- public void test03GetModuleDelegate() {
- delegate.getModuleDelegate(null);
- }
-
- public void test04GetModules() {
- delegate.getModules();
- }
-
- public void test07TestProtected() {
- ((TestModuleFactoryDelegate)delegate).testProtectedMethods();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFactoryEventTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFactoryEventTestCase.java
deleted file mode 100644
index c9d186f..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFactoryEventTestCase.java
+++ /dev/null
@@ -1,37 +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.core.tests.model;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.core.internal.ModuleFactoryEvent;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-
-public class ModuleFactoryEventTestCase extends TestCase {
- protected static ModuleFactoryEvent event;
-
- public static Test suite() {
- return new OrderedTestSuite(ModuleFactoryEventTestCase.class, "ModuleFactoryEventTestCase");
- }
-
- public void test00CreateEvent() throws Exception {
- event = new ModuleFactoryEvent(null, null);
- }
-
- public void test01GetAddedModules() throws Exception {
- event.getAddedModules();
- }
-
- public void test02GetRemovedModules() throws Exception {
- event.getRemovedModules();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFileTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFileTestCase.java
deleted file mode 100644
index 1edd88e..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFileTestCase.java
+++ /dev/null
@@ -1,43 +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.core.tests.model;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.server.core.internal.ModuleFile;
-import org.eclipse.wst.server.core.model.IModuleFile;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-
-public class ModuleFileTestCase extends TestCase {
- protected static IModuleFile delegate;
-
- public static Test suite() {
- return new OrderedTestSuite(ModuleFileTestCase.class, "ModuleFileTestCase");
- }
-
- public void test00CreateDelegate() throws Exception {
- delegate = new ModuleFile((IFile)null, "name", null);
- }
-
- public void test01Name() throws Exception {
- assertEquals(delegate.getName(), "name");
- }
-
- public void test02Path() throws Exception {
- assertNull(delegate.getModuleRelativePath());
- }
-
- public void test03Stamp() throws Exception {
- assertEquals(delegate.getModificationStamp(), -1);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFolderTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFolderTestCase.java
deleted file mode 100644
index f42c6c3..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFolderTestCase.java
+++ /dev/null
@@ -1,42 +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.core.tests.model;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.core.internal.ModuleFolder;
-import org.eclipse.wst.server.core.model.IModuleFolder;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-
-public class ModuleFolderTestCase extends TestCase {
- protected static IModuleFolder delegate;
-
- public static Test suite() {
- return new OrderedTestSuite(ModuleFolderTestCase.class, "ModuleFolderTestCase");
- }
-
- public void test00CreateDelegate() throws Exception {
- delegate = new ModuleFolder(null, "name", null);
- }
-
- public void test01Name() throws Exception {
- assertEquals(delegate.getName(), "name");
- }
-
- public void test02Path() throws Exception {
- assertNull(delegate.getModuleRelativePath());
- }
-
- public void test03Members() throws Exception {
- delegate.members();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleListenerTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleListenerTestCase.java
deleted file mode 100644
index 332008c..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleListenerTestCase.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.core.tests.model;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.core.internal.IModuleListener;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.tests.impl.TestModuleListener;
-
-public class ModuleListenerTestCase extends TestCase {
- protected static IModuleListener listener;
-
- public static Test suite() {
- return new OrderedTestSuite(ModuleListenerTestCase.class, "ModuleListenerTestCase");
- }
-
- public void test00CreateListener() throws Exception {
- listener = new TestModuleListener();
- }
-
- public void test01ModuleChanged() throws Exception {
- listener.moduleChanged(null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleResourceDeltaTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleResourceDeltaTestCase.java
deleted file mode 100644
index 80a9829..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleResourceDeltaTestCase.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.wst.server.core.tests.model;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.core.model.IModuleResourceDelta;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.tests.impl.TestModuleResourceDelta;
-
-public class ModuleResourceDeltaTestCase extends TestCase {
- protected static IModuleResourceDelta delta;
-
- public static Test suite() {
- return new OrderedTestSuite(ModuleResourceDeltaTestCase.class, "ModuleResourceDeltaTestCase");
- }
-
- public void test00CreateDelegate() {
- delta = new TestModuleResourceDelta();
- }
-
- public void test01GetModuleResource() {
- assertNull(delta.getModuleResource());
- }
-
- public void test02GetAffectedChildren() {
- assertNull(delta.getAffectedChildren());
- }
-
- public void test03GetModuleRelativePath() {
- assertNull(delta.getModuleRelativePath());
- }
-
- public void test04GetKind() {
- delta.getKind();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleResourceDeltaVisitorTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleResourceDeltaVisitorTestCase.java
deleted file mode 100644
index 01d20df..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleResourceDeltaVisitorTestCase.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.core.tests.model;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.core.internal.IModuleResourceDeltaVisitor;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.tests.impl.TestModuleResourceDeltaVisitor;
-
-public class ModuleResourceDeltaVisitorTestCase extends TestCase {
- protected static IModuleResourceDeltaVisitor delta;
-
- public static Test suite() {
- return new OrderedTestSuite(ModuleResourceDeltaVisitorTestCase.class, "ModuleResourceDeltaVisitorTestCase");
- }
-
- public void test00CreateDelegate() {
- delta = new TestModuleResourceDeltaVisitor();
- }
-
- public void test01Visit() throws Exception {
- delta.visit(null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleResourceTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleResourceTestCase.java
deleted file mode 100644
index 02e4309..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleResourceTestCase.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.core.tests.model;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.core.model.IModuleResource;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.tests.impl.TestModuleResource;
-
-public class ModuleResourceTestCase extends TestCase {
- protected static IModuleResource resource;
-
- public static Test suite() {
- return new OrderedTestSuite(ModuleResourceTestCase.class, "ModuleResourceTestCase");
- }
-
- public void test00CreateDelegate() throws Exception {
- resource = new TestModuleResource();
- }
-
- public void test01Name() throws Exception {
- assertNull(resource.getName());
- }
-
- public void test02Path() throws Exception {
- assertNull(resource.getModuleRelativePath());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/PublishOperationTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/PublishOperationTestCase.java
deleted file mode 100644
index 903d7a6..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/PublishOperationTestCase.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.wst.server.core.tests.model;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.wst.server.core.model.PublishOperation;
-
-import junit.framework.TestCase;
-
-public class PublishOperationTestCase extends TestCase {
- protected static PublishOperation task;
-
- public void testCreate() throws Exception {
- task = new PublishOperation() {
- public void execute(IProgressMonitor monitor, IAdaptable info) throws CoreException {
- // ignore
- }
-
- public int getOrder() {
- return 0;
- }
- };
- task.getLabel();
- task.getDescription();
- task.getTaskModel();
- task.setTaskModel(null);
- task.execute(null, null);
- task.getKind();
- task.getOrder();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/RuntimeDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/RuntimeDelegateTestCase.java
deleted file mode 100644
index 26a8293..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/RuntimeDelegateTestCase.java
+++ /dev/null
@@ -1,58 +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.core.tests.model;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.core.model.RuntimeDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.tests.impl.TestRuntimeDelegate;
-
-public class RuntimeDelegateTestCase extends TestCase {
- protected static RuntimeDelegate delegate;
-
- public static Test suite() {
- return new OrderedTestSuite(RuntimeDelegateTestCase.class, "RuntimeDelegateTestCase");
- }
-
- public void test00CreateDelegate() throws Exception {
- delegate = new TestRuntimeDelegate();
- }
-
- public void test03GetRuntime() throws Exception {
- delegate.getRuntime();
- }
-
- public void test04GetRuntimeWorkingCopy() throws Exception {
- delegate.getRuntimeWorkingCopy();
- }
-
- public void test05Validate() {
- try {
- delegate.validate();
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test11Dispose() throws Exception {
- delegate.dispose();
- }
-
- public void test12SetDefaults() throws Exception {
- delegate.setDefaults(null);
- }
-
- public void test13Protected() throws Exception {
- ((TestRuntimeDelegate)delegate).testProtected();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/RuntimeLocatorDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/RuntimeLocatorDelegateTestCase.java
deleted file mode 100644
index 451c6bd..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/RuntimeLocatorDelegateTestCase.java
+++ /dev/null
@@ -1,45 +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.core.tests.model;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.model.RuntimeLocatorDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.tests.impl.TestRuntimeLocatorDelegate;
-
-public class RuntimeLocatorDelegateTestCase extends TestCase {
- protected static RuntimeLocatorDelegate delegate;
-
- public static Test suite() {
- return new OrderedTestSuite(RuntimeLocatorDelegateTestCase.class, "RuntimeLocatorDelegateTestCase");
- }
-
- public void test00CreateDelegate() throws Exception {
- delegate = new TestRuntimeLocatorDelegate();
- }
-
- public void test01Search() throws Exception {
- delegate.searchForRuntimes(null, null, null);
- }
-
- public void test02Listener() {
- RuntimeLocatorDelegate.IRuntimeSearchListener listener = new RuntimeLocatorDelegate.IRuntimeSearchListener() {
- public void runtimeFound(IRuntimeWorkingCopy runtime) {
- // ignore
- }
- };
-
- listener.runtimeFound(null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerBehaviourDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerBehaviourDelegateTestCase.java
deleted file mode 100644
index 7045f89..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerBehaviourDelegateTestCase.java
+++ /dev/null
@@ -1,58 +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.core.tests.model;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.tests.impl.TestServerBehaviourDelegate;
-
-public class ServerBehaviourDelegateTestCase extends TestCase {
- protected static ServerBehaviourDelegate delegate;
-
- public static Test suite() {
- return new OrderedTestSuite(ServerBehaviourDelegateTestCase.class, "ServerBehaviourDelegateTestCase");
- }
-
- public void test00CreateDelegate() throws Exception {
- delegate = new TestServerBehaviourDelegate();
- }
-
- public void test03GetServer() throws Exception {
- delegate.getServer();
- }
-
- public void test04Dispose() throws Exception {
- delegate.dispose();
- }
-
- public void test17SetupLaunchConfiguration() throws Exception {
- delegate.setupLaunchConfiguration(null, null);
- }
-
- public void test18Restart() throws Exception {
- try {
- delegate.restart(null);
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test21Stop() {
- delegate.stop(false);
- }
-
- public void test27TestProtected() {
- ((TestServerBehaviourDelegate)delegate).testProtected();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerDelegateTestCase.java
deleted file mode 100644
index e510ac2..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerDelegateTestCase.java
+++ /dev/null
@@ -1,82 +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.core.tests.model;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.core.model.ServerDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.tests.impl.TestServerDelegate;
-
-public class ServerDelegateTestCase extends TestCase {
- protected static ServerDelegate delegate;
-
- public static Test suite() {
- return new OrderedTestSuite(ServerDelegateTestCase.class, "ServerDelegateTestCase");
- }
-
- public void test00CreateDelegate() throws Exception {
- delegate = new TestServerDelegate();
- }
-
- public void test03GetServer() throws Exception {
- delegate.getServer();
- }
-
- public void test04GetServerWorkingCopy() throws Exception {
- delegate.getServerWorkingCopy();
- }
-
- public void test11Dispose() throws Exception {
- delegate.dispose();
- }
-
- public void test12SetDefaults() throws Exception {
- delegate.setDefaults(null);
- }
-
- public void test18CanModifyModules() throws Exception {
- delegate.canModifyModules(null, null);
- }
-
- public void test19GetChildModules() throws Exception {
- delegate.getChildModules(null);
- }
-
- public void test20GetRootModules() throws Exception {
- delegate.getRootModules(null);
- }
-
- public void test21GetServerPorts() throws Exception {
- delegate.getServerPorts();
- }
-
- public void test22ModifyModules() throws Exception {
- delegate.modifyModules(null, null, null);
- }
-
- public void test23ImportConfiguration() throws Exception {
- delegate.importRuntimeConfiguration(null, null);
- }
-
- public void test24ImportConfiguration() throws Exception {
- delegate.saveConfiguration(null);
- }
-
- public void test25ConfigurationChanged() throws Exception {
- delegate.configurationChanged();
- }
-
- public void test26TestProtected() {
- ((TestServerDelegate)delegate).testProtected();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerLocatorDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerLocatorDelegateTestCase.java
deleted file mode 100644
index 67895fc..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerLocatorDelegateTestCase.java
+++ /dev/null
@@ -1,45 +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.core.tests.model;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.internal.provisional.ServerLocatorDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.tests.impl.TestServerLocatorDelegate;
-
-public class ServerLocatorDelegateTestCase extends TestCase {
- protected static ServerLocatorDelegate delegate;
-
- public static Test suite() {
- return new OrderedTestSuite(ServerLocatorDelegateTestCase.class, "ServerLocatorDelegateTestCase");
- }
-
- public void test00CreateDelegate() throws Exception {
- delegate = new TestServerLocatorDelegate();
- }
-
- public void test01Search() throws Exception {
- delegate.searchForServers("host", null, null);
- }
-
- public void test02Listener() {
- ServerLocatorDelegate.IServerSearchListener listener = new ServerLocatorDelegate.IServerSearchListener() {
- public void serverFound(IServerWorkingCopy server) {
- // ignore
- }
- };
-
- listener.serverFound(null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerTaskDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerTaskDelegateTestCase.java
deleted file mode 100644
index ad476b8..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerTaskDelegateTestCase.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.core.tests.model;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.core.model.PublishTaskDelegate;
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.tests.impl.TestServerTaskDelegate;
-
-public class ServerTaskDelegateTestCase extends TestCase {
- protected static PublishTaskDelegate delegate;
-
- public static Test suite() {
- return new OrderedTestSuite(ServerTaskDelegateTestCase.class, "ServerTaskDelegateTestCase");
- }
-
- public void test00CreateDelegate() throws Exception {
- delegate = new TestServerTaskDelegate();
- }
-
- public void test01GetTasks() throws Exception {
- delegate.getTasks(null, null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/HTTPLaunchableTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/HTTPLaunchableTestCase.java
deleted file mode 100644
index 0fc5294..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/HTTPLaunchableTestCase.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.wst.server.core.tests.util;
-
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.util.HttpLaunchable;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class HTTPLaunchableTestCase extends TestCase {
- protected static HttpLaunchable launch;
-
- public static Test suite() {
- return new OrderedTestSuite(HTTPLaunchableTestCase.class, "HTTPLaunchableTestCase");
- }
-
- public void test00Create() {
- launch = new HttpLaunchable(null);
- }
-
- public void test01GetURL() {
- assertNull(launch.getURL());
- }
-
- public void test02ToString() {
- try {
- launch.toString();
- } catch (Exception e) {
- // ignore
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/NullModuleArtifactTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/NullModuleArtifactTestCase.java
deleted file mode 100644
index fca9960..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/NullModuleArtifactTestCase.java
+++ /dev/null
@@ -1,36 +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.core.tests.util;
-
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.util.NullModuleArtifact;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class NullModuleArtifactTestCase extends TestCase {
- protected static NullModuleArtifact nma;
-
- public static Test suite() {
- return new OrderedTestSuite(NullModuleArtifactTestCase.class, "NullModuleArtifactTestCase");
- }
-
- public void test00Create() {
- nma = new NullModuleArtifact(null);
- }
-
- public void test01GetModule() {
- assertNull(nma.getModule());
- }
-
- public void test02ToString() {
- nma.toString();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/ProjectModuleFactoryDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/ProjectModuleFactoryDelegateTestCase.java
deleted file mode 100644
index 0b26514..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/ProjectModuleFactoryDelegateTestCase.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.wst.server.core.tests.util;
-
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.tests.impl.TestProjectModuleFactoryDelegate;
-import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class ProjectModuleFactoryDelegateTestCase extends TestCase {
- protected static ProjectModuleFactoryDelegate delegate;
-
- public static Test suite() {
- return new OrderedTestSuite(ProjectModuleFactoryDelegateTestCase.class, "ProjectModuleFactoryDelegateTestCase");
- }
-
- public void test00Create() {
- delegate = new TestProjectModuleFactoryDelegate();
- }
-
- public void test03GetModuleDelegate() {
- delegate.getModuleDelegate(null);
- }
-
- public void test04GetModules() {
- delegate.getModules();
- }
-
- public void test06TestProtected() throws Exception {
- ((TestProjectModuleFactoryDelegate)delegate).testProtected();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/ProjectModuleTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/ProjectModuleTestCase.java
deleted file mode 100644
index 2a5590f..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/ProjectModuleTestCase.java
+++ /dev/null
@@ -1,77 +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.core.tests.util;
-
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.tests.impl.TestProjectModule;
-import org.eclipse.wst.server.core.util.ProjectModule;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class ProjectModuleTestCase extends TestCase {
- protected static ProjectModule pm;
-
- public static Test suite() {
- return new OrderedTestSuite(ProjectModuleTestCase.class, "ProjectModuleTestCase");
- }
-
- public void test00Create() {
- pm = new TestProjectModule();
- }
-
- public void test01Create() {
- pm = new TestProjectModule(null);
- }
-
- public void test02GetProject() {
- pm.getProject();
- }
-
- public void test04GetId() {
- try {
- pm.getId();
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test05Validate() {
- pm.validate();
- }
-
- public void test06Members() {
- try {
- pm.members();
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test07GetName() {
- try {
- pm.getName();
- } catch (Exception e) {
- // ignore
- }
- }
-
- public void test08Exists() {
- pm.exists();
- }
-
- public void test09Equals() {
- pm.equals(null);
- }
-
- public void test10() {
- pm.getChildModules();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/PublishAdapterTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/PublishAdapterTestCase.java
deleted file mode 100644
index 4b68370..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/PublishAdapterTestCase.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.wst.server.core.tests.util;
-
-import org.eclipse.wst.server.core.util.PublishAdapter;
-
-import junit.framework.TestCase;
-
-public class PublishAdapterTestCase extends TestCase {
- public void testListener() {
- PublishAdapter listener = new PublishAdapter();
-
- listener.publishStarted(null);
- listener.publishFinished(null, null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/RuntimeLifecycleAdapterTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/RuntimeLifecycleAdapterTestCase.java
deleted file mode 100644
index 38684b8..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/RuntimeLifecycleAdapterTestCase.java
+++ /dev/null
@@ -1,25 +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.core.tests.util;
-
-import org.eclipse.wst.server.core.util.RuntimeLifecycleAdapter;
-
-import junit.framework.TestCase;
-
-public class RuntimeLifecycleAdapterTestCase extends TestCase {
- public void testListener() {
- RuntimeLifecycleAdapter listener = new RuntimeLifecycleAdapter();
-
- listener.runtimeAdded(null);
- listener.runtimeChanged(null);
- listener.runtimeRemoved(null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/ServerLifecycleAdapterTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/ServerLifecycleAdapterTestCase.java
deleted file mode 100644
index 76b0250..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/ServerLifecycleAdapterTestCase.java
+++ /dev/null
@@ -1,25 +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.core.tests.util;
-
-import org.eclipse.wst.server.core.util.ServerLifecycleAdapter;
-
-import junit.framework.TestCase;
-
-public class ServerLifecycleAdapterTestCase extends TestCase {
- public void testListener() {
- ServerLifecycleAdapter listener = new ServerLifecycleAdapter();
-
- listener.serverAdded(null);
- listener.serverChanged(null);
- listener.serverRemoved(null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/SocketUtilTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/SocketUtilTestCase.java
deleted file mode 100644
index 1a5a769..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/SocketUtilTestCase.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.wst.server.core.tests.util;
-
-import org.eclipse.wst.server.core.util.SocketUtil;
-
-import junit.framework.TestCase;
-
-public class SocketUtilTestCase extends TestCase {
- public void testFindUnusedPort() {
- int i = SocketUtil.findUnusedPort(22000, 22050);
- assertTrue(i != -1);
- }
-
- public void testIsLocalhost() {
- assertTrue(SocketUtil.isLocalhost("localhost"));
- }
-
- public void testIsLocalhost2() {
- assertTrue(SocketUtil.isLocalhost("127.0.0.1"));
- }
-
- public void testIsLocalhost3() {
- assertFalse(SocketUtil.isLocalhost(null));
- }
-
- public void testIsLocalhost4() {
- assertFalse(SocketUtil.isLocalhost("www.not-eclipse.com"));
- }
-
- public void testIsPortInUse() {
- assertFalse(SocketUtil.isPortInUse(22054));
- }
-
- public void testIsPortInUse2() {
- assertFalse(SocketUtil.isPortInUse(22054, 5));
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/StaticWebTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/StaticWebTestCase.java
deleted file mode 100644
index adca550..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/StaticWebTestCase.java
+++ /dev/null
@@ -1,33 +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.core.tests.util;
-
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.tests.impl.TestStaticWeb;
-import org.eclipse.wst.server.core.util.IStaticWeb;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class StaticWebTestCase extends TestCase {
- protected static IStaticWeb web;
-
- public static Test suite() {
- return new OrderedTestSuite(StaticWebTestCase.class, "StaticWebTestCase");
- }
-
- public void test00Create() {
- web = new TestStaticWeb();
- }
-
- public void test01GetContextRoot() {
- assertNull(web.getContextRoot());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/WebResourceTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/WebResourceTestCase.java
deleted file mode 100644
index 755c669..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/WebResourceTestCase.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.wst.server.core.tests.util;
-
-import org.eclipse.wst.server.core.tests.OrderedTestSuite;
-import org.eclipse.wst.server.core.util.WebResource;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class WebResourceTestCase extends TestCase {
- protected static WebResource web;
-
- public static Test suite() {
- return new OrderedTestSuite(WebResourceTestCase.class, "WebResourceTestCase");
- }
-
- public void test00Create() {
- web = new WebResource(null, null);
- }
-
- public void test01GetModule() {
- assertNull(web.getModule());
- }
-
- public void test02GetPath() {
- assertNull(web.getPath());
- }
-
- public void test03ToString() {
- web.toString();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.core.tests/test.xml b/tests/org.eclipse.wst.server.core.tests/test.xml
deleted file mode 100644
index 13a5c48..0000000
--- a/tests/org.eclipse.wst.server.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.server.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.server.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.server.tests.performance/.classpath b/tests/org.eclipse.wst.server.tests.performance/.classpath
deleted file mode 100644
index ce61870..0000000
--- a/tests/org.eclipse.wst.server.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.wst.server.tests.performance/.cvsignore b/tests/org.eclipse.wst.server.tests.performance/.cvsignore
deleted file mode 100644
index c4bda5f..0000000
--- a/tests/org.eclipse.wst.server.tests.performance/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-performance.jar
diff --git a/tests/org.eclipse.wst.server.tests.performance/.project b/tests/org.eclipse.wst.server.tests.performance/.project
deleted file mode 100644
index 6a1412e..0000000
--- a/tests/org.eclipse.wst.server.tests.performance/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.server.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.wst.server.tests.performance/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.server.tests.performance/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8f0773e..0000000
--- a/tests/org.eclipse.wst.server.tests.performance/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,47 +0,0 @@
-#Thu May 26 14:35:16 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.tests.performance/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.server.tests.performance/META-INF/MANIFEST.MF
deleted file mode 100644
index 3dbd7ab..0000000
--- a/tests/org.eclipse.wst.server.tests.performance/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.wst.server.tests.performance
-Bundle-SymbolicName: org.eclipse.wst.server.tests.performance
-Bundle-Version: 1.0.100.qualifier
-Bundle-ClassPath: performance.jar
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.server.tests.performance,
- org.eclipse.wst.server.tests.performance.common
-Require-Bundle: org.junit,
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.test.performance,
- org.eclipse.wst.server.core,
- org.eclipse.wst.server.ui,
- org.eclipse.wst.server.ui.tests
-Eclipse-LazyStart: true
diff --git a/tests/org.eclipse.wst.server.tests.performance/about.html b/tests/org.eclipse.wst.server.tests.performance/about.html
deleted file mode 100644
index 4ec5989..0000000
--- a/tests/org.eclipse.wst.server.tests.performance/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.server.tests.performance/build.properties b/tests/org.eclipse.wst.server.tests.performance/build.properties
deleted file mode 100644
index f8285e8..0000000
--- a/tests/org.eclipse.wst.server.tests.performance/build.properties
+++ /dev/null
@@ -1,16 +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 = performance.jar,\
- test.xml,\
- META-INF/,\
- about.html
-source.performance.jar = performance/
-output.performance.jar = bin/
diff --git a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/AddRemoveModulesWizardTestCase.java b/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/AddRemoveModulesWizardTestCase.java
deleted file mode 100644
index a6b0681..0000000
--- a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/AddRemoveModulesWizardTestCase.java
+++ /dev/null
@@ -1,37 +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.tests.performance;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.PerformanceTestCase;
-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};
- tagAsGlobalSummary("Add/remove modules wizard", dims);
-
- for (int i = 0; i < 15; i++) {
- startMeasuring();
- WizardTestCase.testRoS(null);
- stopMeasuring();
- }
- commitMeasurements();
- assertPerformance();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/AllTests.java b/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/AllTests.java
deleted file mode 100644
index 1c34d2e..0000000
--- a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/AllTests.java
+++ /dev/null
@@ -1,26 +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.tests.performance;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.wst.server.tests.performance");
- //$JUnit-BEGIN$
- suite.addTestSuite(StartupExtensionTestCase.class);
- suite.addTestSuite(ModuleFactoriesExtensionTestCase.class);
- suite.addTestSuite(AddRemoveModulesWizardTestCase.class);
- //$JUnit-END$
- return suite;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/ModuleFactoriesExtensionTestCase.java b/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/ModuleFactoriesExtensionTestCase.java
deleted file mode 100644
index a058e11..0000000
--- a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/ModuleFactoriesExtensionTestCase.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.tests.performance;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.PerformanceTestCase;
-import org.eclipse.wst.server.core.internal.ModuleFactory;
-import org.eclipse.wst.server.core.internal.ServerPlugin;
-
-public class ModuleFactoriesExtensionTestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(ModuleFactoriesExtensionTestCase.class, "ModuleFactoriesExtensionTestCase");
- }
-
- public void testModuleFactoriesExtension() throws Exception {
- Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
- tagAsGlobalSummary("Module Factories", dims);
- startMeasuring();
- ModuleFactory[] factories = ServerPlugin.getModuleFactories();
- if (factories != null) {
- int size = factories.length;
- for (int i = 0; i < size; i++) {
- factories[i].getModules();
- }
- }
- stopMeasuring();
- commitMeasurements();
- assertPerformance();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/StartupExtensionTestCase.java b/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/StartupExtensionTestCase.java
deleted file mode 100644
index be767a9..0000000
--- a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/StartupExtensionTestCase.java
+++ /dev/null
@@ -1,37 +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.tests.performance;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.PerformanceTestCase;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class StartupExtensionTestCase extends PerformanceTestCase {
- public static Test suite() {
- return new TestSuite(StartupExtensionTestCase.class, "StartupExtensionTestCase");
- }
-
- public void testStartupExtension() throws Exception {
- Dimension[] dims = new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP};
- tagAsGlobalSummary("Runtime/Server startup", dims);
- startMeasuring();
- ServerCore.getRuntimes();
- ServerCore.getRuntimeTypes();
- ServerCore.getServers();
- ServerCore.getServerTypes();
- stopMeasuring();
- commitMeasurements();
- assertPerformance();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/common/AbstractGetDelegateTestCase.java b/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/common/AbstractGetDelegateTestCase.java
deleted file mode 100644
index 904bc50..0000000
--- a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/common/AbstractGetDelegateTestCase.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.tests.performance.common;
-
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.model.ServerDelegate;
-
-public abstract class AbstractGetDelegateTestCase extends ServerPerformanceTestCase {
- protected void setUp() throws Exception {
- super.setUp();
- closeIntro();
- }
-
- public void testGetDelegate() throws Exception {
- startMeasuring();
- createRuntime(getRuntimeTypeId(), getRuntimeTypeLocation());
- IServer server = createServer(getServerTypeId());
- server.getAdapter(ServerDelegate.class);
- stopMeasuring();
- commitMeasurements();
- assertPerformance();
- }
-
- protected abstract String getRuntimeTypeId();
- protected abstract String getRuntimeTypeLocation();
- protected abstract String getServerTypeId();
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/common/AbstractOpenEditorTestCase.java b/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/common/AbstractOpenEditorTestCase.java
deleted file mode 100644
index a2a5b89..0000000
--- a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/common/AbstractOpenEditorTestCase.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.tests.performance.common;
-
-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 ServerPerformanceTestCase {
- public final String SERVER_EDITOR_ID = "org.eclipse.wst.server.ui.editor";
-
- public void testOpenEditor() throws Exception {
- startMeasuring();
- IServer server = getFirstServer(getServerTypeId());
- IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- IEditorPart editor = page.openEditor(new ServerEditorInput(server.getId()), SERVER_EDITOR_ID, true);
-
- stopMeasuring();
- commitMeasurements();
- assertPerformance();
- page.closeEditor(editor, false);
- }
-
- protected abstract String getServerTypeId();
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/common/ServerPerformanceTestCase.java b/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/common/ServerPerformanceTestCase.java
deleted file mode 100644
index 1da0863..0000000
--- a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/common/ServerPerformanceTestCase.java
+++ /dev/null
@@ -1,61 +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.tests.performance.common;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.test.performance.PerformanceTestCase;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.intro.IIntroManager;
-import org.eclipse.ui.intro.IIntroPart;
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-
-public abstract class ServerPerformanceTestCase extends PerformanceTestCase {
- protected void closeIntro() {
- IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
- IIntroPart introPart = introManager.getIntro();
- if (introPart != null)
- introManager.closeIntro(introPart);
- }
-
- 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);
- runtimeCopy.save(false, null);
- return runtimeCopy;
- }
-
- protected IServer createServer(String serverTypeId) throws CoreException {
- if (serverTypeId == null)
- throw new IllegalArgumentException();
- NullProgressMonitor monitor = new NullProgressMonitor();
- IServerType serverType = ServerCore.findServerType(serverTypeId);
- IServerWorkingCopy serverCopy = serverType.createServer(serverTypeId, null, monitor);
- return serverCopy.saveAll(false, monitor);
- }
-
- protected IServer getFirstServer(String serverTypeId) {
- IServer[] servers = ServerCore.getServers();
- assertTrue(servers.length > 0);
- IServer server = servers[0];
- assertNotNull(server);
- assertTrue(server.getServerType().getId().equals(serverTypeId));
- return server;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.tests.performance/test.xml b/tests/org.eclipse.wst.server.tests.performance/test.xml
deleted file mode 100644
index c900109..0000000
--- a/tests/org.eclipse.wst.server.tests.performance/test.xml
+++ /dev/null
@@ -1,62 +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.wst.server.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="workspace" value="${eclipse-home}/workspace_server_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.wst.server.tests.performance*.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.wst.server.tests.performance.AllTests"/>
- </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.wst.server.tests.performance*.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.core.resources.prefs b/tests/org.eclipse.wst.server.ui.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index a6bc7fc..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 12:40:49 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
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/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.server.ui.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 08a60e5..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,14 +0,0 @@
-#Sat Apr 22 18:36:14 EDT 2006
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
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 ddf7eff..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.100.qualifier
-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-LazyStart: 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 4ec5989..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.server.ui.tests/build.properties b/tests/org.eclipse.wst.server.ui.tests/build.properties
deleted file mode 100644
index dc4e95e..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/build.properties
+++ /dev/null
@@ -1,17 +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 = 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/plugin.properties b/tests/org.eclipse.wst.server.ui.tests/plugin.properties
deleted file mode 100644
index 3cf99df..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# properties file for org.eclipse.wst.server.ui.tests
-Bundle-Name.0 = org.eclipse.wst.server.ui.tests
-Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
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 ebfe885..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ExistenceTest.java
+++ /dev/null
@@ -1,22 +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.TestCase;
-
-import org.eclipse.wst.server.ui.internal.ServerUIPlugin;
-
-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 1c836f9..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerLaunchConfigurationTabTestCase.java
+++ /dev/null
@@ -1,102 +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.ServerLaunchConfigurationTab;
-
-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 4370594..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerUICoreTestCase.java
+++ /dev/null
@@ -1,23 +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.TestCase;
-
-import org.eclipse.wst.server.ui.ServerUICore;
-
-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 4b0db13..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerUIPreferencesTestCase.java
+++ /dev/null
@@ -1,122 +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_ALWAYS);
- assertEquals(prefs.getSaveEditors(), ServerUIPreferences.SAVE_EDITORS_ALWAYS);
- }
-
- 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 test08SetPref() throws Exception {
- prefs.setLaunchMode(ServerUIPreferences.LAUNCH_MODE_RESTART);
- assertEquals(prefs.getLaunchMode(), ServerUIPreferences.LAUNCH_MODE_RESTART);
- }
-
- public void test09SetPref() throws Exception {
- prefs.setLaunchMode(ServerUIPreferences.LAUNCH_MODE_CONTINUE);
- assertEquals(prefs.getLaunchMode(), ServerUIPreferences.LAUNCH_MODE_CONTINUE);
- }
-
- public void test10SetPref() throws Exception {
- prefs.setLaunchMode(ServerUIPreferences.LAUNCH_MODE_PROMPT);
- assertEquals(prefs.getLaunchMode(), ServerUIPreferences.LAUNCH_MODE_PROMPT);
- }
-
- public void test11SetPref() throws Exception {
- prefs.setLaunchMode2(ServerUIPreferences.LAUNCH_MODE2_RESTART);
- assertEquals(prefs.getLaunchMode2(), ServerUIPreferences.LAUNCH_MODE2_RESTART);
- }
-
- public void test12SetPref() throws Exception {
- prefs.setLaunchMode2(ServerUIPreferences.LAUNCH_MODE2_DISABLE_BREAKPOINTS);
- assertEquals(prefs.getLaunchMode2(), ServerUIPreferences.LAUNCH_MODE2_DISABLE_BREAKPOINTS);
- }
-
- public void test13SetPref() throws Exception {
- prefs.setLaunchMode2(ServerUIPreferences.LAUNCH_MODE2_CONTINUE);
- assertEquals(prefs.getLaunchMode2(), ServerUIPreferences.LAUNCH_MODE2_CONTINUE);
- }
-
- public void test14SetPref() throws Exception {
- prefs.setLaunchMode2(ServerUIPreferences.LAUNCH_MODE2_PROMPT);
- assertEquals(prefs.getLaunchMode2(), ServerUIPreferences.LAUNCH_MODE2_PROMPT);
- }
-
- public void test15SetPref() throws Exception {
- prefs.setEnableBreakpoints(ServerUIPreferences.ENABLE_BREAKPOINTS_ALWAYS);
- assertEquals(prefs.getEnableBreakpoints(), ServerUIPreferences.ENABLE_BREAKPOINTS_ALWAYS);
- }
-
- public void test16SetPref() throws Exception {
- prefs.setEnableBreakpoints(ServerUIPreferences.ENABLE_BREAKPOINTS_NEVER);
- assertEquals(prefs.getEnableBreakpoints(), ServerUIPreferences.ENABLE_BREAKPOINTS_NEVER);
- }
-
- public void test17SetPref() throws Exception {
- prefs.setEnableBreakpoints(ServerUIPreferences.ENABLE_BREAKPOINTS_PROMPT);
- assertEquals(prefs.getEnableBreakpoints(), ServerUIPreferences.ENABLE_BREAKPOINTS_PROMPT);
- }
-
- public void test18DefaultPref() throws Exception {
- prefs.setPromptBeforeIrreversibleChange(prefs.getDefaultPromptBeforeIrreversibleChange());
- assertEquals(prefs.getPromptBeforeIrreversibleChange(), prefs.getDefaultPromptBeforeIrreversibleChange());
- }
-
- public void test19DefaultPref() 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 6a386ba..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/DialogsTestCase.java
+++ /dev/null
@@ -1,37 +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 junit.framework.TestCase;
-
-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;
-
-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 4d9b92c..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: " + 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 ff79594..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/dialog/ViewTestCase.java
+++ /dev/null
@@ -1,26 +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 junit.framework.TestCase;
-
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-
-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 1d56860..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 junit.framework.TestCase;
-
-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;
-
-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 f72d8e2..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 junit.framework.Test;
-import junit.framework.TestCase;
-
-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;
-
-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 709f6c9..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/IServerEditorPartInputTestCase.java
+++ /dev/null
@@ -1,64 +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.editor.IServerEditorPartInput;
-import org.eclipse.wst.server.ui.tests.OrderedTestSuite;
-import org.eclipse.wst.server.ui.tests.impl.TestServerEditorPartInput;
-
-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 8de491e..0000000
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/editor/ServerEditorSectionTestCase.java
+++ /dev/null
@@ -1,67 +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.editor.ServerEditorSection;
-import org.eclipse.wst.server.ui.tests.OrderedTestSuite;
-
-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 f585f58..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 junit.framework.Test;
-import junit.framework.TestCase;
-
-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;
-
-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 d91830a..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 junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.ui.internal.wizard.TaskWizard;
-import org.eclipse.wst.server.ui.tests.OrderedTestSuite;
-
-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 5085f17..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 junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.server.ui.tests.OrderedTestSuite;
-import org.eclipse.wst.server.ui.wizard.WizardFragment;
-
-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>
