[jboss-cvs] JBossAS SVN: r77440 - in trunk/testsuite: src/main/org/jboss/test/web/test and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 25 11:35:17 EDT 2008
Author: emuckenhuber
Date: 2008-08-25 11:35:17 -0400 (Mon, 25 Aug 2008)
New Revision: 77440
Added:
trunk/testsuite/src/resources/web/jspinjection/
trunk/testsuite/src/resources/web/jspinjection/WEB-INF/
trunk/testsuite/src/resources/web/jspinjection/WEB-INF/web.xml
trunk/testsuite/src/resources/web/jspinjection/enc.jsp
Modified:
trunk/testsuite/imports/sections/web.xml
trunk/testsuite/src/main/org/jboss/test/web/test/EncAnnotationsUnitTestCase.java
Log:
[JBAS-5673] test dynamic bean injection (jsp)
Modified: trunk/testsuite/imports/sections/web.xml
===================================================================
--- trunk/testsuite/imports/sections/web.xml 2008-08-25 15:16:30 UTC (rev 77439)
+++ trunk/testsuite/imports/sections/web.xml 2008-08-25 15:35:17 UTC (rev 77440)
@@ -669,6 +669,13 @@
<include name="org/jboss/test/web/servlets/StandaloneENCServlet.class"/>
</classes>
</war>
+ <!-- Simple war for testing web app enc setup using jsp annotations only -->
+ <war destfile="${build.lib}/simple-jsponly.war"
+ webxml="${build.resources}/web/jspinjection/WEB-INF/web.xml">
+ <fileset dir="${build.resources}/web/jspinjection">
+ <include name="**/*.jsp"/>
+ </fileset>
+ </war>
<!-- Simple war for testing web app enc setup using annotations -->
<war destfile="${build.lib}/simple-annonly.war"
webxml="${build.resources}/web/simple-xmlonly/annotated-web.xml">
Modified: trunk/testsuite/src/main/org/jboss/test/web/test/EncAnnotationsUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/test/EncAnnotationsUnitTestCase.java 2008-08-25 15:16:30 UTC (rev 77439)
+++ trunk/testsuite/src/main/org/jboss/test/web/test/EncAnnotationsUnitTestCase.java 2008-08-25 15:35:17 UTC (rev 77440)
@@ -41,7 +41,7 @@
public static Test suite() throws Exception
{
- return getDeploySetup(EncAnnotationsUnitTestCase.class, "simple-mock.beans,simple-annonly.war");
+ return getDeploySetup(EncAnnotationsUnitTestCase.class, "simple-mock.beans,simple-annonly.war,simple-jsponly.war");
}
public EncAnnotationsUnitTestCase(String name)
@@ -60,5 +60,16 @@
log.info("X-Exception: "+errors);
assertTrue("X-Exception("+errors+") is null", errors == null);
}
+
+ /**
+ * Access a simple annotated jsp.
+ *
+ * @throws Exception
+ */
+ public void testJSPAnnotations() throws Exception
+ {
+ URL url = new URL(baseURL+"simple-jsponly/enc.jsp");
+ HttpUtils.accessURL(url);
+ }
}
Added: trunk/testsuite/src/resources/web/jspinjection/WEB-INF/web.xml
===================================================================
--- trunk/testsuite/src/resources/web/jspinjection/WEB-INF/web.xml (rev 0)
+++ trunk/testsuite/src/resources/web/jspinjection/WEB-INF/web.xml 2008-08-25 15:35:17 UTC (rev 77440)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
+ <description>Tests of jsp enc config via annotations</description>
+
+</web-app>
Added: trunk/testsuite/src/resources/web/jspinjection/enc.jsp
===================================================================
--- trunk/testsuite/src/resources/web/jspinjection/enc.jsp (rev 0)
+++ trunk/testsuite/src/resources/web/jspinjection/enc.jsp 2008-08-25 15:35:17 UTC (rev 77440)
@@ -0,0 +1,126 @@
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@page import="javax.jms.Topic"%>
+<%@page import="java.net.URL"%>
+<%@page import="javax.mail.Session"%>
+<%@page import="javax.naming.NamingException"%>
+<%@page import="javax.naming.InitialContext"%>
+<%@page import="javax.naming.Context"%>
+<%@page import="org.jboss.test.web.mock.EntityHome"%>
+<%@page import="org.jboss.test.web.mock.StatelessSessionLocalHome"%>
+<%@page import="org.jboss.test.web.mock.StatelessSessionHome"%>
+<%@page import="javax.ejb.EJB"%>
+<%@page import="javax.sql.DataSource"%>
+<%@page import="javax.jms.Queue"%>
+<%@page import="javax.jms.QueueConnectionFactory"%>
+<%@page import="javax.annotation.Resource"%>
+
+<%!
+ at Resource(name="jms/QueFactory", mappedName="java:/ConnectionFactory")
+QueueConnectionFactory queueFactory;
+ at Resource(name="TestQueue", mappedName="MockQueueB")
+Queue testQueue;
+ at Resource(name="mdr/ConsumesProducesJNDIName", mappedName="MockQueueA")
+Queue refQueue;
+ at Resource(name="mail/DefaultMail", type=javax.mail.Session.class, mappedName="java:/Mail")
+Session session;
+ at Resource(name="mdr/ConsumesLink", type=javax.jms.Queue.class, mappedName="MockQueueA")
+Queue consumesLink;
+ at Resource(name="mdr/ProducesLink", type=javax.jms.Topic.class, mappedName="MockTopicA")
+Topic producesLink;
+ at Resource(name="jdbc/DefaultDS", mappedName="java:/MockDS")
+DataSource ds;
+ at EJB(name="ejb/bean3", beanInterface=StatelessSessionHome.class,
+ mappedName="jbosstest/ejbs/UnsecuredEJB")
+StatelessSessionHome sshome;
+ at EJB(name="ejb/CtsBmp", beanInterface=EntityHome.class,
+ mappedName="jbosstest/ejbs/CtsBmp")
+EntityHome entityHome;
+ at EJB(name="ejb/local/bean3", beanInterface=StatelessSessionLocalHome.class,
+ mappedName="jbosstest/ejbs/local/ENCBean1")
+StatelessSessionLocalHome localHome;
+
+ at Resource(name="url/JBossHome", mappedName="http://www.jboss.org")
+java.net.URL url;
+
+ at Resource(name="Ints/i0", mappedName="0")
+Integer i0;
+ at Resource(name="Ints/i1", mappedName="1")
+Integer i1;
+ at Resource(name="Floats/f0", mappedName="0.0")
+Float f0;
+ at Resource(name="Floats/f1", mappedName="1.1")
+Float f1;
+ at Resource(name="Strings/s0", mappedName="String0")
+String s0;
+ at Resource(name="Strings/s1", mappedName="String1")
+String s1;
+ at Resource(name="ejb/catalog/CatalogDAOClass", mappedName="com.sun.model.dao.CatalogDAOImpl")
+String ejbName;
+%>
+
+<%
+Context initCtx = new InitialContext();
+Context myEnv = (Context) initCtx.lookup("java:comp/env");
+// Test basic env values
+Integer i = (Integer) myEnv.lookup("Ints/i0");
+i = (Integer) initCtx.lookup("java:comp/env/Ints/i1");
+Float f = (Float) myEnv.lookup("Floats/f0");
+f = (Float) initCtx.lookup("java:comp/env/Floats/f1");
+String s = (String) myEnv.lookup("Strings/s0");
+s = (String) initCtx.lookup("java:comp/env/Strings/s1");
+s = (String) initCtx.lookup("java:comp/env/ejb/catalog/CatalogDAOClass");
+
+// do lookup on bean specified without ejb-link
+Object ejb = initCtx.lookup("java:comp/env/ejb/bean3");
+if ((ejb instanceof StatelessSessionHome) == false)
+ throw new NamingException("ejb/bean3 is not a StatelessSessionHome");
+
+
+ejb = initCtx.lookup("java:comp/env/ejb/CtsBmp");
+if ((ejb instanceof EntityHome) == false)
+ throw new NamingException("ejb/CtsBmp is not a EntityHome");
+
+//lookup of local-ejb-ref bean specified without ejb-link
+ejb = initCtx.lookup("java:comp/env/ejb/local/bean3");
+if ((ejb instanceof StatelessSessionLocalHome) == false)
+ throw new NamingException("ejb/local/bean3 is not a StatelessSessionLocalHome");
+
+// JDBC DataSource
+DataSource ds = (DataSource) myEnv.lookup("jdbc/DefaultDS");
+
+// JavaMail Session
+Session testSession = (Session) myEnv.lookup("mail/DefaultMail");
+
+// QueueConnectionFactory
+QueueConnectionFactory qf = (QueueConnectionFactory) myEnv.lookup("jms/QueFactory");
+
+// URLs
+URL home1 = (URL) myEnv.lookup("url/JBossHome");
+URL home2 = (URL) initCtx.lookup("java:comp/env/url/JBossHome");
+if( home1.equals(home2) == false )
+ throw new NamingException("url/JBossHome != java:comp/env/url/JBossHome");
+
+Object obj = myEnv.lookup("mdr/ConsumesLink");
+if ((obj instanceof Queue) == false)
+ throw new RuntimeException("mdr/ConsumesLink is not a javax.jms.Queue");
+Queue queue = (Queue) obj;
+if ("QUEUE.testQueue".equals(queue.getQueueName()))
+ throw new RuntimeException("Excepted QUEUE.testQueue, got " + queue);
+
+obj = myEnv.lookup("mdr/ProducesLink");
+if ((obj instanceof Topic) == false)
+ throw new RuntimeException("mdr/ProducesLink is not a javax.jms.Topic");
+Topic topic = (Topic) obj;
+if ("TOPIC.testTopic".equals(topic.getTopicName()))
+ throw new RuntimeException("Excepted TOPIC.testTopic got " + topic);
+
+obj = myEnv.lookup("mdr/ConsumesProducesJNDIName");
+if ((obj instanceof Queue) == false)
+ throw new RuntimeException("mdr/ConsumesProducesJNDIName is not a javax.jms.Queue");
+queue = (Queue) obj;
+if ("QUEUE.A".equals(queue.getQueueName()))
+ throw new RuntimeException("Excepted QUEUE.A, got " + queue);
+%>
+
+test were okay.
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list