[jboss-cvs] JBossAS SVN: r103749 - in trunk/testsuite/src/main/org/jboss/test/ejb3: jboss51xsd/unit and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 9 06:27:24 EDT 2010
Author: jaikiran
Date: 2010-04-09 06:27:23 -0400 (Fri, 09 Apr 2010)
New Revision: 103749
Added:
trunk/testsuite/src/main/org/jboss/test/ejb3/jboss51xsd/unit/EJB3DeploymentWithJBoss51xsdUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/ejb3/jbpapp3026/unit/AutoCreateDestinationForMDBUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/ejb3/nointerface/unit/EJB31NoInterfaceViewUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/ejb3/war/deployment/unit/Ejb3WarDeploymentUnitTestCase.java
Removed:
trunk/testsuite/src/main/org/jboss/test/ejb3/jboss51xsd/unit/EJB3DeploymentWithJBoss51xsdTestCase.java
trunk/testsuite/src/main/org/jboss/test/ejb3/jbpapp3026/unit/AutoCreateDestinationForMDBTestCase.java
trunk/testsuite/src/main/org/jboss/test/ejb3/nointerface/unit/EJB31NoInterfaceViewTestCase.java
trunk/testsuite/src/main/org/jboss/test/ejb3/war/deployment/unit/Ejb3WarDeploymentTestCase.java
Modified:
trunk/testsuite/src/main/org/jboss/test/ejb3/jboss51xsd/EchoBean.java
trunk/testsuite/src/main/org/jboss/test/ejb3/war/deployment/CalculatorInWEBINFClasses.java
trunk/testsuite/src/main/org/jboss/test/ejb3/war/deployment/CounterBeanInWEBINFLibJar.java
trunk/testsuite/src/main/org/jboss/test/ejb3/war/deployment/CounterDelegateBeanInWarEjbJarXml.java
Log:
JBAS-7920 Renamed some of EJB3 testcases to end with *UnitTestCase
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/jboss51xsd/EchoBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/jboss51xsd/EchoBean.java 2010-04-09 10:21:51 UTC (rev 103748)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/jboss51xsd/EchoBean.java 2010-04-09 10:27:23 UTC (rev 103749)
@@ -24,14 +24,13 @@
import javax.ejb.Remote;
import javax.ejb.Stateless;
-import org.jboss.test.ejb3.jboss51xsd.unit.EJB3DeploymentWithJBoss51xsdTestCase;
/**
* EchoBean
*
* Used in testing of JBAS-7231 https://jira.jboss.org/jira/browse/JBAS-7231
*
- * @see EJB3DeploymentWithJBoss51xsdTestCase
+ *
*
* @author Jaikiran Pai
* @version $Revision: $
Deleted: trunk/testsuite/src/main/org/jboss/test/ejb3/jboss51xsd/unit/EJB3DeploymentWithJBoss51xsdTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/jboss51xsd/unit/EJB3DeploymentWithJBoss51xsdTestCase.java 2010-04-09 10:21:51 UTC (rev 103748)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/jboss51xsd/unit/EJB3DeploymentWithJBoss51xsdTestCase.java 2010-04-09 10:27:23 UTC (rev 103749)
@@ -1,81 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt 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.test.ejb3.jboss51xsd.unit;
-
-import junit.framework.Test;
-
-import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
-import org.jboss.test.ejb3.jboss51xsd.Echo;
-
-/**
- * EJB3DeploymentWithJBoss51xsdTestCase
- *
- * Tests the bug fix for https://jira.jboss.org/jira/browse/JBAS-7231
- *
- * The bug in JBAS-7231 relates to missing of jboss_5_1 xsd from the
- * metadata-deployer-jboss-beans.xml. As a result, the deployment of
- * the EJB3 deployment used to fallback on the dtd version of jboss.xml
- * which not as robust as the 5_1 xsd.
- *
- * @author Jaikiran Pai
- * @version $Revision: $
- */
-public class EJB3DeploymentWithJBoss51xsdTestCase extends JBossTestCase
-{
-
- /**
- * Logger
- */
- private static Logger logger = Logger.getLogger(EJB3DeploymentWithJBoss51xsdTestCase.class);
-
- /**
- * Constructor
- * @param name
- */
- public EJB3DeploymentWithJBoss51xsdTestCase(String name)
- {
- super(name);
- }
-
-
- public static Test suite() throws Exception
- {
- return getDeploySetup(EJB3DeploymentWithJBoss51xsdTestCase.class, "jboss51xsd.jar");
- }
-
- public void testDeployment() throws Exception
- {
- // make sure that there were no deployment errors
- // Yes, it's a weird method name for testing that the deployment
- // did not throw errors during deployment :)
- serverFound();
-
- // Now just do a simple test of the EJBs - lookup and invoke a method
- Echo bean = (Echo) this.getInitialContext().lookup("JBAS-7231-BeanJNDINameFromJBossXml");
- String msg = "JBAS-7231 is now fixed!!";
- String returnedMessage = bean.echo(msg);
-
- assertEquals("Bean returned unexpected value", msg, returnedMessage);
-
- }
-}
Copied: trunk/testsuite/src/main/org/jboss/test/ejb3/jboss51xsd/unit/EJB3DeploymentWithJBoss51xsdUnitTestCase.java (from rev 103743, trunk/testsuite/src/main/org/jboss/test/ejb3/jboss51xsd/unit/EJB3DeploymentWithJBoss51xsdTestCase.java)
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/jboss51xsd/unit/EJB3DeploymentWithJBoss51xsdUnitTestCase.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/jboss51xsd/unit/EJB3DeploymentWithJBoss51xsdUnitTestCase.java 2010-04-09 10:27:23 UTC (rev 103749)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.test.ejb3.jboss51xsd.unit;
+
+import junit.framework.Test;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.JBossTestCase;
+import org.jboss.test.ejb3.jboss51xsd.Echo;
+
+/**
+ * EJB3DeploymentWithJBoss51xsdTestCase
+ *
+ * Tests the bug fix for https://jira.jboss.org/jira/browse/JBAS-7231
+ *
+ * The bug in JBAS-7231 relates to missing of jboss_5_1 xsd from the
+ * metadata-deployer-jboss-beans.xml. As a result, the deployment of
+ * the EJB3 deployment used to fallback on the dtd version of jboss.xml
+ * which not as robust as the 5_1 xsd.
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public class EJB3DeploymentWithJBoss51xsdUnitTestCase extends JBossTestCase
+{
+
+ /**
+ * Logger
+ */
+ private static Logger logger = Logger.getLogger(EJB3DeploymentWithJBoss51xsdUnitTestCase.class);
+
+ /**
+ * Constructor
+ * @param name
+ */
+ public EJB3DeploymentWithJBoss51xsdUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(EJB3DeploymentWithJBoss51xsdUnitTestCase.class, "jboss51xsd.jar");
+ }
+
+ public void testDeployment() throws Exception
+ {
+ // make sure that there were no deployment errors
+ // Yes, it's a weird method name for testing that the deployment
+ // did not throw errors during deployment :)
+ serverFound();
+
+ // Now just do a simple test of the EJBs - lookup and invoke a method
+ Echo bean = (Echo) this.getInitialContext().lookup("JBAS-7231-BeanJNDINameFromJBossXml");
+ String msg = "JBAS-7231 is now fixed!!";
+ String returnedMessage = bean.echo(msg);
+
+ assertEquals("Bean returned unexpected value", msg, returnedMessage);
+
+ }
+}
Deleted: trunk/testsuite/src/main/org/jboss/test/ejb3/jbpapp3026/unit/AutoCreateDestinationForMDBTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/jbpapp3026/unit/AutoCreateDestinationForMDBTestCase.java 2010-04-09 10:21:51 UTC (rev 103748)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/jbpapp3026/unit/AutoCreateDestinationForMDBTestCase.java 2010-04-09 10:27:23 UTC (rev 103749)
@@ -1,100 +0,0 @@
-/*
- * 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.test.ejb3.jbpapp3026.unit;
-
-import javax.jms.Queue;
-import javax.jms.Topic;
-
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-
-/**
- * AutoCreateDestinationForMDBTestCase
- *
- * Tests that destinations which are set to be auto created (through the use of
- * "create-destination" on the MDB) are created successfully, when the
- * destination jndi name has forward slashes.
- *
- * See https://jira.jboss.org/jira/browse/JBPAPP-3026 for details
- *
- * @author Jaikiran Pai
- * @version $Revision: $
- */
-public class AutoCreateDestinationForMDBTestCase extends JBossTestCase
-{
-
- /**
- * Constructor
- * @param name
- */
- public AutoCreateDestinationForMDBTestCase(String name)
- {
- super(name);
- }
-
- /**
- *
- * @return
- * @throws Exception
- */
- public static Test suite() throws Exception
- {
- return getDeploySetup(AutoCreateDestinationForMDBTestCase.class, "createdestination-mdb.jar");
- }
-
- /**
- * Tests that a queue containing forward slashes in it's destination jndi name
- * is correctly created.
- *
- * @throws Exception
- */
- public void testQueueCreationForMDB() throws Exception
- {
- // make sure the deployment was deployed successfully
- serverFound();
- // lookup queue
- // successful lookup, in itself should be sufficient enough to prove that
- // the queue was created by the "create-destination" activation config property
- // of the MDB
- Queue queue = (Queue) this.getInitialContext().lookup("queue/create-destination/testQueue");
- assertNotNull("Queue lookup returned null", queue);
- }
-
- /**
- * Tests that a topic containing forward slashes in it's destination jndi name
- * is correctly created.
- *
- * @throws Exception
- */
- public void testTopicCreationForMDB() throws Exception
- {
- // make sure the deployment was deployed successfully
- serverFound();
- // lookup topic
- // successful lookup, in itself should be sufficient enough to prove that
- // the topic was created by the "create-destination" activation config property
- // of the MDB
- Topic topic = (Topic) this.getInitialContext().lookup("topic/create-destination/testTopic");
- assertNotNull("Topic lookup returned null", topic);
- }
-}
Copied: trunk/testsuite/src/main/org/jboss/test/ejb3/jbpapp3026/unit/AutoCreateDestinationForMDBUnitTestCase.java (from rev 103743, trunk/testsuite/src/main/org/jboss/test/ejb3/jbpapp3026/unit/AutoCreateDestinationForMDBTestCase.java)
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/jbpapp3026/unit/AutoCreateDestinationForMDBUnitTestCase.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/jbpapp3026/unit/AutoCreateDestinationForMDBUnitTestCase.java 2010-04-09 10:27:23 UTC (rev 103749)
@@ -0,0 +1,100 @@
+/*
+ * 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.test.ejb3.jbpapp3026.unit;
+
+import javax.jms.Queue;
+import javax.jms.Topic;
+
+import junit.framework.Test;
+
+import org.jboss.test.JBossTestCase;
+
+/**
+ * AutoCreateDestinationForMDBTestCase
+ *
+ * Tests that destinations which are set to be auto created (through the use of
+ * "create-destination" on the MDB) are created successfully, when the
+ * destination jndi name has forward slashes.
+ *
+ * See https://jira.jboss.org/jira/browse/JBPAPP-3026 for details
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public class AutoCreateDestinationForMDBUnitTestCase extends JBossTestCase
+{
+
+ /**
+ * Constructor
+ * @param name
+ */
+ public AutoCreateDestinationForMDBUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ /**
+ *
+ * @return
+ * @throws Exception
+ */
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(AutoCreateDestinationForMDBUnitTestCase.class, "createdestination-mdb.jar");
+ }
+
+ /**
+ * Tests that a queue containing forward slashes in it's destination jndi name
+ * is correctly created.
+ *
+ * @throws Exception
+ */
+ public void testQueueCreationForMDB() throws Exception
+ {
+ // make sure the deployment was deployed successfully
+ serverFound();
+ // lookup queue
+ // successful lookup, in itself should be sufficient enough to prove that
+ // the queue was created by the "create-destination" activation config property
+ // of the MDB
+ Queue queue = (Queue) this.getInitialContext().lookup("queue/create-destination/testQueue");
+ assertNotNull("Queue lookup returned null", queue);
+ }
+
+ /**
+ * Tests that a topic containing forward slashes in it's destination jndi name
+ * is correctly created.
+ *
+ * @throws Exception
+ */
+ public void testTopicCreationForMDB() throws Exception
+ {
+ // make sure the deployment was deployed successfully
+ serverFound();
+ // lookup topic
+ // successful lookup, in itself should be sufficient enough to prove that
+ // the topic was created by the "create-destination" activation config property
+ // of the MDB
+ Topic topic = (Topic) this.getInitialContext().lookup("topic/create-destination/testTopic");
+ assertNotNull("Topic lookup returned null", topic);
+ }
+}
Deleted: trunk/testsuite/src/main/org/jboss/test/ejb3/nointerface/unit/EJB31NoInterfaceViewTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/nointerface/unit/EJB31NoInterfaceViewTestCase.java 2010-04-09 10:21:51 UTC (rev 103748)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/nointerface/unit/EJB31NoInterfaceViewTestCase.java 2010-04-09 10:27:23 UTC (rev 103749)
@@ -1,72 +0,0 @@
-/**
- *
- */
-package org.jboss.test.ejb3.nointerface.unit;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-import org.jboss.test.ejb3.nointerface.AccountManager;
-import org.jboss.test.ejb3.nointerface.AccountManagerBean;
-import org.jboss.test.ejb3.nointerface.Calculator;
-
-/**
- * EJB31NoInterfaceViewTestCase
- *
- * Tests EJB3.1 no-interface view support
- *
- * @author Jaikiran Pai
- * @version $Revision: $
- */
-public class EJB31NoInterfaceViewTestCase extends JBossTestCase
-{
-
- /**
- *
- * @param name
- */
- public EJB31NoInterfaceViewTestCase(String name)
- {
- super(name);
- }
-
- /**
- *
- * @return
- * @throws Exception
- */
- public static Test suite() throws Exception
- {
- return getDeploySetup(EJB31NoInterfaceViewTestCase.class, "ejb31nointerface.jar");
- }
-
- /**
- * Tests (indirect) access to a no-interface view bean ({@link Calculator})
- *
- * @see Calculator and it's usage in {@link AccountManagerBean}
- * @throws Exception
- */
- public void testNoInterfaceViewAccess() throws Exception
- {
- Context ctx = new InitialContext();
- AccountManager accountMgr = (AccountManager) ctx.lookup(AccountManagerBean.JNDI_NAME);
-
- long dummyAccountNumber = 123;
- // credit 50 dollars (Note that the current balance is hard coded in the bean to 100)
- // so after crediting, the current balance is going to be 150
- int currentBalance = accountMgr.credit(dummyAccountNumber, 50);
-
- assertEquals("Unexpected account balance after credit", 150, currentBalance);
-
- // now let's debit 10 dollars (Note that the current balance is again hard coded in the bean to 100).
- // So after debiting, the current balance is going to be 90
- currentBalance = accountMgr.debit(dummyAccountNumber, 10);
-
- assertEquals("Unexpected account balance after debit", 90, currentBalance);
- }
-
-
-}
Copied: trunk/testsuite/src/main/org/jboss/test/ejb3/nointerface/unit/EJB31NoInterfaceViewUnitTestCase.java (from rev 103743, trunk/testsuite/src/main/org/jboss/test/ejb3/nointerface/unit/EJB31NoInterfaceViewTestCase.java)
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/nointerface/unit/EJB31NoInterfaceViewUnitTestCase.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/nointerface/unit/EJB31NoInterfaceViewUnitTestCase.java 2010-04-09 10:27:23 UTC (rev 103749)
@@ -0,0 +1,72 @@
+/**
+ *
+ */
+package org.jboss.test.ejb3.nointerface.unit;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+
+import junit.framework.Test;
+
+import org.jboss.test.JBossTestCase;
+import org.jboss.test.ejb3.nointerface.AccountManager;
+import org.jboss.test.ejb3.nointerface.AccountManagerBean;
+import org.jboss.test.ejb3.nointerface.Calculator;
+
+/**
+ * EJB31NoInterfaceViewTestCase
+ *
+ * Tests EJB3.1 no-interface view support
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public class EJB31NoInterfaceViewUnitTestCase extends JBossTestCase
+{
+
+ /**
+ *
+ * @param name
+ */
+ public EJB31NoInterfaceViewUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ /**
+ *
+ * @return
+ * @throws Exception
+ */
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(EJB31NoInterfaceViewUnitTestCase.class, "ejb31nointerface.jar");
+ }
+
+ /**
+ * Tests (indirect) access to a no-interface view bean ({@link Calculator})
+ *
+ * @see Calculator and it's usage in {@link AccountManagerBean}
+ * @throws Exception
+ */
+ public void testNoInterfaceViewAccess() throws Exception
+ {
+ Context ctx = new InitialContext();
+ AccountManager accountMgr = (AccountManager) ctx.lookup(AccountManagerBean.JNDI_NAME);
+
+ long dummyAccountNumber = 123;
+ // credit 50 dollars (Note that the current balance is hard coded in the bean to 100)
+ // so after crediting, the current balance is going to be 150
+ int currentBalance = accountMgr.credit(dummyAccountNumber, 50);
+
+ assertEquals("Unexpected account balance after credit", 150, currentBalance);
+
+ // now let's debit 10 dollars (Note that the current balance is again hard coded in the bean to 100).
+ // So after debiting, the current balance is going to be 90
+ currentBalance = accountMgr.debit(dummyAccountNumber, 10);
+
+ assertEquals("Unexpected account balance after debit", 90, currentBalance);
+ }
+
+
+}
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/war/deployment/CalculatorInWEBINFClasses.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/war/deployment/CalculatorInWEBINFClasses.java 2010-04-09 10:21:51 UTC (rev 103748)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/war/deployment/CalculatorInWEBINFClasses.java 2010-04-09 10:27:23 UTC (rev 103749)
@@ -5,8 +5,8 @@
import javax.ejb.Stateless;
-import org.jboss.test.ejb3.war.deployment.unit.Ejb3WarDeploymentTestCase;
+
/**
* CalculatorInWEBINFClasses
*
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/war/deployment/CounterBeanInWEBINFLibJar.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/war/deployment/CounterBeanInWEBINFLibJar.java 2010-04-09 10:21:51 UTC (rev 103748)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/war/deployment/CounterBeanInWEBINFLibJar.java 2010-04-09 10:27:23 UTC (rev 103749)
@@ -7,8 +7,8 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.test.ejb3.war.deployment.unit.Ejb3WarDeploymentTestCase;
+
/**
* CounterBeanInWEBINFLibJar
*
Modified: trunk/testsuite/src/main/org/jboss/test/ejb3/war/deployment/CounterDelegateBeanInWarEjbJarXml.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/war/deployment/CounterDelegateBeanInWarEjbJarXml.java 2010-04-09 10:21:51 UTC (rev 103748)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/war/deployment/CounterDelegateBeanInWarEjbJarXml.java 2010-04-09 10:27:23 UTC (rev 103749)
@@ -5,8 +5,8 @@
import javax.ejb.EJB;
-import org.jboss.test.ejb3.war.deployment.unit.Ejb3WarDeploymentTestCase;
+
/**
* CounterDelegateBeanInWarEjbJarXml
*
Deleted: trunk/testsuite/src/main/org/jboss/test/ejb3/war/deployment/unit/Ejb3WarDeploymentTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/war/deployment/unit/Ejb3WarDeploymentTestCase.java 2010-04-09 10:21:51 UTC (rev 103748)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/war/deployment/unit/Ejb3WarDeploymentTestCase.java 2010-04-09 10:27:23 UTC (rev 103749)
@@ -1,70 +0,0 @@
-/**
- *
- */
-package org.jboss.test.ejb3.war.deployment.unit;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-import org.jboss.test.ejb3.war.deployment.Counter;
-
-/**
- * Ejb3WarDeploymentTestCase
- *
- * TestCase for testing the deployment of EJBs through .war files as defined
- * in EJB3.1 Spec, Section 20.4.
- *
- * @see https://jira.jboss.org/jira/browse/JBAS-7639
- * @author Jaikiran Pai
- * @version $Revision: $
- */
-public class Ejb3WarDeploymentTestCase extends JBossTestCase
-{
-
- public Ejb3WarDeploymentTestCase(String name)
- {
- super(name);
- }
-
- /**
- *
- * @return
- * @throws Exception
- */
- public static Test suite() throws Exception
- {
- return getDeploySetup(Ejb3WarDeploymentTestCase.class, "ejb3war.war");
- }
-
- /**
- * Tests that the beans deployed through a .war, in various ways (WEB-INF/ejb-jar.xml,
- * WEB-INF/lib/<somejar>.jar, WEB-INF/classes) works correctly.
- *
- * @throws Exception
- */
- public void testEjbDeploymentInWar() throws Exception
- {
- Context ctx = new InitialContext();
- Counter counter = (Counter) ctx.lookup("CounterDelegateBean/remote");
-
- int count = counter.increment();
- assertEquals("Unexpected count after increment", 1, count);
-
- // increment one more time
- count = counter.increment();
- assertEquals("Unexpected count after second increment", 2, count);
-
- // now decrement
- count = counter.decrement();
- assertEquals("Unexpected count after decrement", 1, count);
-
- // decrement one more time
- count = counter.decrement();
- assertEquals("Unexpected count after second decrement", 0, count);
-
- }
-
-}
Copied: trunk/testsuite/src/main/org/jboss/test/ejb3/war/deployment/unit/Ejb3WarDeploymentUnitTestCase.java (from rev 103743, trunk/testsuite/src/main/org/jboss/test/ejb3/war/deployment/unit/Ejb3WarDeploymentTestCase.java)
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb3/war/deployment/unit/Ejb3WarDeploymentUnitTestCase.java (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/ejb3/war/deployment/unit/Ejb3WarDeploymentUnitTestCase.java 2010-04-09 10:27:23 UTC (rev 103749)
@@ -0,0 +1,70 @@
+/**
+ *
+ */
+package org.jboss.test.ejb3.war.deployment.unit;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+
+import junit.framework.Test;
+
+import org.jboss.test.JBossTestCase;
+import org.jboss.test.ejb3.war.deployment.Counter;
+
+/**
+ * Ejb3WarDeploymentTestCase
+ *
+ * TestCase for testing the deployment of EJBs through .war files as defined
+ * in EJB3.1 Spec, Section 20.4.
+ *
+ * @see https://jira.jboss.org/jira/browse/JBAS-7639
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public class Ejb3WarDeploymentUnitTestCase extends JBossTestCase
+{
+
+ public Ejb3WarDeploymentUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ /**
+ *
+ * @return
+ * @throws Exception
+ */
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(Ejb3WarDeploymentUnitTestCase.class, "ejb3war.war");
+ }
+
+ /**
+ * Tests that the beans deployed through a .war, in various ways (WEB-INF/ejb-jar.xml,
+ * WEB-INF/lib/<somejar>.jar, WEB-INF/classes) works correctly.
+ *
+ * @throws Exception
+ */
+ public void testEjbDeploymentInWar() throws Exception
+ {
+ Context ctx = new InitialContext();
+ Counter counter = (Counter) ctx.lookup("CounterDelegateBean/remote");
+
+ int count = counter.increment();
+ assertEquals("Unexpected count after increment", 1, count);
+
+ // increment one more time
+ count = counter.increment();
+ assertEquals("Unexpected count after second increment", 2, count);
+
+ // now decrement
+ count = counter.decrement();
+ assertEquals("Unexpected count after decrement", 1, count);
+
+ // decrement one more time
+ count = counter.decrement();
+ assertEquals("Unexpected count after second decrement", 0, count);
+
+ }
+
+}
More information about the jboss-cvs-commits
mailing list