From b545b6c1c4e9c05d751a36db45a04cadd1d77ca1 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 7 Mar 2010 11:39:39 +0000
Subject: [PATCH] Ensure result of getVersion() is consistent with
 getMajorVersion() and getMinorVersion() With the current code this fails.
 Patch to fix this to follow.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@919973 13f79535-47bb-0310-9956-ffa450edef68
---
 test/org/apache/catalina/deploy/TestWebXml.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/org/apache/catalina/deploy/TestWebXml.java b/test/org/apache/catalina/deploy/TestWebXml.java
index 7909a88fe..61cd59b91 100644
--- a/test/org/apache/catalina/deploy/TestWebXml.java
+++ b/test/org/apache/catalina/deploy/TestWebXml.java
@@ -79,6 +79,7 @@ public class TestWebXml extends TestCase {
                 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 @@ public class TestWebXml extends TestCase {
                 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 @@ public class TestWebXml extends TestCase {
                 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 @@ public class TestWebXml extends TestCase {
                 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 @@ public class TestWebXml extends TestCase {
                 org.apache.catalina.startup.Constants.WebSchemaPublicId_30);
         assertEquals(3, webxml.getMajorVersion());
         assertEquals(0, webxml.getMinorVersion());
+        assertEquals("3.0", webxml.getVersion());
     }
 }
-- 
2.11.0