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/21 14:38:57 UTC
svn commit: r1484780 -
/tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
Author: markt
Date: Tue May 21 12:38:56 2013
New Revision: 1484780
URL: http://svn.apache.org/r1484780
Log:
Enable remaining tests
Fix failures
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=1484780&r1=1484779&r2=1484780&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java Tue May 21 12:38:56 2013
@@ -1504,26 +1504,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);
}
@@ -1538,10 +1545,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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org