1 files changed, 76 insertions, 0 deletions
diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/WebAppProviderTest.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/WebAppProviderTest.java
new file mode 100644
index 0000000000..8fc7cb5930
--- /dev/null
+++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/WebAppProviderTest.java
@@ -0,0 +1,76 @@
+package org.eclipse.jetty.deploy.providers;
+
+import java.io.File;
+
+import org.eclipse.jetty.deploy.test.XmlConfiguredJetty;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class WebAppProviderTest
+{
+    private static XmlConfiguredJetty jetty;
+
+    @BeforeClass
+    public static void setupEnvironment() throws Exception
+    {
+        jetty = new XmlConfiguredJetty();
+        jetty.addConfiguration("jetty.xml");
+        jetty.addConfiguration("jetty-deploy-wars.xml");
+
+        // Setup initial context
+        jetty.copyContext("foo.xml","foo.xml");
+        jetty.copyWebapp("foo-webapp-1.war","foo.war");
+
+        // Should not throw an Exception
+        jetty.load();
+
+        // Start it
+        jetty.start();
+    }
+
+    @AfterClass
+    public static void teardownEnvironment() throws Exception
+    {
+        // Stop jetty.
+        jetty.stop();
+    }
+
+    @Test
+    public void testStartupContext()
+    {
+        // Check Server for Handlers
+        jetty.printHandlers(System.out);
+        jetty.assertWebAppContextsExists("/foo");
+
+        File workDir = jetty.getJettyDir("workish");
+
+        // Test for regressions
+        assertDirNotExists("root of work directory",workDir,"webinf");
+        assertDirNotExists("root of work directory",workDir,"jsp");
+
+        // Test for correct behavior
+        Assert.assertTrue("Should have generated directory in work directory: " + workDir,hasJettyGeneratedPath(workDir,"foo.war"));
+    }
+
+    private static boolean hasJettyGeneratedPath(File basedir, String expectedWarFilename)
+    {
+        for (File path : basedir.listFiles())
+        {
+            if (path.exists() && path.isDirectory() && path.getName().startsWith("Jetty_") && path.getName().contains(expectedWarFilename))
+            {
+                System.out.println("Found expected generated directory: " + path);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static void assertDirNotExists(String msg, File workDir, String subdir)
+    {
+        File dir = new File(workDir,subdir);
+        Assert.assertFalse("Should not have " + subdir + " in " + msg + " - " + workDir,dir.exists());
+    }
+}