This commit was manufactured by cvs2svn to create tag 'v20050419'.
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ClasspathRuntimeTargetHandlerTestCase.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ClasspathRuntimeTargetHandlerTestCase.java
index 57fbc00..89f588d 100644
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ClasspathRuntimeTargetHandlerTestCase.java
+++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/ClasspathRuntimeTargetHandlerTestCase.java
@@ -53,10 +53,6 @@
public void test07RemoveRuntimeTarget() {
handler.removeRuntimeTarget(null, null, null);
}
-
- public void test08ResolveList() {
- ((TestClasspathRuntimeTargetHandler) handler).testResolveList();
- }
public void test09GetDelegateClasspathEntries() {
handler.getDelegateClasspathEntries(null, null);
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
index b53556f..8145c24 100644
--- 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
@@ -12,7 +12,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.server.core.GenericRuntimeUtil;
+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.*;
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestClasspathRuntimeTargetHandler.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestClasspathRuntimeTargetHandler.java
index ceb752f..a951236 100644
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestClasspathRuntimeTargetHandler.java
+++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/impl/TestClasspathRuntimeTargetHandler.java
@@ -11,8 +11,6 @@
package org.eclipse.jst.server.core.tests.impl;
import java.util.*;
-import java.io.File;
-import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jst.server.core.ClasspathRuntimeTargetHandler;
import org.eclipse.wst.server.core.IRuntime;
@@ -31,17 +29,9 @@
public void testAddMethods() {
List list = new ArrayList();
try {
- addJarFiles(null, list, false);
addLibraryEntries(list, null, false);
- addLibraryEntry(list, (File) null);
- addLibraryEntry(list, (IPath) null);
- addLibraryEntry(list, null, null, null);
} catch (Exception e) {
// ignore
}
}
-
- public void testResolveList() {
- resolveList(null);
- }
}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerCreationTest.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerCreationTest.java
index c8fdbb0..348fec7 100644
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerCreationTest.java
+++ b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerCreationTest.java
@@ -158,12 +158,7 @@
IRuntimeType listWeb[] = ServerUtil.getRuntimeTypes("j2ee.web", null);
assertNotNull(listWeb);
- boolean found = false;
- for (int i = 0; i < listWeb.length; i++) {
- IRuntimeType runtimeType = listWeb[i];
- if ("J2EE Runtime Library".equals(runtimeType.getName()))
- found = true;
- }
+ boolean found = listWeb.length>0;
assertTrue(found);
}
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerTypeDefinitionModelTest.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerTypeDefinitionModelTest.java
index 0409f74..ce66d1c 100644
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerTypeDefinitionModelTest.java
+++ b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerTypeDefinitionModelTest.java
@@ -1,5 +1,8 @@
package org.eclipse.jst.server.generic.tests;
+import java.util.HashMap;
+import java.util.Map;
+
import org.eclipse.jst.server.generic.core.internal.CorePlugin;
import org.eclipse.jst.server.generic.servertype.definition.ArchiveType;
import org.eclipse.jst.server.generic.servertype.definition.Classpath;
@@ -13,6 +16,7 @@
import org.eclipse.jst.server.generic.servertype.definition.Publisher;
import org.eclipse.jst.server.generic.servertype.definition.PublisherData;
import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
+import org.eclipse.jst.server.generic.servertype.definition.ServerTypeFactory;
import junit.framework.TestCase;
@@ -28,9 +32,27 @@
}
}
- public void testServerRuntime()
- {
+
+ public void testServerTypeFactory(){
+ ServerTypeFactory factory = ServerTypeFactory.eINSTANCE;
+ assertNotNull(factory.createArchiveType());
+ assertNotNull(factory.createClasspath());
+ assertNotNull(factory.createJndiConnection());
+ assertNotNull(factory.createJndiProperty());
+ assertNotNull(factory.createLaunchConfiguration());
+ assertNotNull(factory.createModule());
+ assertNotNull(factory.createPort());
+ assertNotNull(factory.createProject());
+ assertNotNull(factory.createProperty());
+ assertNotNull(factory.createPublisher());
+ assertNotNull(factory.createPublisherData());
+ assertNotNull(factory.createServerRuntime());
+ assertNotNull(factory.getServerTypePackage());
+
+ }
+ public void testServerRuntime(){
assertTrue(subject.getClasspath()!=null && subject.getClasspath().size()>0);
+ assertTrue(subject.getConfigurationElementNamespace()!=null && subject.getConfigurationElementNamespace().length()>0);
assertTrue(subject.getName()!= null && subject.getName().length()>0);
assertTrue(subject.getVersion()!=null && subject.getVersion().length()>0);
assertTrue(subject.getProperty()!=null && subject.getProperty().size()>0);
@@ -45,15 +67,30 @@
assertEquals(cp,subject.getClasspath(cp.getId()));
Module module = (Module)subject.getModule().get(0);
assertEquals(module,subject.getModule(module.getType()));
+ assertNotNull(subject.getPublisher("org.eclipse.jst.server.generic.antpublisher"));
}
+ public void testSetServerRuntime()
+ {
+ subject.setId(TESTED_SERVER_ID);
+ subject.setConfigurationElementNamespace("test.namespace");
+ subject.setFilename("test.filename");
+ Map testMap =new HashMap();
+ subject.setPropertyValues(testMap);
+ assertEquals(TESTED_SERVER_ID,subject.getId());
+ assertEquals("test.namespace",subject.getConfigurationElementNamespace());
+ assertEquals("test.filename",subject.getFilename());
+ }
+
public void testClasspath()
{
Classpath cp =(Classpath)subject.getClasspath().get(0);
assertTrue(cp.getId()!=null && cp.getId().length()>0);
assertTrue(cp.getArchive()!=null && cp.getArchive().size()>0);
- ArchiveType archiveType = (ArchiveType)cp.getArchive().get(0);
+ assertTrue((cp.isIsLibrary()==true || cp.isIsLibrary()==false));
+ ArchiveType archiveType = (ArchiveType)cp.getArchive().get(0);
assertTrue(archiveType.getPath()!=null && archiveType.getPath().length()>0);
+
}
public void testLaunchConfiguration()
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
index 34a34a1..593780e 100644
--- 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
@@ -3,6 +3,7 @@
Bundle-Name: org.eclipse.jst.server.tomcat.core.tests
Bundle-SymbolicName: org.eclipse.jst.server.tomcat.core.tests
Bundle-Version: 1.0.0
+Bundle-ClassPath: tests.jar
Bundle-Activator: org.eclipse.jst.server.tomcat.core.tests.TestsPlugin
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/build.properties b/tests/org.eclipse.jst.server.tomcat.core.tests/build.properties
index 428f675..e3917e5 100644
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/build.properties
+++ b/tests/org.eclipse.jst.server.tomcat.core.tests/build.properties
@@ -10,8 +10,9 @@
###############################################################################
bin.includes = plugin.xml,\
test.xml,\
- .,\
+ tests.jar,\
META-INF/
src.includes = build.properties
-source.. = src/
-output.. = bin/
+jars.compile.order = tests.jar
+source.tests.jar = src/
+output.tests.jar = bin/
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
index b2f199a..47885f1 100644
--- 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
@@ -3,6 +3,7 @@
Bundle-Name: Server Tomcat Performance Plug-in
Bundle-SymbolicName: org.eclipse.jst.server.tomcat.tests.performance
Bundle-Version: 1.0.0
+Bundle-ClassPath: performance.jar
Bundle-Activator: org.eclipse.jst.server.tomcat.tests.performance.PerformancePlugin
Bundle-Localization: plugin
Export-Package: org.eclipse.jst.server.tomcat.tests.performance,
diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/build.properties b/tests/org.eclipse.jst.server.tomcat.tests.performance/build.properties
index c09862c..5ea3b41 100644
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/build.properties
+++ b/tests/org.eclipse.jst.server.tomcat.tests.performance/build.properties
@@ -8,10 +8,10 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-bin.includes = .,\
+bin.includes = performance.jar,\
plugin.xml,\
test.xml,\
META-INF/
-source.. = performance/
-output.. = bin/
+source.performance.jar = performance/
+output.performance.jar = bin/
src.includes = build.properties
\ No newline at end of file
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
index 7c9260c..1b730c9 100644
--- 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
@@ -3,6 +3,7 @@
Bundle-Name: org.eclipse.jst.server.tomcat.ui.tests
Bundle-SymbolicName: org.eclipse.jst.server.tomcat.ui.tests
Bundle-Version: 1.0.0
+Bundle-ClassPath: tests.jar
Bundle-Activator: org.eclipse.jst.server.tomcat.ui.tests.TestsPlugin
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
diff --git a/tests/org.eclipse.jst.server.tomcat.ui.tests/build.properties b/tests/org.eclipse.jst.server.tomcat.ui.tests/build.properties
index 548403b..cfb39f7 100644
--- a/tests/org.eclipse.jst.server.tomcat.ui.tests/build.properties
+++ b/tests/org.eclipse.jst.server.tomcat.ui.tests/build.properties
@@ -10,8 +10,9 @@
###############################################################################
bin.includes = plugin.xml,\
test.xml,\
- .,\
+ tests.jar,\
META-INF/
src.includes = build.properties
-source.. = src/
-output.. = bin/
\ No newline at end of file
+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.wst.internet.monitor.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.internet.monitor.core.tests/META-INF/MANIFEST.MF
index 4311c63..3fc3085 100644
--- 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
@@ -3,6 +3,7 @@
Bundle-Name: org.eclipse.wst.internet.monitor.core.tests
Bundle-SymbolicName: org.eclipse.wst.internet.monitor.core.tests
Bundle-Version: 1.0.0
+Bundle-ClassPath: monitortests.jar
Bundle-Activator: org.eclipse.wst.internet.monitor.core.tests.TestsPlugin
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/build.properties b/tests/org.eclipse.wst.internet.monitor.core.tests/build.properties
index 269c95d..8b9fc0f 100644
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/build.properties
+++ b/tests/org.eclipse.wst.internet.monitor.core.tests/build.properties
@@ -10,9 +10,10 @@
###############################################################################
bin.includes = plugin.xml,\
test.xml,\
- .,\
+ monitortests.jar,\
META-INF/
src.includes = test.xml,\
build.properties
-source.. = src/
-output.. = bin/
+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/ContentFilterTestCase.java b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/ContentFilterTestCase.java
index 819c9f1..1fcd9c6 100644
--- 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
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.wst.internet.monitor.core.tests;
-import org.eclipse.wst.internet.monitor.core.ContentFilterDelegate;
+import org.eclipse.wst.internet.monitor.core.internal.provisional.ContentFilterDelegate;
import junit.framework.Test;
import junit.framework.TestCase;
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
index 9025fca..72280bd 100644
--- 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
@@ -11,8 +11,8 @@
package org.eclipse.wst.internet.monitor.core.tests;
import java.io.IOException;
-import org.eclipse.wst.internet.monitor.core.ContentFilterDelegate;
import org.eclipse.wst.internet.monitor.core.Request;
+import org.eclipse.wst.internet.monitor.core.internal.provisional.ContentFilterDelegate;
public class TestContentFilterDelegate extends ContentFilterDelegate{
public byte[] filter(Request request, boolean isRequest, byte[] content) throws IOException {
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
index 51a60e4..998a358 100644
--- 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
@@ -3,6 +3,7 @@
Bundle-Name: org.eclipse.wst.internet.monitor.ui.tests
Bundle-SymbolicName: org.eclipse.wst.internet.monitor.ui.tests
Bundle-Version: 1.0.0
+Bundle-ClassPath: monitortests.jar
Bundle-Activator: org.eclipse.wst.internet.monitor.ui.tests.TestsPlugin
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/build.properties b/tests/org.eclipse.wst.internet.monitor.ui.tests/build.properties
index 269c95d..8b9fc0f 100644
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/build.properties
+++ b/tests/org.eclipse.wst.internet.monitor.ui.tests/build.properties
@@ -10,9 +10,10 @@
###############################################################################
bin.includes = plugin.xml,\
test.xml,\
- .,\
+ monitortests.jar,\
META-INF/
src.includes = test.xml,\
build.properties
-source.. = src/
-output.. = bin/
+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/MonitorUICoreTest.java b/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/MonitorUICoreTest.java
index a845278..7a36160 100644
--- 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
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.wst.internet.monitor.ui.tests;
-import org.eclipse.wst.internet.monitor.ui.MonitorUICore;
+import org.eclipse.wst.internet.monitor.ui.internal.provisional.MonitorUICore;
import junit.framework.TestCase;
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
index 777b770..d7c76a0 100644
--- 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
@@ -33,6 +33,9 @@
import org.eclipse.wst.server.core.tests.model.*;
import org.eclipse.wst.server.core.tests.util.HTTPLaunchableTestCase;
import org.eclipse.wst.server.core.tests.util.NullModuleArtifactTestCase;
+import org.eclipse.wst.server.core.tests.util.PingThreadTestCase;
+import org.eclipse.wst.server.core.tests.util.ProjectModuleFactoryDelegateTestCase;
+import org.eclipse.wst.server.core.tests.util.ProjectModuleTestCase;
import org.eclipse.wst.server.core.tests.util.SocketUtilTestCase;
import org.eclipse.wst.server.core.tests.util.StaticWebTestCase;
import org.eclipse.wst.server.core.tests.util.TaskTestCase;
@@ -92,6 +95,15 @@
suite.addTest(new OrderedTestSuite(ModuleResourceDeltaVisitorTestCase.class));
suite.addTest(new OrderedTestSuite(ModuleArtifactAdapterDelegateTestCase.class));
suite.addTest(new OrderedTestSuite(LaunchableAdapterDelegateTestCase.class));
+ suite.addTest(new OrderedTestSuite(ModuleFactoryListenerTestCase.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(PingThreadTestCase.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));
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
index 809c2b5..a632c3f 100644
--- 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
@@ -13,7 +13,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IModuleType;
-import org.eclipse.wst.server.core.model.IModuleListener;
+import org.eclipse.wst.server.core.internal.IModuleListener;
import junit.framework.TestCase;
@@ -55,8 +55,6 @@
module.getName();
module.getModuleType();
module.getProject();
- module.addModuleListener(null);
- module.removeModuleListener(null);
module.getAdapter(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
index 5bcd2b7..4d93542 100644
--- 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
@@ -18,7 +18,6 @@
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.wst.server.core.*;
-import org.eclipse.wst.server.core.util.ServerEvent;
import junit.framework.Test;
import junit.framework.TestCase;
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
index eb26d9b..29314b4 100644
--- 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
@@ -11,7 +11,7 @@
package org.eclipse.wst.server.core.tests;
import org.eclipse.wst.server.core.IServerListener;
-import org.eclipse.wst.server.core.util.ServerEvent;
+import org.eclipse.wst.server.core.ServerEvent;
import junit.framework.TestCase;
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
index 51b3a67..b40c87b 100644
--- 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
@@ -143,6 +143,11 @@
runtimeWC.setReadOnly(false);
}
+ public void test0019SetStub() {
+ runtimeWC.setStub(true);
+ runtimeWC.setStub(false);
+ }
+
public void test0019IsDirty() {
assertTrue(runtimeWC.isDirty());
}
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
new file mode 100644
index 0000000..0243ec7
--- /dev/null
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleFactoryDelegate.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * 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 {
+ 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/TestModuleFactoryListener.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleFactoryListener.java
new file mode 100644
index 0000000..b662d76
--- /dev/null
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleFactoryListener.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * 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.IModuleFactoryListener;
+import org.eclipse.wst.server.core.internal.ModuleFactoryEvent;
+
+public class TestModuleFactoryListener implements IModuleFactoryListener {
+ public void moduleFactoryChanged(ModuleFactoryEvent event) {
+ // 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/TestModuleListener.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleListener.java
new file mode 100644
index 0000000..c1557b4
--- /dev/null
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestModuleListener.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * 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/TestProjectModule.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestProjectModule.java
new file mode 100644
index 0000000..796fb3c
--- /dev/null
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestProjectModule.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * 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.util.ProjectModule;
+
+public class TestProjectModule extends ProjectModule {
+ public TestProjectModule() {
+ super();
+ }
+
+ public TestProjectModule(IProject project) {
+ super(project);
+ }
+
+ public void testProtected() throws Exception {
+ try {
+ getModuleResources(null, null);
+ } catch (Exception e) {
+ // ignore
+ }
+ try {
+ fireModuleChangeEvent(false, null, null, null);
+ } catch (Exception e) {
+ // ignore
+ }
+ update();
+ }
+}
\ 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
new file mode 100644
index 0000000..f392e04
--- /dev/null
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestProjectModuleFactoryDelegate.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * 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 {
+ addListener();
+ fireEvents();
+ fireGlobalEvents();
+ cacheModules();
+ createModules(null);
+ getListenerPaths();
+ isValidModule(null);
+ }
+
+ protected boolean isValidModule(IProject project) {
+ return false;
+ }
+
+ protected IModule[] createModules(IProject project) {
+ return null;
+ }
+
+ public ModuleDelegate getModuleDelegate(IModule module) {
+ return null;
+ }
+
+ public IModule[] getModules() {
+ 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/TestServerLocatorDelegate.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/impl/TestServerLocatorDelegate.java
index d3c3d75..efb8ce6 100644
--- 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
@@ -11,7 +11,7 @@
package org.eclipse.wst.server.core.tests.impl;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.server.core.model.ServerLocatorDelegate;
+import org.eclipse.wst.server.core.internal.provisional.ServerLocatorDelegate;
public class TestServerLocatorDelegate extends ServerLocatorDelegate {
public void searchForServers(String host, IServerSearchListener listener, IProgressMonitor monitor) {
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
new file mode 100644
index 0000000..855293f
--- /dev/null
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleEventTestCase.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * 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
new file mode 100644
index 0000000..2483743
--- /dev/null
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFactoryDelegateTestCase.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * 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 test01Initialize() {
+ delegate.initialize(null);
+ }
+
+ public void test02CreateModule() {
+ delegate.createModule(null, null, null, null, null);
+ }
+
+ 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
new file mode 100644
index 0000000..c9d186f
--- /dev/null
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFactoryEventTestCase.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * 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/ModuleFactoryListenerTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFactoryListenerTestCase.java
new file mode 100644
index 0000000..fe23015
--- /dev/null
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleFactoryListenerTestCase.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * 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.IModuleFactoryListener;
+import org.eclipse.wst.server.core.tests.OrderedTestSuite;
+import org.eclipse.wst.server.core.tests.impl.TestModuleFactoryListener;
+
+public class ModuleFactoryListenerTestCase extends TestCase {
+ protected static IModuleFactoryListener listener;
+
+ public static Test suite() {
+ return new OrderedTestSuite(ModuleFactoryListenerTestCase.class, "ModuleFactoryListenerTestCase");
+ }
+
+ public void test00CreateListener() throws Exception {
+ listener = new TestModuleFactoryListener();
+ }
+
+ public void test01ModuleFactoryChanged() throws Exception {
+ listener.moduleFactoryChanged(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/ModuleListenerTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleListenerTestCase.java
new file mode 100644
index 0000000..332008c
--- /dev/null
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ModuleListenerTestCase.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * 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/ServerBehaviourDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerBehaviourDelegateTestCase.java
index 79bad48..4a3c77a 100644
--- 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
@@ -129,4 +129,12 @@
public void test24GetTempDirectory() {
delegate.getTempDirectory();
}
+
+ public void test25SetServerStatus() {
+ delegate.setServerStatus(null);
+ }
+
+ public void test26SetModuleStatus() {
+ delegate.setModuleStatus(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/ServerLocatorDelegateTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/model/ServerLocatorDelegateTestCase.java
index a7d8db0..67895fc 100644
--- 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
@@ -14,7 +14,7 @@
import junit.framework.TestCase;
import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.model.ServerLocatorDelegate;
+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;
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/PingThreadTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/PingThreadTestCase.java
new file mode 100644
index 0000000..e58d88a
--- /dev/null
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/PingThreadTestCase.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * 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.PingThread;
+import junit.framework.Test;
+import junit.framework.TestCase;
+
+public class PingThreadTestCase extends TestCase {
+ protected static PingThread ping;
+
+ public static Test suite() {
+ return new OrderedTestSuite(PingThreadTestCase.class, "PingThreadTestCase");
+ }
+
+ public void test00Create() {
+ ping = new PingThread(null, null, null, 10);
+ }
+
+ public void test01Create() {
+ ping.stopPinging();
+ }
+}
\ 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
new file mode 100644
index 0000000..0170d41
--- /dev/null
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/ProjectModuleFactoryDelegateTestCase.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * 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 test01Initialize() {
+ delegate.initialize(null);
+ }
+
+ public void test02CreateModule() {
+ delegate.createModule(null, null, null, null, null);
+ }
+
+ public void test03GetModuleDelegate() {
+ delegate.getModuleDelegate(null);
+ }
+
+ public void test04GetModules() {
+ delegate.getModules();
+ }
+
+ public void test05GetModules() {
+ delegate.getModules(null);
+ }
+
+ 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
new file mode 100644
index 0000000..b0aff2d
--- /dev/null
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/util/ProjectModuleTestCase.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * 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 test03GetRootFolder() {
+ pm.getRootFolder();
+ }
+
+ 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();
+ }
+
+ public void test11TestProtected() throws Exception {
+ ((TestProjectModule)pm).testProtected();
+ }
+}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.server.tests.performance/build.properties b/tests/org.eclipse.wst.server.tests.performance/build.properties
index d90b6f7..33aff60 100644
--- a/tests/org.eclipse.wst.server.tests.performance/build.properties
+++ b/tests/org.eclipse.wst.server.tests.performance/build.properties
@@ -9,7 +9,6 @@
# IBM Corporation - initial API and implementation
###############################################################################
bin.includes = performance.jar,\
- performancesrc.zip,\
plugin.xml,\
test.xml,\
META-INF/
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
index 7348be3..b797f46 100644
--- 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
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.wst.server.ui.tests.editor;
-import org.eclipse.wst.server.ui.editor.IOrdered;
+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;
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
index f26c8d7..955ad10 100644
--- 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
@@ -13,7 +13,7 @@
import junit.framework.Test;
import junit.framework.TestCase;
-import org.eclipse.wst.server.ui.editor.ServerEditorActionFactoryDelegate;
+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;
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
index 1306168..121a569 100644
--- 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
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.wst.server.ui.tests.impl;
-import org.eclipse.wst.server.ui.editor.IOrdered;
+import org.eclipse.wst.server.ui.internal.editor.IOrdered;
public class TestOrdered implements IOrdered {
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
index 83e3583..0dfeb6f 100644
--- 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
@@ -13,7 +13,7 @@
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.editor.ServerEditorActionFactoryDelegate;
+import org.eclipse.wst.server.ui.internal.provisional.ServerEditorActionFactoryDelegate;
public class TestServerEditorActionFactoryDelegate extends ServerEditorActionFactoryDelegate {
diff --git a/tests/org.eclipse.wst.server.util.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.server.util.tests/META-INF/MANIFEST.MF
index 4bd4a5a..a3b3a5f 100644
--- a/tests/org.eclipse.wst.server.util.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.server.util.tests/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@
Bundle-Version: 1.0.0
Bundle-ClassPath: tests.jar
Bundle-Activator: org.eclipse.wst.server.util.tests.TestsPlugin
-Bundle-Vendor: IBM
+Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
Export-Package: org.eclipse.wst.server.util.tests,
org.eclipse.wst.server.util.tests.dialog
