Author: markt
Date: Sun Mar 7 11:39:39 2010
New Revision: 919973
URL: http://svn.apache.org/viewvc?rev=919973&view=rev
Log:
Ensure result of getVersion() is consistent with getMajorVersion() and
getMinorVersion()
With the current code this fails. Patch to fix this to follow.
Modified:
tomcat/trunk/test/org/apache/catalina/deploy/TestWebXml.java
Modified: tomcat/trunk/test/org/apache/catalina/deploy/TestWebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/deploy/TestWebXml.java?rev=919973&r1=919972&r2=919973&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/deploy/TestWebXml.java (original)
+++ tomcat/trunk/test/org/apache/catalina/deploy/TestWebXml.java Sun Mar 7
11:39:39 2010
@@ -79,6 +79,7 @@
org.apache.catalina.startup.Constants.WebDtdPublicId_22);
assertEquals(2, webxml.getMajorVersion());
assertEquals(2, webxml.getMinorVersion());
+ assertEquals("2.2", webxml.getVersion());
}
public void testParsePublicIdVersion23() {
@@ -89,6 +90,7 @@
org.apache.catalina.startup.Constants.WebDtdPublicId_23);
assertEquals(2, webxml.getMajorVersion());
assertEquals(3, webxml.getMinorVersion());
+ assertEquals("2.3", webxml.getVersion());
}
public void testParsePublicIdVersion24() {
@@ -99,6 +101,7 @@
org.apache.catalina.startup.Constants.WebSchemaPublicId_24);
assertEquals(2, webxml.getMajorVersion());
assertEquals(4, webxml.getMinorVersion());
+ assertEquals("2.4", webxml.getVersion());
}
public void testParsePublicIdVersion25() {
@@ -109,6 +112,7 @@
org.apache.catalina.startup.Constants.WebSchemaPublicId_25);
assertEquals(2, webxml.getMajorVersion());
assertEquals(5, webxml.getMinorVersion());
+ assertEquals("2.5", webxml.getVersion());
}
public void testParsePublicIdVersion30() {
@@ -119,5 +123,6 @@
org.apache.catalina.startup.Constants.WebSchemaPublicId_30);
assertEquals(3, webxml.getMajorVersion());
assertEquals(0, webxml.getMinorVersion());
+ assertEquals("3.0", webxml.getVersion());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
