Author: kkolinko
Date: Wed Feb 12 10:13:04 2014
New Revision: 1567582
URL: http://svn.apache.org/r1567582
Log:
Backport r1567580 from tomcat/trunk:
One more followup to r1567148
Assert that version number of written and re-parsed web.xml is as expected.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestWebXml.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1567580
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestWebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestWebXml.java?rev=1567582&r1=1567581&r2=1567582&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestWebXml.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestWebXml.java Wed
Feb 12 10:13:04 2014
@@ -171,13 +171,15 @@ public class TestWebXml {
// System.out.print(webxml.toXml() + "\n\n\n");
InputSource is = new InputSource(new StringReader(webxml.toXml()));
- digester.push(new WebXml());
+ WebXml webxmlResult = new WebXml();
+ digester.push(webxmlResult);
digester.parse(is);
Assert.assertEquals(0, handler.getErrors().size());
Assert.assertEquals(0, handler.getWarnings().size());
Assert.assertEquals(version, webxml.getVersion());
+ Assert.assertEquals(version, webxmlResult.getVersion());
}
// A simplified copy of ContextConfig.getDefaultWebXmlFragment().
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
