From scm-return-46024-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Tue Apr 19 21:13:00 2011 Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 353F0134D for ; Tue, 19 Apr 2011 21:13:00 +0000 (UTC) Received: (qmail 92478 invoked by uid 500); 19 Apr 2011 21:13:00 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 92441 invoked by uid 500); 19 Apr 2011 21:13:00 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 92434 invoked by uid 99); 19 Apr 2011 21:13:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Apr 2011 21:13:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Apr 2011 21:12:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 883862388962; Tue, 19 Apr 2011 21:12:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1095217 - in /geronimo/server/trunk/testsuite/aries-testsuite/simple: simple-eba/src/test/java/org/apache/geronimo/testsuite/eba/EBATest.java simple-wab/pom.xml simple-wab/src/main/resources/test.jsp Date: Tue, 19 Apr 2011 21:12:34 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110419211234.883862388962@eris.apache.org> Author: gawor Date: Tue Apr 19 21:12:34 2011 New Revision: 1095217 URL: http://svn.apache.org/viewvc?rev=1095217&view=rev Log: added a test case to test WABs with basic JSPs Added: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/test.jsp (with props) Modified: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/test/java/org/apache/geronimo/testsuite/eba/EBATest.java geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/pom.xml Modified: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/test/java/org/apache/geronimo/testsuite/eba/EBATest.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/test/java/org/apache/geronimo/testsuite/eba/EBATest.java?rev=1095217&r1=1095216&r2=1095217&view=diff ============================================================================== --- geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/test/java/org/apache/geronimo/testsuite/eba/EBATest.java (original) +++ geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/src/test/java/org/apache/geronimo/testsuite/eba/EBATest.java Tue Apr 19 21:12:34 2011 @@ -31,11 +31,19 @@ public class EBATest extends TestSupport @Test public void testServlet() throws Exception { - checkReply("/SampleServlet"); + String reply = getReply("/SampleServlet"); + assertTrue("WAB Servlet", + reply.contains("Hello Web Application Bundle")); } + @Test + public void testJSP() throws Exception { + String reply = getReply("/test.jsp"); + assertTrue("WAB JSP", + reply.contains("page request session application")); + } - private void checkReply(String address) + private String getReply(String address) throws Exception { String warName = System.getProperty("webAppName"); assertNotNull(warName); @@ -44,9 +52,7 @@ public class EBATest extends TestSupport * WABs are deployed asynchronously so it might take a * bit to actually invoke the servlet. */ - String reply = doGET(url, 6, 10 * 1000); - assertTrue("WAB", - reply.contains("Hello Web Application Bundle")); + return doGET(url, 6, 10 * 1000); } private String doGET(URL url, int repeat, long delay) { Modified: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/pom.xml?rev=1095217&r1=1095216&r2=1095217&view=diff ============================================================================== --- geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/pom.xml (original) +++ geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/pom.xml Tue Apr 19 21:12:34 2011 @@ -60,6 +60,13 @@ ${pom.artifactId} org.apache.geronimo.test.eba !org.apache.geronimo.test.eba + + javax.servlet.jsp.el, + javax.servlet.jsp, + javax.servlet.jsp.tagext, + javax.servlet.jsp.resources, + * + Added: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/test.jsp URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/test.jsp?rev=1095217&view=auto ============================================================================== --- geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/test.jsp (added) +++ geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/test.jsp Tue Apr 19 21:12:34 2011 @@ -0,0 +1,28 @@ + +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" trimDirectiveWhitespaces="true" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + +Hello JSP + + + + + + + + Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/test.jsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/test.jsp ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-wab/src/main/resources/test.jsp ------------------------------------------------------------------------------ svn:mime-type = text/plain