Google Git
Sign in
eclipse/jeetools/webtools.javaee.tests/0c722e227dc7d1d718eca62ce33ccbe6c51b8e41^!/.
commit
0c722e227dc7d1d718eca62ce33ccbe6c51b8e41
[log]
author
cbridgha <cbridgha>
Sun Apr 17 16:58:20 2005 +0000
committer
cbridgha <cbridgha>
Sun Apr 17 16:58:20 2005 +0000
tree
37da026dd97bfc0608c55788a12c219f47b86d70
parent
219d0edd0e15a25765478ee4f57e85c71111ea1b [diff]
[nobug] Fixing tests

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/AbstractJ2EEComponentCreationTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/AbstractJ2EEComponentCreationTest.java
index 08fd298..939829f 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/AbstractJ2EEComponentCreationTest.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/AbstractJ2EEComponentCreationTest.java

@@ -28,11 +28,11 @@
 import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentCreationOperation;
 import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel;
 import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
+import org.eclipse.wst.common.tests.DataModelVerifier;
 import org.eclipse.wst.common.tests.LogUtility;
 import org.eclipse.wst.common.tests.OperationTestCase;
 import org.eclipse.wst.common.tests.ProjectUtility;
 import org.eclipse.wst.common.tests.TaskViewUtility;
-import org.eclipse.wtp.j2ee.headless.tests.j2ee.verifiers.DataModelVerifier;
 import org.eclipse.wtp.j2ee.headless.tests.j2ee.verifiers.DataModelVerifierFactory;
 
 public abstract class AbstractJ2EEComponentCreationTest extends TestCase {

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/ModuleProjectCreationOperationTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/ModuleProjectCreationOperationTest.java
index 7336f04..cd7e018 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/ModuleProjectCreationOperationTest.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/ModuleProjectCreationOperationTest.java

@@ -7,9 +7,12 @@
 import org.eclipse.jst.j2ee.application.internal.operations.FlexibleProjectCreationDataModel;
 import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModel;
 import org.eclipse.jst.j2ee.internal.earcreation.EARComponentCreationDataModel;
+import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
+import org.eclipse.wst.common.tests.DataModelVerifier;
 import org.eclipse.wst.common.tests.OperationTestCase;
 import org.eclipse.wtp.j2ee.headless.tests.appclient.operations.AppClientProjectCreationOperationTest;
 import org.eclipse.wtp.j2ee.headless.tests.ejb.operations.EJBProjectCreationOperationTest;
+import org.eclipse.wtp.j2ee.headless.tests.j2ee.verifiers.DataModelVerifierFactory;
 import org.eclipse.wtp.j2ee.headless.tests.jca.operations.ConnectorProjectCreationOperationTest;
 import org.eclipse.wtp.j2ee.headless.tests.plugin.AllPluginTests;
 import org.eclipse.wtp.j2ee.headless.tests.web.operations.WebProjectCreationOperationTest;
@@ -98,4 +101,9 @@
 
 	public abstract J2EEComponentCreationDataModel getComponentCreationDataModel();
 
+	public static void verifyDataModel(WTPOperationDataModel dataModel) throws Exception{
+	    DataModelVerifier verifier = DataModelVerifierFactory.getInstance().createVerifier(dataModel);
+	    verifier.verify(dataModel);
+	}
+
 }

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/DataModelVerifier.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/DataModelVerifier.java
deleted file mode 100644
index f1e9421..0000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/DataModelVerifier.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*
- * Created on Jan 5, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wtp.j2ee.headless.tests.j2ee.verifiers;
-
-import org.eclipse.jst.j2ee.application.internal.operations.FlexibleProjectCreationDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-import org.eclipse.wst.common.tests.ProjectUtility;
-
-/**
- * @author Administrator
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class DataModelVerifier {
-	
-	/**
-	 * @author Administrator
-	 *
-	 * To change the template for this generated type comment go to
-	 * Window - Preferences - Java - Code Generation - Code and Comments
-	 */
-	public class FlexibleProjectCreationDataModelVerifier extends DataModelVerifier {
-	
-		public void verify(WTPOperationDataModel model) throws Exception {
-			super.verify(model);		
-			ProjectUtility.verifyProject(model.getStringProperty(FlexibleProjectCreationDataModel.PROJECT_NAME), true);
-	
-		}
-	
-	}
-
-	public void verify(WTPOperationDataModel model) throws Exception {
-		
-	}
-
-}

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/DataModelVerifierFactory.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/DataModelVerifierFactory.java
index f8408dc..9829605 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/DataModelVerifierFactory.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/DataModelVerifierFactory.java

