[100070] fix for export to include DD: committed for JL
diff --git a/tests/org.eclipse.jst.j2ee.tests/ejbmodule-tests/org/eclipse/wtp/j2ee/headless/tests/ejb/operations/EJBExportOperationTest.java b/tests/org.eclipse.jst.j2ee.tests/ejbmodule-tests/org/eclipse/wtp/j2ee/headless/tests/ejb/operations/EJBExportOperationTest.java
index 2331dd6..80ca083 100644
--- a/tests/org.eclipse.jst.j2ee.tests/ejbmodule-tests/org/eclipse/wtp/j2ee/headless/tests/ejb/operations/EJBExportOperationTest.java
+++ b/tests/org.eclipse.jst.j2ee.tests/ejbmodule-tests/org/eclipse/wtp/j2ee/headless/tests/ejb/operations/EJBExportOperationTest.java
@@ -9,7 +9,11 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.EJBJarFileImpl;
+import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBComponentExportDataModelProvider;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wtp.headless.tests.savestrategy.EJBImportOperationTest;
@@ -45,6 +49,27 @@
return new EJBImportOperationTest("");
}
+ public void testExport(IVirtualComponent component, String filename) throws Exception {
+ super.testExport(component,filename);
+ //verify ejb dd
+ testDDExported(component);
+ }
+
+ protected void testDDExported(IVirtualComponent component) throws Exception {
+ EJBArtifactEdit ejbEdit = null;
+ try {
+ ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(component);
+ EJBJarFileImpl archive = (EJBJarFileImpl) ejbEdit.asArchive(true);
+ try {
+ Resource res = archive.getDeploymentDescriptorResource();
+ } catch (Exception e) {
+ fail("EJB deployment descriptor is null.");
+ }
+ } finally {
+ if (ejbEdit !=null)
+ ejbEdit.dispose();
+ }
+ }
}
diff --git a/tests/org.eclipse.jst.j2ee.tests/webmodule-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/WebExportOperationTest.java b/tests/org.eclipse.jst.j2ee.tests/webmodule-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/WebExportOperationTest.java
index 36dae6b..a0c94b9 100644
--- a/tests/org.eclipse.jst.j2ee.tests/webmodule-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/WebExportOperationTest.java
+++ b/tests/org.eclipse.jst.j2ee.tests/webmodule-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/WebExportOperationTest.java
@@ -9,7 +9,11 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.WARFileImpl;
import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentExportDataModelProvider;
+import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wtp.headless.tests.savestrategy.ModuleImportOperationTestCase;
@@ -77,5 +81,27 @@
public String getModuleExportFileExt() {
return ".war";
}
+
+ public void testExport(IVirtualComponent component, String filename) throws Exception {
+ super.testExport(component,filename);
+ //verify web dd
+ testDDExported(component);
+ }
+
+ protected void testDDExported(IVirtualComponent component) throws Exception {
+ WebArtifactEdit webEdit = null;
+ try {
+ webEdit = WebArtifactEdit.getWebArtifactEditForRead(component);
+ WARFileImpl archive = (WARFileImpl) webEdit.asArchive(true);
+ try {
+ Resource res = archive.getDeploymentDescriptorResource();
+ } catch (Exception e) {
+ fail("Web deployment descriptor is null.");
+ }
+ } finally {
+ if (webEdit !=null)
+ webEdit.dispose();
+ }
+ }
}
