svn commit: r1734825 - in /tomcat/tc8.5.x/trunk/test: javax/servlet/resources/TestSchemaValidation.java org/apache/tomcat/util/descriptor/web/TestWebXml.java

[fschumacher]

Author: fschumacher
Date: Sun Mar 13 16:34:30 2016
New Revision: 1734825

URL: http://svn.apache.org/viewvc?rev=1734825&view=rev
Log:
Remove tests for servlet api 4.0
Modified:
    tomcat/tc8.5.x/trunk/test/javax/servlet/resources/TestSchemaValidation.java
    
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java

Modified: 
tomcat/tc8.5.x/trunk/test/javax/servlet/resources/TestSchemaValidation.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/javax/servlet/resources/TestSchemaValidation.java?rev=1734825&r1=1734824&r2=1734825&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/javax/servlet/resources/TestSchemaValidation.java 
(original)
+++ tomcat/tc8.5.x/trunk/test/javax/servlet/resources/TestSchemaValidation.java 
Sun Mar 13 16:34:30 2016
@@ -39,7 +39,7 @@ public class TestSchemaValidation {
         digester.push(new WebXml());
         WebXml desc = (WebXml) digester.parse(
                 new File("test/webapp/WEB-INF/web.xml"));
-        Assert.assertEquals("4.0", desc.getVersion());
+        Assert.assertEquals("3.1", desc.getVersion());
         Assert.assertEquals(0, handler.getErrors().size());
         Assert.assertEquals(0, handler.getWarnings().size());
     }
@@ -129,18 +129,4 @@ public class TestSchemaValidation {
         Assert.assertEquals(0, handler.getErrors().size());
         Assert.assertEquals(0, handler.getWarnings().size());
     }
-
-    @Test
-    public void testWebapp_4_0() throws Exception {
-        XmlErrorHandler handler = new XmlErrorHandler();
-        Digester digester = DigesterFactory.newDigester(
-                true, true, new WebRuleSet(false), true);
-        digester.setErrorHandler(handler);
-        digester.push(new WebXml());
-        WebXml desc = (WebXml) digester.parse(
-                new File("test/webapp-4.0/WEB-INF/web.xml"));
-        Assert.assertEquals("4.0", desc.getVersion());
-        Assert.assertEquals(0, handler.getErrors().size());
-        Assert.assertEquals(0, handler.getWarnings().size());
-    }
 }

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java?rev=1734825&r1=1734824&r2=1734825&view=diff
==============================================================================
--- 
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java 
Sun Mar 13 16:34:30 2016
@@ -44,8 +44,8 @@ public class TestWebXml {
         WebXml webxml = new WebXml();
 
         // Defaults
-        Assert.assertEquals(4, webxml.getMajorVersion());
-        Assert.assertEquals(0, webxml.getMinorVersion());
+        Assert.assertEquals(3, webxml.getMajorVersion());
+        Assert.assertEquals(1, webxml.getMinorVersion());
 
         // Both get changed
         webxml.setVersion("2.5");
@@ -130,17 +130,6 @@ public class TestWebXml {
     }
 
     @Test
-    public void testParseVersion40() {
-
-        WebXml webxml = new WebXml();
-
-        webxml.setVersion("4.0");
-        Assert.assertEquals(4, webxml.getMajorVersion());
-        Assert.assertEquals(0, webxml.getMinorVersion());
-        Assert.assertEquals("4.0", webxml.getVersion());
-    }
-
-    @Test
     public void testValidateVersion22() throws IOException, SAXException {
         doTestValidateVersion("2.2");
     }
@@ -170,11 +159,6 @@ public class TestWebXml {
         doTestValidateVersion("3.1");
     }
 
-    @Test
-    public void testValidateVersion40() throws IOException, SAXException {
-        doTestValidateVersion("4.0");
-    }
-
     private void doTestValidateVersion(String version) throws IOException, 
SAXException {
         WebXml webxml = new WebXml();
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org