@@ -6,7 +6,6 @@
  */
 package org.eclipse.wtp.j2ee.headless.tests.j2ee.verifiers;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import org.eclipse.jst.j2ee.application.internal.operations.AppClientModuleExportDataModel;
@@ -22,11 +21,9 @@
 import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentCreationDataModel;
 import org.eclipse.jst.j2ee.internal.web.archive.operations.WebModuleExportDataModel;
 import org.eclipse.jst.j2ee.internal.web.archive.operations.WebModuleImportDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
 import org.eclipse.wtp.j2ee.headless.tests.ejb.verifiers.EJBExportDataModelVerifier;
 import org.eclipse.wtp.j2ee.headless.tests.ejb.verifiers.EJBImportDataModelVerifier;
 import org.eclipse.wtp.j2ee.headless.tests.ejb.verifiers.EJBProjectCreationDataModelVerifier;
-import org.eclipse.wtp.j2ee.headless.tests.j2ee.verifiers.DataModelVerifier.FlexibleProjectCreationDataModelVerifier;
 import org.eclipse.wtp.j2ee.headless.tests.jca.verifiers.JCAExportDataModelVerifier;
 import org.eclipse.wtp.j2ee.headless.tests.jca.verifiers.JCAImportDataModelVerifier;
 import org.eclipse.wtp.j2ee.headless.tests.web.verifiers.WebExportDataModelVerifier;
@@ -39,67 +36,37 @@
  * To change the template for this generated type comment go to Window - Preferences - Java - Code
  * Generation - Code and Comments
  */
