jtolentino 2005/09/23 03:44:16
Modified:
m2/unit-tests/openejb-builder/src/test/java/org/openejb/deployment
AbstractDeploymentTest.java
CMPEntityBuilderTest.java EarDeploymentTest.java
EjbJarModuleDeploymentTest.java
UnpackedModuleDeploymentTest.java
Log:
Synched unit tests and new dependencies.
Revision Changes Path
1.2 +1 -1
openejb/m2/unit-tests/openejb-builder/src/test/java/org/openejb/deployment/AbstractDeploymentTest.java
Index: AbstractDeploymentTest.java
===================================================================
RCS file:
/scm/openejb/openejb/m2/unit-tests/openejb-builder/src/test/java/org/openejb/deployment/AbstractDeploymentTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractDeploymentTest.java 22 Sep 2005 08:48:42 -0000 1.1
+++ AbstractDeploymentTest.java 23 Sep 2005 07:44:16 -0000 1.2
@@ -122,7 +122,7 @@
true,
"org.openejb.test.simple.slsb.SimpleStatelessSessionHome",
"org.openejb.test.simple.slsb.SimpleStatelessSession");
proxyReference.setKernel(getKernel());
- proxyReference.setClassLoader(new URLClassLoader(new URL[] {new
File(System.getProperty( "basedir", System.getProperty( "user.dir" ) ),
"target/test-ejb-jar.jar").toURL()}, getClass().getClassLoader()));
+ proxyReference.setClassLoader(new URLClassLoader(new URL[] {new
File(System.getProperty("basedir", System.getProperty("user.dir")),
"target/test-ejb-jar.jar").toURL()}, getClass().getClassLoader()));
statelessHome = proxyReference.getContent();
assertTrue("Home is not an instance of EJBHome", statelessHome
instanceof EJBHome);
stateless = statelessHome.getClass().getMethod("create",
null).invoke(statelessHome, null);
1.2 +16 -20
openejb/m2/unit-tests/openejb-builder/src/test/java/org/openejb/deployment/CMPEntityBuilderTest.java
Index: CMPEntityBuilderTest.java
===================================================================
RCS file:
/scm/openejb/openejb/m2/unit-tests/openejb-builder/src/test/java/org/openejb/deployment/CMPEntityBuilderTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CMPEntityBuilderTest.java 22 Sep 2005 08:48:42 -0000 1.1
+++ CMPEntityBuilderTest.java 23 Sep 2005 07:44:16 -0000 1.2
@@ -74,7 +74,6 @@
import org.openejb.deployment.pkgen.TranQLPKGenBuilder;
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarDocument;
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
-import org.tranql.cache.GlobalSchema;
import org.tranql.ejb.EJBSchema;
import org.tranql.schema.Association;
import org.tranql.schema.AssociationEnd;
@@ -82,8 +81,8 @@
import org.tranql.schema.Entity;
import org.tranql.schema.FKAttribute;
import org.tranql.schema.Association.JoinDefinition;
+import org.tranql.sql.SQLSchema;
import org.tranql.sql.Table;
-import org.tranql.sql.sql92.SQL92Schema;
/**
*
@@ -144,10 +143,6 @@
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
TranQLPKGenBuilder pkGen = new TranQLPKGenBuilder();
- GlobalSchema globalSchema = new GlobalSchema("Test");
- EJBSchema ejbSchema = new EJBSchema("Test");
- SQL92Schema sqlSchema = new SQL92Schema("Test", null, null);
-
File tempDir = DeploymentUtil.createTempDir();
try {
EARContext earContext = new EARContext(tempDir,
@@ -163,7 +158,10 @@
null, null);
J2eeContext moduleJ2eeContext = new
J2eeContextImpl("geronimo.server", "TestGeronimoServer", "null",
NameFactory.EJB_MODULE, "MockModule", null, null);
ClassLoader cl = Thread.currentThread().getContextClassLoader();
- builder.buildCMPSchema(earContext, moduleJ2eeContext,
ejbJarType, openejbJarType, cl, ejbSchema, sqlSchema, globalSchema, pkGen,
null);
+ Schemata schemata = builder.buildSchemata(earContext,
moduleJ2eeContext, "Test", ejbJarType, openejbJarType, cl, pkGen, null, null);
+
+ EJBSchema ejbSchema = schemata.getEjbSchema();
+ SQLSchema sqlSchema = schemata.getSqlSchema();
assertOneToOneEntity(ejbSchema.getEntity("A"),
ejbSchema.getEntity("B"));
assertOneToOneEntity(sqlSchema.getEntity("A"),
sqlSchema.getEntity("B"));
@@ -190,10 +188,6 @@
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
TranQLPKGenBuilder pkGen = new TranQLPKGenBuilder();
- GlobalSchema globalSchema = new GlobalSchema("Test");
- EJBSchema ejbSchema = new EJBSchema("Test");
- SQL92Schema sqlSchema = new SQL92Schema("Test", null, null);
-
File tempDir = DeploymentUtil.createTempDir();
try {
EARContext earContext = new EARContext(tempDir,
@@ -209,8 +203,11 @@
null, null);
J2eeContext moduleJ2eeContext = new
J2eeContextImpl("geronimo.server", "TestGeronimoServer", "null",
NameFactory.EJB_MODULE, "MockModule", null, null);
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
- builder.buildCMPSchema(earContext, moduleJ2eeContext,
ejbJarType, openejbJarType, cl, ejbSchema, sqlSchema, globalSchema, pkGen,
null);
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ Schemata schemata = builder.buildSchemata(earContext,
moduleJ2eeContext, "Test", ejbJarType, openejbJarType, cl, pkGen, null, null);
+
+ EJBSchema ejbSchema = schemata.getEjbSchema();
+ SQLSchema sqlSchema = schemata.getSqlSchema();
assertOneToManyEntity(ejbSchema.getEntity("A"),
ejbSchema.getEntity("B"));
assertOneToManyEntity(sqlSchema.getEntity("A"),
sqlSchema.getEntity("B"));
@@ -237,10 +234,6 @@
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
TranQLPKGenBuilder pkGen = new TranQLPKGenBuilder();
- GlobalSchema globalSchema = new GlobalSchema("Test");
- EJBSchema ejbSchema = new EJBSchema("Test");
- SQL92Schema sqlSchema = new SQL92Schema("Test", null, null);
-
File tempDir = DeploymentUtil.createTempDir();
try {
EARContext earContext = new EARContext(tempDir,
@@ -256,8 +249,11 @@
null, null);
J2eeContext moduleJ2eeContext = new
J2eeContextImpl("geronimo.server", "TestGeronimoServer", "null",
NameFactory.EJB_MODULE, "MockModule", null, null);
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
- builder.buildCMPSchema(earContext, moduleJ2eeContext,
ejbJarType, openejbJarType, cl, ejbSchema, sqlSchema, globalSchema, pkGen,
null);
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ Schemata schemata = builder.buildSchemata(earContext,
moduleJ2eeContext, "Test", ejbJarType, openejbJarType, cl, pkGen, null, null);
+
+ EJBSchema ejbSchema = schemata.getEjbSchema();
+ SQLSchema sqlSchema = schemata.getSqlSchema();
assertManyToManyEntity(ejbSchema.getEntity("A"),
ejbSchema.getEntity("B"));
assertManyToManyEntity(sqlSchema.getEntity("A"),
sqlSchema.getEntity("B"));
1.2 +2 -3
openejb/m2/unit-tests/openejb-builder/src/test/java/org/openejb/deployment/EarDeploymentTest.java
Index: EarDeploymentTest.java
===================================================================
RCS file:
/scm/openejb/openejb/m2/unit-tests/openejb-builder/src/test/java/org/openejb/deployment/EarDeploymentTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EarDeploymentTest.java 22 Sep 2005 08:48:42 -0000 1.1
+++ EarDeploymentTest.java 23 Sep 2005 07:44:16 -0000 1.2
@@ -51,7 +51,6 @@
import junit.framework.Test;
import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.Kernel;
/**
* @version $Revision$ $Date$
@@ -59,7 +58,7 @@
public class EarDeploymentTest extends AbstractDeploymentTest {
private static final DeploymentTestSuite SUITE =
- new DeploymentTestSuite(EarDeploymentTest.class, new File(
System.getProperty( "basedir", System.getProperty( "user.dir" ) ),
"target/test-ear.ear"));
+ new DeploymentTestSuite(EarDeploymentTest.class, new
File(System.getProperty("basedir", System.getProperty("user.dir")),
"target/test-ear.ear"));
public static Test suite() {
return SUITE;
1.2 +2 -3
openejb/m2/unit-tests/openejb-builder/src/test/java/org/openejb/deployment/EjbJarModuleDeploymentTest.java
Index: EjbJarModuleDeploymentTest.java
===================================================================
RCS file:
/scm/openejb/openejb/m2/unit-tests/openejb-builder/src/test/java/org/openejb/deployment/EjbJarModuleDeploymentTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EjbJarModuleDeploymentTest.java 22 Sep 2005 08:48:42 -0000 1.1
+++ EjbJarModuleDeploymentTest.java 23 Sep 2005 07:44:16 -0000 1.2
@@ -51,14 +51,13 @@
import junit.framework.Test;
import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.Kernel;
/**
* @version $Revision$ $Date$
*/
public class EjbJarModuleDeploymentTest extends AbstractDeploymentTest {
private static final DeploymentTestSuite SUITE =
- new DeploymentTestSuite(EjbJarModuleDeploymentTest.class, new
File(System.getProperty( "basedir", System.getProperty( "user.dir" ) ),
"target/test-ejb-jar.jar"));
+ new DeploymentTestSuite(EjbJarModuleDeploymentTest.class, new
File(System.getProperty("basedir", System.getProperty("user.dir")),
"target/test-ejb-jar.jar"));
public static Test suite() {
return SUITE;
1.2 +1 -1
openejb/m2/unit-tests/openejb-builder/src/test/java/org/openejb/deployment/UnpackedModuleDeploymentTest.java
Index: UnpackedModuleDeploymentTest.java
===================================================================
RCS file:
/scm/openejb/openejb/m2/unit-tests/openejb-builder/src/test/java/org/openejb/deployment/UnpackedModuleDeploymentTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UnpackedModuleDeploymentTest.java 22 Sep 2005 08:48:42 -0000 1.1
+++ UnpackedModuleDeploymentTest.java 23 Sep 2005 07:44:16 -0000 1.2
@@ -57,7 +57,7 @@
*/
public class UnpackedModuleDeploymentTest extends AbstractDeploymentTest {
private static final DeploymentTestSuite SUITE =
- new DeploymentTestSuite(UnpackedModuleDeploymentTest.class, new
File(System.getProperty( "basedir", System.getProperty( "user.dir" ) ),
"target/test-ejb-jar"));
+ new DeploymentTestSuite(UnpackedModuleDeploymentTest.class, new
File(System.getProperty("basedir", System.getProperty("user.dir")),
"target/test-ejb-jar"));
public static Test suite() {
return SUITE;
