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/16 12:14:50 UTC
svn commit: r1483288 -
/tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
Author: markt
Date: Thu May 16 10:14:50 2013
New Revision: 1483288
URL: http://svn.apache.org/r1483288
Log:
Add another test
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=1483288&r1=1483287&r2=1483288&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java Thu May 16 10:14:50 2013
@@ -1034,6 +1034,12 @@ public class TestHostConfigAutomaticDepl
true, false, false, XML_COOKIE_NAME, REDEPLOY);
}
+ @Test
+ public void testModifyXmlDirUpdateDir() throws Exception {
+ doTestModify(true, false, false, false, true, DIR,
+ true, false, true, XML_COOKIE_NAME, NONE);
+ }
+
private void doTestModify(boolean startXml, boolean startExternalWar,
boolean startExternalDir, boolean startWar, boolean startDir,
int toModify, boolean resultXml, boolean resultWar,
@@ -1185,7 +1191,7 @@ public class TestHostConfigAutomaticDepl
Assert.assertNull(newContext);
}
if (!resultWar && !resultDir) {
- if (resultXml) {
+ if (resultXml && !startExternalWar && !startExternalDir) {
Assert.assertEquals(LifecycleState.FAILED, newContext.getState());
} else {
Assert.assertNull(newContext);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org