Attachment 182968 Details for Bug 329979 – Integration test for supplying web.xml in a fragment

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Integration test for supplying web.xml in a fragment

IntegrationTest.patch (text/plain), 2.81 KB, created by Violeta Georgieva

on 2010-11-12 04:16:22 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Violeta Georgieva

Created: 2010-11-12 04:16:22 EST

Size: 2.81 KB

patch

obsolete

>diff --git a/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java b/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
>index 0c2587a..fe172bf 100644
>--- a/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
>+++ b/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
>@@ -86,6 +86,10 @@ public class TomcatServletContainerTests {
>     private static final String LOCATION_WAR_WITH_CONTEXT_XML_CROSS_CONTEXT = LOCATION_PREFIX
>         + "../org.eclipse.gemini.web.test/src/test/resources/war-with-context-xml-cross-context.war?Web-ContextPath=/war-with-context-xml-cross-context";
> 
>+    private static final String LOCATION_WAR_WITH_WEB_XML_FROM_FRAGMENT = "file:../org.eclipse.gemini.web.test/src/test/resources/war-with-web-xml-from-fragment.war";
>+
>+    private static final String LOCATION_FRAGMENT_PROVIDES_WEB_XML = "file:../org.eclipse.gemini.web.test/src/test/resources/fragment-provides-web-xml.jar";
>+
>     private BundleContext bundleContext;
> 
>     private ServletContainer container;
>@@ -444,6 +448,24 @@ public class TomcatServletContainerTests {
>         }
>     }
> 
>+    @Test
>+    public void testWarWithWebXmlFromFragment() throws Exception {
>+        Bundle bundle = this.bundleContext.installBundle(LOCATION_WAR_WITH_WEB_XML_FROM_FRAGMENT);
>+        Bundle fragment = this.bundleContext.installBundle(LOCATION_FRAGMENT_PROVIDES_WEB_XML);
>+
>+        bundle.start();
>+
>+        WebApplicationHandle handle = this.container.createWebApplication("/war-with-web-xml-from-fragment", bundle);
>+        this.container.startWebApplication(handle);
>+        try {
>+            validateURL("http://localhost:8080/war-with-web-xml-from-fragment");
>+        } finally {
>+            this.container.stopWebApplication(handle);
>+            bundle.uninstall();
>+            fragment.uninstall();
>+        }
>+    }
>+
>     private void createFileWithContent(File file, String content) throws Exception {
>         file.getParentFile().mkdirs();
>         FileWriter fWriter = null;
>diff --git a/org.eclipse.gemini.web.test/src/test/resources/fragment-provides-web-xml.jar b/org.eclipse.gemini.web.test/src/test/resources/fragment-provides-web-xml.jar
>new file mode 100755
>index 0000000..63374eb
>Binary files /dev/null and b/org.eclipse.gemini.web.test/src/test/resources/fragment-provides-web-xml.jar differ
>diff --git a/org.eclipse.gemini.web.test/src/test/resources/war-with-web-xml-from-fragment.war b/org.eclipse.gemini.web.test/src/test/resources/war-with-web-xml-from-fragment.war
>new file mode 100755
>index 0000000..c5a2b51
>Binary files /dev/null and b/org.eclipse.gemini.web.test/src/test/resources/war-with-web-xml-from-fragment.war differ

Actions: View | Diff

Attachments on bug 329979: 182968 | 183453