Add simple test to ensure overrides from openejb-cmp-orm.xml work
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/fd73c7c9 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/fd73c7c9 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/fd73c7c9 Branch: refs/heads/tomee-7.0.x Commit: fd73c7c967a2e1a2cedef0ffc245c05b0456ded6 Parents: 68004b3 Author: Jonathan Gallimore <[email protected]> Authored: Fri Nov 16 12:39:20 2018 +0000 Committer: Otavio Santana <[email protected]> Committed: Mon Dec 17 08:59:40 2018 -0200 ---------------------------------------------------------------------- .../openejb/core/LegacyInterfaceTest.java | 77 -------------------- 1 file changed, 77 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/fd73c7c9/container/openejb-core/src/test/java/org/apache/openejb/core/LegacyInterfaceTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/LegacyInterfaceTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/LegacyInterfaceTest.java index 30b433f..7e106a9 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/LegacyInterfaceTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/LegacyInterfaceTest.java @@ -24,7 +24,6 @@ import org.apache.openejb.assembler.classic.TransactionServiceInfo; import org.apache.openejb.config.AppModule; import org.apache.openejb.config.ConfigurationFactory; import org.apache.openejb.config.EjbModule; -import org.apache.openejb.config.PersistenceModule; import org.apache.openejb.core.ivm.naming.InitContextFactory; import org.apache.openejb.jee.CmpField; import org.apache.openejb.jee.ContainerTransaction; @@ -35,20 +34,6 @@ import org.apache.openejb.jee.Query; import org.apache.openejb.jee.QueryMethod; import org.apache.openejb.jee.SingletonBean; import org.apache.openejb.jee.TransAttribute; -<<<<<<< HEAD -import org.apache.openejb.jee.jpa.*; -======= -import org.apache.openejb.jee.jpa.Attributes; -import org.apache.openejb.jee.jpa.Basic; -import org.apache.openejb.jee.jpa.Column; -import org.apache.openejb.jee.jpa.Entity; -import org.apache.openejb.jee.jpa.EntityMappings; -import org.apache.openejb.jee.jpa.Id; -import org.apache.openejb.jee.jpa.NamedQuery; -import org.apache.openejb.jee.jpa.unit.Persistence; -import org.apache.openejb.jee.jpa.unit.PersistenceUnit; -import org.apache.openejb.jee.jpa.unit.TransactionType; ->>>>>>> c8a734467d... TOMEE-2295 use single class imports import org.junit.AfterClass; import javax.ejb.CreateException; @@ -229,68 +214,6 @@ public class LegacyInterfaceTest extends TestCase { assertEquals("wNAME", basicList.get(0).getColumn().getName()); } - public void testCustomCmpMappingsWithMappingFileDefinedInPersistenceXml() throws Exception { - - System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, InitContextFactory.class.getName()); - - final ConfigurationFactory config = new ConfigurationFactory(); - final Assembler assembler = new Assembler(); - - assembler.createTransactionManager(config.configureService(TransactionServiceInfo.class)); - assembler.createSecurityService(config.configureService(SecurityServiceInfo.class)); - - final EjbJar ejbJar = new EjbJar(); - ejbJar.addEnterpriseBean(new SingletonBean(MySingletonBean.class)); - ejbJar.addEnterpriseBean(new EntityBean(MyBmpBean.class, PersistenceType.BEAN)); - - final EntityBean cmp = ejbJar.addEnterpriseBean(new EntityBean(MyCmpBean.class, PersistenceType.CONTAINER)); - cmp.setPrimKeyClass(Integer.class.getName()); - cmp.setPrimkeyField("id"); - cmp.getCmpField().add(new CmpField("id")); - cmp.getCmpField().add(new CmpField("name")); - final Query query = new Query(); - query.setQueryMethod(new QueryMethod("findByPrimaryKey", Integer.class.getName())); - query.setEjbQl("SELECT OBJECT(DL) FROM License DL"); - cmp.getQuery().add(query); - final List<ContainerTransaction> transactions = ejbJar.getAssemblyDescriptor().getContainerTransaction(); - - transactions.add(new ContainerTransaction(TransAttribute.SUPPORTS, null, "MyBmpBean", "*")); - transactions.add(new ContainerTransaction(TransAttribute.SUPPORTS, null, "MyCmpBean", "*")); - transactions.add(new ContainerTransaction(TransAttribute.SUPPORTS, null, "MySingletonBean", "*")); - - final File f = new File("test").getAbsoluteFile(); - if (!f.exists() && !f.mkdirs()) { - throw new Exception("Failed to create test directory: " + f); - } - - final AppModule module = new AppModule(this.getClass().getClassLoader(), f.getAbsolutePath()); - final EjbModule ejbModule = new EjbModule(ejbJar); - - Persistence persistence = new Persistence(); - PersistenceUnit pu = persistence.addPersistenceUnit("cmp"); - pu.setTransactionType(TransactionType.JTA); - pu.setJtaDataSource("fake"); - pu.setNonJtaDataSource("fake"); - pu.getMappingFile().add("test-orm.xml"); - pu.getClazz().add("openejb.org.apache.openejb.core.MyCmpBean"); - module.addPersistenceModule(new PersistenceModule("pu", persistence)); - - module.getEjbModules().add(ejbModule); - - assertNull(module.getCmpMappings()); - assembler.createApplication(config.configureApplication(module)); - assertNotNull(module.getCmpMappings()); - - // no mapping should be automatically generated - assertTrue(module.getCmpMappings().getEntityMap().isEmpty()); - - // pu should not be modified, no duplicate classes - assertEquals(1, pu.getClazz().size()); - assertEquals("openejb.org.apache.openejb.core.MyCmpBean", pu.getClazz().get(0)); - assertEquals(1, pu.getMappingFile().size()); - assertEquals("test-orm.xml", pu.getMappingFile().get(0)); - } - @LocalHome(MyLocalHome.class) @RemoteHome(MyRemoteHome.class) public static abstract class MyCmpBean implements javax.ejb.EntityBean {
