svn commit: r1480987 - /tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java

[markt]

Author: markt
Date: Fri May 10 12:05:45 2013
New Revision: 1480987

URL: http://svn.apache.org/r1480987
Log:
Fix broken test after re-org
Add test for servlet 3.1

Modified:
    tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java

Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java?rev=1480987&r1=1480986&r2=1480987&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java Fri May 10 
12:05:45 2013
@@ -93,7 +93,7 @@ public class TestJspConfig extends Tomca
         Tomcat tomcat = getTomcatInstance();
 
         File appDir =
-            new File("test/webapp");
+            new File("test/webapp-3.0");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
 
@@ -107,4 +107,22 @@ public class TestJspConfig extends Tomca
         assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
     }
 
+    @Test
+    public void testServlet31NoEL() throws Exception {
+        Tomcat tomcat = getTomcatInstance();
+
+        File appDir =
+            new File("test/webapp-3.1");
+        // 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);
+    }
 }



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