svn commit: r1545454 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

[markt]

Author: markt
Date: Mon Nov 25 23:24:08 2013
New Revision: 1545454

URL: http://svn.apache.org/r1545454
Log:
Backport automatic deployment changes part 16
Enable remaining tests
Fix failures

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1484780

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java?rev=1545454&r1=1545453&r2=1545454&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
 Mon Nov 25 23:24:08 2013
@@ -1508,26 +1508,33 @@ public class TestHostConfigAutomaticDepl
         doTestUnpackWAR(false, false, true, false);
     }
 
+    @Test
     public void testUnpackWARFTF() throws Exception  {
         doTestUnpackWAR(false, true, false, false);
     }
 
+    @Test
     public void testUnpackWARFTT() throws Exception  {
         doTestUnpackWAR(false, true, true, false);
     }
 
+    @Test
     public void testUnpackWARTFF() throws Exception  {
         doTestUnpackWAR(true, false, false, false);
     }
 
+    @Test
     public void testUnpackWARTFT() throws Exception  {
-        doTestUnpackWAR(true, false, true, false);
+        // External WAR - therefore XML in WAR will be ignored
+        doTestUnpackWAR(true, false, true, true);
     }
 
+    @Test
     public void testUnpackWARTTF() throws Exception  {
         doTestUnpackWAR(true, true, false, true);
     }
 
+    @Test
     public void testUnpackWARTTT() throws Exception  {
         doTestUnpackWAR(true, true, true, true);
     }
@@ -1542,10 +1549,14 @@ public class TestHostConfigAutomaticDepl
 
         tomcat.start();
 
+        File war;
         if (unpackWAR) {
-            createWar(WAR_XML_UNPACKWAR_TRUE_SOURCE, external);
+            war = createWar(WAR_XML_UNPACKWAR_TRUE_SOURCE, !external);
         } else {
-            createWar(WAR_XML_UNPACKWAR_FALSE_SOURCE, external);
+            war = createWar(WAR_XML_UNPACKWAR_FALSE_SOURCE, !external);
+        }
+        if (external) {
+            createXmlInConfigBaseForExternal(war);
         }
 
         host.backgroundProcess();



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