[jboss-cvs] JBossAS SVN: r91747 - in projects/embedded/trunk/testsuite-full-dep/src/test/java/org/jboss: embedded/testsuite/fulldep/ejb3/entity and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 28 18:24:37 EDT 2009
Author: ALRubinger
Date: 2009-07-28 18:24:36 -0400 (Tue, 28 Jul 2009)
New Revision: 91747
Modified:
projects/embedded/trunk/testsuite-full-dep/src/test/java/org/jboss/ServerTestCase.java
projects/embedded/trunk/testsuite-full-dep/src/test/java/org/jboss/embedded/testsuite/fulldep/ejb3/entity/Jbossian.java
projects/embedded/trunk/testsuite-full-dep/src/test/java/org/jboss/embedded/testsuite/fulldep/ejb3/entity/JbossianRegistrarBean.java
Log:
[EMB-32] Added DS/EJB3 Entity tests, working with some caveats (Needs x86, @Entity scanning not working)
Modified: projects/embedded/trunk/testsuite-full-dep/src/test/java/org/jboss/ServerTestCase.java
===================================================================
--- projects/embedded/trunk/testsuite-full-dep/src/test/java/org/jboss/ServerTestCase.java 2009-07-28 22:19:01 UTC (rev 91746)
+++ projects/embedded/trunk/testsuite-full-dep/src/test/java/org/jboss/ServerTestCase.java 2009-07-28 22:24:36 UTC (rev 91747)
@@ -27,6 +27,7 @@
import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@@ -59,6 +60,9 @@
import org.jboss.embedded.core.incubation.virtual.api.VirtualArchiveFactory;
import org.jboss.embedded.core.server.JBossASEmbeddedServer;
import org.jboss.embedded.core.server.JBossASEmbeddedServerImpl;
+import org.jboss.embedded.testsuite.fulldep.ejb3.entity.Jbossian;
+import org.jboss.embedded.testsuite.fulldep.ejb3.entity.JbossianRegistrarBean;
+import org.jboss.embedded.testsuite.fulldep.ejb3.entity.JbossianRegistrarLocalBusiness;
import org.jboss.embedded.testsuite.fulldep.ejb3.mdb.MessageStoringMdb;
import org.jboss.embedded.testsuite.fulldep.ejb3.slsb.OutputBean;
import org.jboss.embedded.testsuite.fulldep.ejb3.slsb.OutputLocalBusiness;
@@ -397,59 +401,63 @@
* (so we explicitly put it there in persistence.xml)
* 2) Permgen / OOM problems, even on huge heap. Why?
*/
- // /**
- // * Tests deployment of a JCA DataSource and EJB3 Entity Bean (JPA)
- // *
- // * A test SLSB will also be used to create a few rows in the DB,
- // * then obtain all.
- // *
- // * @throws Exception
- // */
- // @Test
- // public void testDataSourceAndEntity() throws Exception
- // {
- // // Log
- // log.info("testDataSourceAndEntity");
- //
- // // Create a virtual archive for DS, persistence.xml, Entity, and SLSB
- // final URL base = this.getBase();
- // final VirtualVfsArchive deployment = new VirtualVfsArchiveImpl("datasource-entity-test.jar").addClasses(
- // Jbossian.class, JbossianRegistrarLocalBusiness.class, JbossianRegistrarBean.class).addResource(
- // new URL(base, PATH_RESOURCE_DS_XML_EMBEDDED), FILENAME_EMBEDDED_DS).addResource(
- // new URL(base, PATH_RESOURCE_PERSISTENCE_XML_EMBEDDED), PATH_DESTINATION_PERSISTENCE_XML);
- //
- // // Deploy
- // log.info(deployment.toString(true));
- // server.deploy(deployment);
- //
- // // Make some JBossians
- // final Jbossian jgreene = new Jbossian("Jason T. Greene", "AS Hole", 12);
- // final Jbossian jpederse = new Jbossian("Jesper Pedersen", "Professional Tattletale", 21);
- // final Jbossian dmlloyd = new Jbossian("David M. Lloyd", "???????", 15);
- // final Jbossian wolfc = new Jbossian("Carlo de Wolf", "Head of Deep Voice", 13);
- // final Jbossian alr = new Jbossian("Andew Lee Rubinger", "The New Fluery", 58);
- // final Jbossian asaldhan = new Jbossian("Anil Saldhana", "Karma Police", 23);
- //
- // // Get an SLSB to interact w/ the DB
- // final JbossianRegistrarLocalBusiness slsb = (JbossianRegistrarLocalBusiness) NAMING_CONTEXT
- // .lookup(JbossianRegistrarBean.class.getSimpleName() + JNDI_SUFFIX_LOCAL_BUSINESS);
- //
- // // Add the JBossians
- // slsb.add(jgreene);
- // slsb.add(jpederse);
- // slsb.add(dmlloyd);
- // slsb.add(wolfc);
- // slsb.add(alr);
- // slsb.add(asaldhan);
- //
- // // Get all
- // final Collection<Jbossian> jbossians = slsb.getAllJbossians();
- // log.info("Got all JBossians: " + jbossians);
- //
- // // Test
- // Assert.assertEquals(6, jbossians.size());
- // }
+ /**
+ * Tests deployment of a JCA DataSource and EJB3 Entity Bean (JPA)
+ *
+ * A test SLSB will also be used to create a few rows in the DB,
+ * then obtain all.
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testDataSourceAndEntity() throws Exception
+ {
+ // Log
+ log.info("testDataSourceAndEntity");
+ // Create a virtual archive for DS, persistence.xml, Entity, and SLSB
+ final URL base = this.getBase();
+ final VirtualArchive archive = VirtualArchiveFactory.createVirtualArchive("datasource-entity-test.jar")
+ .addClasses(Jbossian.class, JbossianRegistrarLocalBusiness.class, JbossianRegistrarBean.class).addResource(
+ new URL(base, PATH_RESOURCE_DS_XML_EMBEDDED), FILENAME_EMBEDDED_DS).addResource(
+ new URL(base, PATH_RESOURCE_PERSISTENCE_XML_EMBEDDED), PATH_DESTINATION_PERSISTENCE_XML);
+ final Deployable deployable = DeployableFactory.createDeployable(archive);
+
+ // Deploy
+ log.info(archive.toString(true));
+ server.deploy(deployable);
+
+ // Make some JBossians
+ final Jbossian jgreene = new Jbossian("Jason T. Greene", "AS Hole", 12);
+ final Jbossian jpederse = new Jbossian("Jesper Pedersen", "Professional Tattletale", 21);
+ final Jbossian dmlloyd = new Jbossian("David M. Lloyd", "???????", 15);
+ final Jbossian wolfc = new Jbossian("Carlo de Wolf", "Superlead", 13);
+ final Jbossian alr = new Jbossian("Andew Lee Rubinger", "The New Fluery", 58);
+ final Jbossian asaldhan = new Jbossian("Anil Saldhana", "Karma Police", 23);
+
+ // Get an SLSB to interact w/ the DB
+ final JbossianRegistrarLocalBusiness slsb = (JbossianRegistrarLocalBusiness) NAMING_CONTEXT
+ .lookup(JbossianRegistrarBean.class.getSimpleName() + JNDI_SUFFIX_LOCAL_BUSINESS);
+
+ // Add the JBossians
+ slsb.add(jgreene);
+ slsb.add(jpederse);
+ slsb.add(dmlloyd);
+ slsb.add(wolfc);
+ slsb.add(alr);
+ slsb.add(asaldhan);
+
+ // Get all
+ final Collection<Jbossian> jbossians = slsb.getAllJbossians();
+ log.info("Got all JBossians: " + jbossians);
+
+ // Test
+ Assert.assertEquals(6, jbossians.size());
+
+ // Undeploy
+ server.undeploy(deployable);
+ }
+
//-------------------------------------------------------------------------------------||
// Internal Helper Methods ------------------------------------------------------------||
//-------------------------------------------------------------------------------------||
Modified: projects/embedded/trunk/testsuite-full-dep/src/test/java/org/jboss/embedded/testsuite/fulldep/ejb3/entity/Jbossian.java
===================================================================
--- projects/embedded/trunk/testsuite-full-dep/src/test/java/org/jboss/embedded/testsuite/fulldep/ejb3/entity/Jbossian.java 2009-07-28 22:19:01 UTC (rev 91746)
+++ projects/embedded/trunk/testsuite-full-dep/src/test/java/org/jboss/embedded/testsuite/fulldep/ejb3/entity/Jbossian.java 2009-07-28 22:24:36 UTC (rev 91747)
@@ -81,6 +81,14 @@
//-------------------------------------------------------------------------------------||
/**
+ * Default, no-arg constructor
+ */
+ public Jbossian()
+ {
+
+ }
+
+ /**
* Constructor to set all properties
*/
public Jbossian(final String name, final String role, final int age)
@@ -143,10 +151,6 @@
this.age = age;
}
- //-------------------------------------------------------------------------------------||
- // Overridden Implementations ---------------------------------------------------------||
- //-------------------------------------------------------------------------------------||
-
/**
* @return the id
*/
@@ -163,6 +167,10 @@
this.id = id;
}
+ //-------------------------------------------------------------------------------------||
+ // Overridden Implementations ---------------------------------------------------------||
+ //-------------------------------------------------------------------------------------||
+
/* (non-Javadoc)
* @see java.lang.Object#toString()
*/
Modified: projects/embedded/trunk/testsuite-full-dep/src/test/java/org/jboss/embedded/testsuite/fulldep/ejb3/entity/JbossianRegistrarBean.java
===================================================================
--- projects/embedded/trunk/testsuite-full-dep/src/test/java/org/jboss/embedded/testsuite/fulldep/ejb3/entity/JbossianRegistrarBean.java 2009-07-28 22:19:01 UTC (rev 91746)
+++ projects/embedded/trunk/testsuite-full-dep/src/test/java/org/jboss/embedded/testsuite/fulldep/ejb3/entity/JbossianRegistrarBean.java 2009-07-28 22:24:36 UTC (rev 91747)
@@ -51,7 +51,7 @@
*/
private static final Logger log = Logger.getLogger(JbossianRegistrarBean.class);
- private static final String EJBQL_ALL_JBOSSIANS = "SELECT o FROM " + Jbossian.class.getSimpleName() + "o";
+ private static final String EJBQL_ALL_JBOSSIANS = "SELECT o FROM " + Jbossian.class.getSimpleName() + " o";
//-------------------------------------------------------------------------------------||
// Instance Members -------------------------------------------------------------------||
@@ -76,7 +76,7 @@
// Precondition check
if (jbossian == null)
{
- throw new IllegalArgumentException("jbossian mus tbe specified");
+ throw new IllegalArgumentException("jbossian must be specified");
}
// Persist
More information about the jboss-cvs-commits
mailing list