Author: fschumacher
Date: Sun Mar 13 17:17:32 2016
New Revision: 1734826
URL: http://svn.apache.org/viewvc?rev=1734826&view=rev
Log:
Remove tests for servlet api 4.0
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java?rev=1734826&r1=1734825&r2=1734826&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/jasper/servlet/TestJspCServletContext.java
Sun Mar 13 17:17:32 2016
@@ -33,8 +33,8 @@ public class TestJspCServletContext {
File appDir = new File("test/webapp");
JspCServletContext context = new JspCServletContext(
null, appDir.toURI().toURL(), null, false, false);
- Assert.assertEquals(4, context.getEffectiveMajorVersion());
- Assert.assertEquals(0, context.getEffectiveMinorVersion());
+ Assert.assertEquals(3, context.getEffectiveMajorVersion());
+ Assert.assertEquals(1, context.getEffectiveMinorVersion());
JspConfigDescriptor jspConfigDescriptor =
context.getJspConfigDescriptor();
Assert.assertTrue(jspConfigDescriptor.getTaglibs().isEmpty());
@@ -113,22 +113,13 @@ public class TestJspCServletContext {
Assert.assertEquals(1, context.getEffectiveMinorVersion());
}
- @Test
- public void testWebapp_4_0() throws Exception {
- File appDir = new File("test/webapp-4.0");
- JspCServletContext context = new JspCServletContext(
- null, appDir.toURI().toURL(), null, false, false);
- Assert.assertEquals(4, context.getEffectiveMajorVersion());
- Assert.assertEquals(0, context.getEffectiveMinorVersion());
- }
-
@Test
public void testWebresources() throws Exception {
File appDir = new File("test/webresources/dir1");
JspCServletContext context = new JspCServletContext(
null, appDir.toURI().toURL(), null, false, false);
- Assert.assertEquals(4, context.getEffectiveMajorVersion());
- Assert.assertEquals(0, context.getEffectiveMinorVersion());
+ Assert.assertEquals(3, context.getEffectiveMajorVersion());
+ Assert.assertEquals(1, context.getEffectiveMinorVersion());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
