[jboss-cvs] JBossAS SVN: r80158 - in projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry: unit and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 28 13:14:50 EDT 2008
Author: ALRubinger
Date: 2008-10-28 13:14:50 -0400 (Tue, 28 Oct 2008)
New Revision: 80158
Added:
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/TestEnvEntryBeanBase.java
Modified:
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/ExtendedTestEnvEntryBean.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/TestEnvEntry.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/TestEnvEntryBean.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/TestEnvEntryMDBean.java
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/unit/EnvEntryTestCase.java
Log:
[EJBTHREE-1241] Fix "enventry" tests
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/ExtendedTestEnvEntryBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/ExtendedTestEnvEntryBean.java 2008-10-28 17:00:19 UTC (rev 80157)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/ExtendedTestEnvEntryBean.java 2008-10-28 17:14:50 UTC (rev 80158)
@@ -23,6 +23,7 @@
import javax.annotation.Resource;
import javax.ejb.Remote;
+import javax.ejb.SessionContext;
import javax.ejb.Stateless;
import org.jboss.ejb3.annotation.RemoteBinding;
@@ -34,9 +35,9 @@
*/
@Stateless(name="ExtendedTestEnvEntry")
@Remote(TestEnvEntry.class)
- at RemoteBinding(jndiBinding="ExtendedTestEnvEntry")
+ at RemoteBinding(jndiBinding="ExtendedTestEnvEntryJndiName")
public class ExtendedTestEnvEntryBean
- extends TestEnvEntryBean
+ extends TestEnvEntryBeanBase
{
private static final Logger log = Logger.getLogger(ExtendedTestEnvEntryBean.class);
@@ -44,6 +45,9 @@
@Resource private int numExceptions = 2;
+ @Resource
+ SessionContext sessionCtx;
+
private int minExceptions = 0;
public int getMaxExceptions()
@@ -61,4 +65,9 @@
return minExceptions;
}
+ public SessionContext getSessionContext()
+ {
+ return this.sessionCtx;
+ }
+
}
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/TestEnvEntry.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/TestEnvEntry.java 2008-10-28 17:00:19 UTC (rev 80157)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/TestEnvEntry.java 2008-10-28 17:14:50 UTC (rev 80158)
@@ -29,6 +29,8 @@
*/
public interface TestEnvEntry
{
+ String JNDI_NAME = "TestEnvEntryJndiBinding";
+
int checkJNDI() throws NamingException;
int getMaxExceptions();
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/TestEnvEntryBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/TestEnvEntryBean.java 2008-10-28 17:00:19 UTC (rev 80157)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/TestEnvEntryBean.java 2008-10-28 17:14:50 UTC (rev 80158)
@@ -25,11 +25,8 @@
import javax.ejb.Remote;
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
import org.jboss.ejb3.annotation.RemoteBinding;
-import org.jboss.logging.Logger;
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
@@ -37,12 +34,10 @@
*/
@Stateless(name="TestEnvEntry")
@Remote(TestEnvEntry.class)
- at RemoteBinding(jndiBinding="TestEnvEntry")
-public class TestEnvEntryBean
+ at RemoteBinding(jndiBinding = TestEnvEntry.JNDI_NAME)
+public class TestEnvEntryBean extends TestEnvEntryBeanBase
implements TestEnvEntry
{
- private static final Logger log = Logger.getLogger(TestEnvEntryBean.class);
-
@Resource(name="maxExceptions") private int maxExceptions = 4;
@Resource private int numExceptions = 3;
@@ -52,27 +47,21 @@
private int minExceptions = 1;
- public int checkJNDI() throws NamingException
- {
- InitialContext ctx = new InitialContext();
- int rtn = (Integer) ctx.lookup("java:comp/env/maxExceptions");
- if (rtn != (Integer)sessionCtx.lookup("maxExceptions")) throw new RuntimeException("Failed to match env lookup");
- return rtn;
+ public int getMaxExceptions(){
+ return this.maxExceptions;
}
- public int getMaxExceptions()
- {
- return maxExceptions;
+ public int getNumExceptions(){
+ return this.numExceptions;
}
- public int getNumExceptions()
- {
- return numExceptions;
+ public int getMinExceptions(){
+ return this.minExceptions;
}
- public int getMinExceptions()
+ public SessionContext getSessionContext()
{
- return minExceptions;
+ return this.sessionCtx;
}
}
Added: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/TestEnvEntryBeanBase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/TestEnvEntryBeanBase.java (rev 0)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/TestEnvEntryBeanBase.java 2008-10-28 17:14:50 UTC (rev 80158)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.test.enventry;
+
+import javax.ejb.SessionContext;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.logging.Logger;
+
+/**
+ * TestEnvEntryBeanBase
+ *
+ * Common base class for "enventry" test EJBs
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ */
+public abstract class TestEnvEntryBeanBase implements TestEnvEntry
+{
+ private static final Logger log = Logger.getLogger(TestEnvEntryBeanBase.class);
+
+ public int checkJNDI() throws NamingException
+ {
+ InitialContext ctx = new InitialContext();
+ int rtn = (Integer) ctx.lookup("java:comp/env/maxExceptions");
+ if (rtn != (Integer)getSessionContext().lookup("maxExceptions")) throw new RuntimeException("Failed to match env lookup");
+ return rtn;
+ }
+
+ public abstract int getMaxExceptions();
+
+ public abstract int getNumExceptions();
+
+ public abstract int getMinExceptions();
+
+ public abstract SessionContext getSessionContext();
+}
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/TestEnvEntryMDBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/TestEnvEntryMDBean.java 2008-10-28 17:00:19 UTC (rev 80157)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/TestEnvEntryMDBean.java 2008-10-28 17:14:50 UTC (rev 80158)
@@ -21,22 +21,18 @@
*/
package org.jboss.ejb3.test.enventry;
-import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import javax.ejb.ActivationConfigProperty;
import javax.ejb.MessageDriven;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
-import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.MapMessage;
import javax.jms.Message;
import javax.jms.MessageListener;
import javax.jms.MessageProducer;
import javax.jms.Session;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
import org.jboss.logging.Logger;
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/unit/EnvEntryTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/unit/EnvEntryTestCase.java 2008-10-28 17:00:19 UTC (rev 80157)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/enventry/unit/EnvEntryTestCase.java 2008-10-28 17:14:50 UTC (rev 80158)
@@ -50,7 +50,7 @@
public void testEnvEntries() throws Exception
{
- TestEnvEntry test = (TestEnvEntry)getInitialContext().lookup("TestEnvEntry");
+ TestEnvEntry test = (TestEnvEntry) getInitialContext().lookup(TestEnvEntry.JNDI_NAME);
assertNotNull(test);
int maxExceptions = test.getMaxExceptions();
@@ -62,7 +62,7 @@
int numExceptions = test.getNumExceptions();
assertEquals(10, numExceptions);
- TestEnvEntry etest = (TestEnvEntry)getInitialContext().lookup("ExtendedTestEnvEntry");
+ TestEnvEntry etest = (TestEnvEntry) getInitialContext().lookup("ExtendedTestEnvEntryJndiName");
assertNotNull(etest);
maxExceptions = etest.getMaxExceptions();
@@ -109,7 +109,7 @@
public void testJNDI() throws Exception
{
- TestEnvEntry test = (TestEnvEntry)getInitialContext().lookup("TestEnvEntry");
+ TestEnvEntry test = (TestEnvEntry) getInitialContext().lookup(TestEnvEntry.JNDI_NAME);
assertNotNull(test);
assertEquals(15, test.checkJNDI());
More information about the jboss-cvs-commits
mailing list