Author: markt
Date: Thu May 16 20:40:02 2013
New Revision: 1483554
URL: http://svn.apache.org/r1483554
Log:
Remaining tests for modification
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=1483554&r1=1483553&r2=1483554&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/startup/TestHostConfigAutomaticDeployment.java
Thu May 16 20:40:02 2013
@@ -1096,6 +1096,66 @@ public class TestHostConfigAutomaticDepl
true, false, false, XML_COOKIE_NAME, NONE);
}
+ @Test
+ public void testModifyXmlExtwarUpdateXml() throws Exception {
+ doTestModify(true, true, false, false, false, XML,
+ true, false, false, XML_COOKIE_NAME, REDEPLOY);
+ }
+
+ @Test
+ public void testModifyXmlExtdirUpdateXml() throws Exception {
+ doTestModify(true, false, true, false, false, XML,
+ true, false, false, XML_COOKIE_NAME, REDEPLOY);
+ }
+
+ @Test
+ public void testModifyXmlExtwarDirUpdateDir() throws Exception {
+ doTestModify(true, true, false, false, true, DIR,
+ true, false, false, XML_COOKIE_NAME, NONE);
+ }
+
+ @Test
+ public void testModifyXmlExtwarDirUpdateExt() throws Exception {
+ doTestModify(true, true, false, false, true, EXT,
+ true, false, true, XML_COOKIE_NAME, RELOAD);
+ }
+
+ @Test
+ public void testModifyXmlExtwarDirUpdateXml() throws Exception {
+ doTestModify(true, true, false, false, true, XML,
+ true, false, false, XML_COOKIE_NAME, REDEPLOY);
+ }
+
+ @Test
+ public void testModifyXmlWarUpdateWar() throws Exception {
+ doTestModify(true, false, false, true, false, WAR,
+ true, true, false, XML_COOKIE_NAME, RELOAD);
+ }
+
+ @Test
+ public void testModifyXmlWarUpdateXml() throws Exception {
+ doTestModify(true, false, false, true, false, XML,
+ true, true, false, XML_COOKIE_NAME, REDEPLOY);
+ }
+
+ @Test
+ public void testModifyXmlWarDirUpdateDir() throws Exception {
+ doTestModify(true, false, false, true, true, DIR,
+ true, true, true, XML_COOKIE_NAME, NONE);
+ }
+
+ @Test
+ public void testModifyXmlWarDirUpdateWar() throws Exception {
+ doTestModify(true, false, false, true, true, WAR,
+ true, true, true, XML_COOKIE_NAME, RELOAD);
+ }
+
+ @Test
+ public void testModifyXmlWarDirUpdateXml() throws Exception {
+ doTestModify(true, false, false, true, true, XML,
+ true, true, true, XML_COOKIE_NAME, REDEPLOY);
+ }
+
private void doTestModify(boolean startXml, boolean startExternalWar,
boolean startExternalDir, boolean startWar, boolean startDir,
int toModify, boolean resultXml, boolean resultWar,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
