djencks 2005/06/25 14:48:20
Modified: modules/openejb-builder/src/test/org/openejb/deployment
CMPEntityBuilderTest.java DeploymentTestSuite.java
PlanParsingTest.java
Log:
GERONIMO-685 (partial) Stop compiling ties we don't use
Revision Changes Path
1.13 +23 -23
openejb/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTest.java
Index: CMPEntityBuilderTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CMPEntityBuilderTest.java 17 May 2005 15:49:38 -0000 1.12
+++ CMPEntityBuilderTest.java 25 Jun 2005 18:48:19 -0000 1.13
@@ -112,20 +112,20 @@
public void testOneToOneUnidirectional() throws Exception {
executeOneToOne("src/test-cmp/onetoone/simplepk/ejb-jar.xml",
"src/test-cmp/onetoone/simplepk/unidirectional-openejb-jar.xml");
}
-
+
private void executeOneToOne(String ejbJarFileName, String
openejbJarFileName) throws Exception {
File ejbJarFile = new File(basedir, ejbJarFileName);
File openejbJarFile = new File(basedir, openejbJarFileName);
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
-
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener,
skeletonGenerator, repository);
+
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener, repository);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
-
+
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,
@@ -153,20 +153,20 @@
public void testOneToMany() throws Exception {
executeOneToMany("src/test-cmp/onetomany/simplepk/ejb-jar.xml",
"src/test-cmp/onetomany/simplepk/openejb-jar.xml");
}
-
+
public void testOneToManyUnidirectional() throws Exception {
executeOneToMany("src/test-cmp/onetomany/simplepk/ejb-jar.xml",
"src/test-cmp/onetomany/simplepk/unidirectional-openejb-jar.xml");
}
-
+
public void executeOneToMany(String ejbJarFileName, String
openejbJarFileName) throws Exception {
File ejbJarFile = new File(basedir, ejbJarFileName);
File openejbJarFile = new File(basedir, openejbJarFileName);
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
-
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener,
skeletonGenerator, repository);
+
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener, repository);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
-
+
GlobalSchema globalSchema = new GlobalSchema("Test");
EJBSchema ejbSchema = new EJBSchema("Test");
SQL92Schema sqlSchema = new SQL92Schema("Test", null, null);
@@ -199,7 +199,7 @@
public void testManyToMany() throws Exception {
executeManyToMany("src/test-cmp/manytomany/simplepk/ejb-jar.xml",
"src/test-cmp/manytomany/simplepk/openejb-jar.xml");
}
-
+
public void testManyToManyUnidirectional() throws Exception {
executeManyToMany("src/test-cmp/manytomany/simplepk/ejb-jar.xml",
"src/test-cmp/manytomany/simplepk/unidirectional-openejb-jar.xml");
}
@@ -209,14 +209,14 @@
File openejbJarFile = new File(basedir, openejbJarFileName);
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
-
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener,
skeletonGenerator, repository);
+
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener, repository);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
-
+
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,
@@ -308,21 +308,21 @@
assertEquals("a", fkEnd.getName());
assertEquals(rightEntity, pkEnd.getEntity());
assertEquals(leftEntity, fkEnd.getEntity());
-
+
Association association = pkEnd.getAssociation();
assertTrue(association == fkEnd.getAssociation());
}
private void assertOneToOneEntity(Entity pkEntity, Entity fkEntity) {
assertEntity(pkEntity, fkEntity);
-
+
List pkEnds = pkEntity.getAssociationEnds();
List fkEnds = fkEntity.getAssociationEnds();
AssociationEnd pkEnd = (AssociationEnd) pkEnds.get(0);
assertTrue(pkEnd.isSingle());
AssociationEnd fkEnd = (AssociationEnd) fkEnds.get(0);
assertTrue(fkEnd.isSingle());
-
+
Association association = pkEnd.getAssociation();
assertTrue(association.isOneToOne());
JoinDefinition joinDefinition = association.getJoinDefinition();
@@ -342,14 +342,14 @@
private void assertOneToManyEntity(Entity pkEntity, Entity fkEntity) {
assertEntity(pkEntity, fkEntity);
-
+
List pkEnds = pkEntity.getAssociationEnds();
List fkEnds = fkEntity.getAssociationEnds();
AssociationEnd pkEnd = (AssociationEnd) pkEnds.get(0);
assertTrue(pkEnd.isMulti());
AssociationEnd fkEnd = (AssociationEnd) fkEnds.get(0);
assertTrue(fkEnd.isSingle());
-
+
Association association = pkEnd.getAssociation();
assertTrue(association.isOneToMany(pkEnd));
assertTrue(association.isManyToOne(fkEnd));
@@ -370,14 +370,14 @@
private void assertManyToManyEntity(Entity leftEntity, Entity
rightEntity) {
assertEntity(leftEntity, rightEntity);
-
+
List leftEnds = leftEntity.getAssociationEnds();
List rightEnds = rightEntity.getAssociationEnds();
AssociationEnd leftEnd = (AssociationEnd) leftEnds.get(0);
assertTrue(leftEnd.isMulti());
AssociationEnd rightEnd = (AssociationEnd) rightEnds.get(0);
assertTrue(rightEnd.isMulti());
-
+
Association association = leftEnd.getAssociation();
Entity mtmEntity = association.getManyToManyEntity();
assertTrue(association.isManyToMany());
1.6 +2 -2
openejb/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java
Index: DeploymentTestSuite.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DeploymentTestSuite.java 8 May 2005 19:37:14 -0000 1.5
+++ DeploymentTestSuite.java 25 Jun 2005 18:48:20 -0000 1.6
@@ -154,7 +154,7 @@
ObjectName listener = null;
OpenORBSkeletonGenerator skeletonGenerator = new
OpenORBSkeletonGenerator(cl);
skeletonGenerator.doStart();
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener,
skeletonGenerator, null);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener, null);
tempDir = DeploymentUtil.createTempDir();
EARConfigBuilder earConfigBuilder = new
EARConfigBuilder(KernelHelper.DEFAULT_PARENTID,
1.7 +1 -1
openejb/modules/openejb-builder/src/test/org/openejb/deployment/PlanParsingTest.java
Index: PlanParsingTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/PlanParsingTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PlanParsingTest.java 23 Feb 2005 18:13:28 -0000 1.6
+++ PlanParsingTest.java 25 Jun 2005 18:48:20 -0000 1.7
@@ -13,7 +13,7 @@
private Repository repository = null;
private Kernel kernel = null;
- private OpenEJBModuleBuilder builder = new OpenEJBModuleBuilder(null,
null, null, repository);
+ private OpenEJBModuleBuilder builder = new OpenEJBModuleBuilder(null,
null, repository);
File basedir = new File(System.getProperty("basedir", "."));
public void testResourceRef() throws Exception {
