Author: markt
Date: Mon Nov 25 22:41:35 2013
New Revision: 1545435
URL: http://svn.apache.org/r1545435
Log:
Backport automatic deployment changes part 9
Add another test
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:r1483288
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=1545435&r1=1545434&r2=1545435&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 22:41:35 2013
@@ -1071,6 +1071,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,
@@ -1234,7 +1240,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: [email protected]
For additional commands, e-mail: [email protected]
