You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/05/15 16:06:50 UTC

svn commit: r1482854 - /tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

Author: markt
Date: Wed May 15 14:06:50 2013
New Revision: 1482854

URL: http://svn.apache.org/r1482854
Log:
Complete the deletion tests

Modified:
    tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

Modified: tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java?rev=1482854&r1=1482853&r2=1482854&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java Wed May 15 14:06:50 2013
@@ -775,6 +775,36 @@ public class TestHostConfigAutomaticDepl
                 null);
     }
 
+    @Test
+    public void testDeleteXmlWarRemoveWar() throws Exception {
+        doTestDelete(true, false, false, true, false, WAR, true, false, false,
+                XML_COOKIE_NAME);
+    }
+
+    @Test
+    public void testDeleteXmlWarRemoveXml() throws Exception {
+        doTestDelete(true, false, false, true, false, XML, false, false, false,
+                null);
+    }
+
+    @Test
+    public void testDeleteXmlWarDirRemoveDir() throws Exception {
+        doTestDelete(true, false, false, true, true, DIR, true, true, true,
+                XML_COOKIE_NAME);
+    }
+
+    @Test
+    public void testDeleteXmlWarDirRemoveWar() throws Exception {
+        doTestDelete(true, false, false, true, true, WAR, true, false, false,
+                XML_COOKIE_NAME);
+    }
+
+    @Test
+    public void testDeleteXmlWarDirRemoveXml() throws Exception {
+        doTestDelete(true, false, false, true, true, XML, false, false, false,
+                null);
+    }
+
     private void doTestDelete(boolean startXml, boolean startExternalWar,
             boolean startExternalDir, boolean startWar, boolean startDir,
             int toDelete, boolean resultXml, boolean resultWar,



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org