-public class DataModelVerifierFactory {
+public class DataModelVerifierFactory extends org.eclipse.wst.common.tests.DataModelVerifierFactory {
 
-	private Map dataModelVerifiersMap = null;
-	private DataModelVerifier defaultDataModelVerifier = new DataModelVerifier();
-	
-	private static final DataModelVerifierFactory instance = new DataModelVerifierFactory();
-
-	public static DataModelVerifierFactory getInstance() {
-		return instance;
-	}
-
-	public DataModelVerifier createVerifier(WTPOperationDataModel model)  {
-		DataModelVerifier verifier = getDefaultDataModelVerifier();
-		String verifierClassName = null;
-		if (model != null) {
-			verifierClassName = (String) getDataModelVerifiersMap().get(model.getClass().getName());
-			if (verifierClassName != null) {
-				try {
-					Class verifierClass = Class.forName(verifierClassName);
-					verifier = (DataModelVerifier) verifierClass.newInstance();
-				} catch (Exception e) { 
-					verifier = getDefaultDataModelVerifier();
-				}
-			}
-		}  
-		return verifier;
+	public static org.eclipse.wst.common.tests.DataModelVerifierFactory getInstance() {
+		org.eclipse.wst.common.tests.DataModelVerifierFactory fact = org.eclipse.wst.common.tests.DataModelVerifierFactory.getInstance();
+		initJ2EEDataModelVerifiersMap(fact.getDataModelVerifiersMap());
+		return fact;
 	}
 
 	/**
 	 * @return Returns the dataModelVerifiersMap.
 	 */
-	protected Map getDataModelVerifiersMap() {
-		if (dataModelVerifiersMap == null) {
-			dataModelVerifiersMap = new HashMap();
-			dataModelVerifiersMap.put(EJBModuleImportDataModel.class.getName(), EJBImportDataModelVerifier.class.getName());
-			dataModelVerifiersMap.put(ConnectorModuleImportDataModel.class.getName(),JCAImportDataModelVerifier.class.getName());
-			dataModelVerifiersMap.put(WebModuleImportDataModel.class.getName(), WebImportDataModelVerifier.class.getName());
-			dataModelVerifiersMap.put(AppClientModuleImportDataModel.class.getName(), AppClientImportDataModelVerifier.class.getName());
-			
-			dataModelVerifiersMap.put(EJBModuleExportDataModel.class.getName(), EJBExportDataModelVerifier.class.getName());
-			dataModelVerifiersMap.put(JCAExportDataModelVerifier.class.getName(), JCAExportDataModelVerifier.class.getName());
-			dataModelVerifiersMap.put(WebModuleExportDataModel.class.getName(), WebExportDataModelVerifier.class.getName());
-			dataModelVerifiersMap.put(AppClientModuleExportDataModel.class.getName(), AppClientExportDataModelVerifier.class.getName());
-			
-			dataModelVerifiersMap.put(WebComponentCreationDataModel.class.getName(), WebProjectCreationDataModelVerifier.class.getName());
-			dataModelVerifiersMap.put(EARComponentCreationDataModel.class.getName(), EARProjectCreationDataModelVerifier.class.getName());
-			dataModelVerifiersMap.put(EjbComponentCreationDataModel.class.getName(), EJBProjectCreationDataModelVerifier.class.getName());
-			dataModelVerifiersMap.put(AppClientComponentCreationDataModel.class.getName(),AppClientProjectCreationDataModelVerifier.class.getName());
-			
-			dataModelVerifiersMap.put(FlexibleProjectCreationDataModel.class.getName(),FlexibleProjectCreationDataModelVerifier.class.getName());
-			dataModelVerifiersMap.put(FlexibleJavaProjectCreationDataModel.class.getName(),FlexibleProjectCreationDataModelVerifier.class.getName());
-		}
+	protected static void initJ2EEDataModelVerifiersMap(Map verifierMap) {
 		
-		return dataModelVerifiersMap;
-	}
+			verifierMap.put(EJBModuleImportDataModel.class.getName(), EJBImportDataModelVerifier.class.getName());
+			verifierMap.put(ConnectorModuleImportDataModel.class.getName(),JCAImportDataModelVerifier.class.getName());
+			verifierMap.put(WebModuleImportDataModel.class.getName(), WebImportDataModelVerifier.class.getName());
+			verifierMap.put(AppClientModuleImportDataModel.class.getName(), AppClientImportDataModelVerifier.class.getName());
+			
+			verifierMap.put(EJBModuleExportDataModel.class.getName(), EJBExportDataModelVerifier.class.getName());
+			verifierMap.put(JCAExportDataModelVerifier.class.getName(), JCAExportDataModelVerifier.class.getName());
+			verifierMap.put(WebModuleExportDataModel.class.getName(), WebExportDataModelVerifier.class.getName());
+			verifierMap.put(AppClientModuleExportDataModel.class.getName(), AppClientExportDataModelVerifier.class.getName());
+			
+			verifierMap.put(WebComponentCreationDataModel.class.getName(), WebProjectCreationDataModelVerifier.class.getName());
+			verifierMap.put(EARComponentCreationDataModel.class.getName(), EARProjectCreationDataModelVerifier.class.getName());
+			verifierMap.put(EjbComponentCreationDataModel.class.getName(), EJBProjectCreationDataModelVerifier.class.getName());
+			verifierMap.put(AppClientComponentCreationDataModel.class.getName(),AppClientProjectCreationDataModelVerifier.class.getName());
+			
+			verifierMap.put(FlexibleProjectCreationDataModel.class.getName(),FlexibleProjectCreationDataModelVerifier.class.getName());
+			verifierMap.put(FlexibleJavaProjectCreationDataModel.class.getName(),FlexibleProjectCreationDataModelVerifier.class.getName());
 
-	/**
-	 * @return Returns the defaultDataModelVerifier.
-	 */
-	protected DataModelVerifier getDefaultDataModelVerifier() {
-		return defaultDataModelVerifier;
 	}
 
 }

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/FlexibleProjectCreationDataModelVerifier.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/FlexibleProjectCreationDataModelVerifier.java
new file mode 100644
index 0000000..307c662
--- /dev/null
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/FlexibleProjectCreationDataModelVerifier.java

@@ -0,0 +1,19 @@
+package org.eclipse.wtp.j2ee.headless.tests.j2ee.verifiers;
+
+import org.eclipse.jst.j2ee.application.internal.operations.FlexibleProjectCreationDataModel;
+import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
+import org.eclipse.wst.common.tests.DataModelVerifier;
+import org.eclipse.wst.common.tests.ProjectUtility;
+
+public class FlexibleProjectCreationDataModelVerifier extends DataModelVerifier {
+
+		
+	public void verify(WTPOperationDataModel model) throws Exception {
+		super.verify(model);		
+		ProjectUtility.verifyProject(model.getStringProperty(FlexibleProjectCreationDataModel.PROJECT_NAME), true);
+
+	}
+
+		
+
+}

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/J2EEExportDataModelVerifier.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/J2EEExportDataModelVerifier.java
index fd5e39a..6b7ed44 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/J2EEExportDataModelVerifier.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/J2EEExportDataModelVerifier.java

@@ -12,6 +12,7 @@
 
 import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleExportDataModel;
 import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
+import org.eclipse.wst.common.tests.DataModelVerifier;
 
 /**
  * @author Administrator

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/J2EEImportDataModelVerifier.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/J2EEImportDataModelVerifier.java
index ee28b95..9a508a1 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/J2EEImportDataModelVerifier.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/J2EEImportDataModelVerifier.java

@@ -11,6 +11,7 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleImportDataModel;
 import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
+import org.eclipse.wst.common.tests.DataModelVerifier;
 import org.eclipse.wst.common.tests.ProjectUtility;
 import org.eclipse.wst.server.core.IRuntime;
 import org.eclipse.wst.server.core.ServerCore;

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/J2EEProjectCreationDataModelVerifier.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/J2EEProjectCreationDataModelVerifier.java
index 08c12a2..43314eb 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/J2EEProjectCreationDataModelVerifier.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/J2EEProjectCreationDataModelVerifier.java

@@ -8,6 +8,7 @@
 
 import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModel;
 import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
+import org.eclipse.wst.common.tests.DataModelVerifier;
 import org.eclipse.wst.common.tests.ProjectUtility;
 
 /**

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/plugin/AllPluginTests.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/plugin/AllPluginTests.java
index 9fab93b..8920392 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/plugin/AllPluginTests.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/plugin/AllPluginTests.java

@@ -10,6 +10,7 @@
 import junit.framework.TestSuite;
 
 import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.common.tests.DataModelVerifierFactory;
 import org.eclipse.wst.server.core.IRuntime;
 import org.eclipse.wst.server.core.IRuntimeType;
 import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
@@ -31,6 +32,7 @@
 
     public AllPluginTests() {
         super();
+		org.eclipse.wtp.j2ee.headless.tests.j2ee.verifiers.DataModelVerifierFactory.getInstance();
 	      addTest(org.eclipse.wtp.j2ee.headless.tests.ejb.operations.AllTests.suite());
 	      addTest(org.eclipse.wtp.j2ee.headless.tests.web.operations.AllTests.suite());
 	      addTest(org.eclipse.wtp.j2ee.headless.tests.jca.operations.AllTests.suite());

diff --git a/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tomcat/tests/WebProjectCreationTomcatTest.java b/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tomcat/tests/WebProjectCreationTomcatTest.java
index 9e01bc1..11ae6e0 100644
--- a/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tomcat/tests/WebProjectCreationTomcatTest.java
+++ b/tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tomcat/tests/WebProjectCreationTomcatTest.java

@@ -14,13 +14,12 @@
 import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
 import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentCreationDataModel;
 import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentCreationOperation;
-import org.eclipse.jst.j2ee.internal.web.operations.AddServletOperation;
 import org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModel;
+import org.eclipse.wst.common.tests.DataModelVerifier;
 import org.eclipse.wst.common.tests.LogUtility;
 import org.eclipse.wst.common.tests.ProjectUtility;
 import org.eclipse.wst.common.tests.SimpleTestSuite;
 import org.eclipse.wst.common.tests.TaskViewUtility;
-import org.eclipse.wtp.j2ee.headless.tests.j2ee.verifiers.DataModelVerifier;
 import org.eclipse.wtp.j2ee.headless.tests.j2ee.verifiers.DataModelVerifierFactory;
 
 /**