Author: remm Date: Sun Mar 13 17:45:05 2016 New Revision: 1734832 URL: http://svn.apache.org/viewvc?rev=1734832&view=rev Log: Remove some instances of 4.0 use.
Modified: tomcat/tc8.5.x/trunk/test/org/apache/jasper/TestJspC.java tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestValidator.java Modified: tomcat/tc8.5.x/trunk/test/org/apache/jasper/TestJspC.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/jasper/TestJspC.java?rev=1734832&r1=1734831&r2=1734832&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/test/org/apache/jasper/TestJspC.java (original) +++ tomcat/tc8.5.x/trunk/test/org/apache/jasper/TestJspC.java Sun Mar 13 17:45:05 2016 @@ -95,14 +95,6 @@ public class TestJspC { verify(webappOut); } - @Test - public void precompileWebapp_4_0() throws IOException { - File appDir = new File("test/webapp-4.0"); - File webappOut = new File(outputDir, appDir.getName()); - precompile(appDir, webappOut); - verify(webappOut); - } - private void verify(File webappOut) { // for now, just check some expected files exist Assert.assertTrue(new File(webappOut, "generated_web.xml").exists()); Modified: tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java?rev=1734832&r1=1734831&r2=1734832&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java (original) +++ tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java Sun Mar 13 17:45:05 2016 @@ -141,21 +141,4 @@ public class TestJspConfig extends Tomca assertTrue(result.indexOf("<p>00-hello world</p>") > 0); } - @Test - public void testServlet40NoEL() throws Exception { - Tomcat tomcat = getTomcatInstance(); - - File appDir = new File("test/webapp-4.0"); - // app dir is relative to server home - tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); - - tomcat.start(); - - ByteChunk res = getUrl("http://localhost:" + getPort() + - "/test/el-as-literal.jsp"); - - String result = res.toString(); - - assertTrue(result.indexOf("<p>00-hello world</p>") > 0); - } } Modified: tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestValidator.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestValidator.java?rev=1734832&r1=1734831&r2=1734832&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestValidator.java (original) +++ tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestValidator.java Sun Mar 13 17:45:05 2016 @@ -195,31 +195,6 @@ public class TestValidator extends Tomca assertTrue(result.indexOf("<p>06-hello world</p>") > 0); } - @Test - public void testTldVersions40() throws Exception { - Tomcat tomcat = getTomcatInstance(); - - File appDir = - new File("test/webapp-4.0"); - // app dir is relative to server home - tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); - - tomcat.start(); - - ByteChunk res = getUrl("http://localhost:" + getPort() + - "/test/tld-versions.jsp"); - - String result = res.toString(); - - assertTrue(result.indexOf("<p>00-hello world</p>") > 0); - assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>02-hello world</p>") > 0); - assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>04-hello world</p>") > 0); - assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>06-hello world</p>") > 0); - } - public static class Echo extends TagSupport { private static final long serialVersionUID = 1L; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org