You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2008/03/04 08:21:12 UTC
svn commit: r633376 -
/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigTest.java
Author: dblevins
Date: Mon Mar 3 23:21:10 2008
New Revision: 633376
URL: http://svn.apache.org/viewvc?rev=633376&view=rev
Log:
reverted last change. test code as added to teh AutoConfigPersistenceUnitsTest class
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigTest.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigTest.java?rev=633376&r1=633375&r2=633376&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigTest.java Mon Mar 3 23:21:10 2008
@@ -17,36 +17,21 @@
package org.apache.openejb.config;
import junit.framework.TestCase;
-
-import javax.annotation.Resource;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Properties;
-import java.sql.SQLException;
-import java.sql.Connection;
-import java.sql.DriverPropertyInfo;
-import java.net.URL;
-import java.io.File;
-
-import org.apache.openejb.core.ivm.naming.InitContextFactory;
-import org.apache.openejb.config.ConfigurationFactory;
-import org.apache.openejb.config.sys.AbstractService;
import org.apache.openejb.assembler.classic.Assembler;
-import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
-import org.apache.openejb.assembler.classic.TransactionServiceInfo;
-import org.apache.openejb.assembler.classic.SecurityServiceInfo;
-import org.apache.openejb.assembler.classic.ResourceInfo;
import org.apache.openejb.assembler.classic.EjbJarInfo;
import org.apache.openejb.assembler.classic.EnterpriseBeanInfo;
+import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
+import org.apache.openejb.assembler.classic.ResourceInfo;
import org.apache.openejb.assembler.classic.ResourceReferenceInfo;
-import org.apache.openejb.assembler.classic.AppInfo;
-import org.apache.openejb.assembler.classic.PersistenceUnitInfo;
-import org.apache.openejb.assembler.classic.OpenEjbConfiguration;
-import org.apache.openejb.jee.StatelessBean;
+import org.apache.openejb.assembler.classic.SecurityServiceInfo;
+import org.apache.openejb.assembler.classic.TransactionServiceInfo;
+import org.apache.openejb.core.ivm.naming.InitContextFactory;
import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.jpa.unit.Persistence;
-import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
-import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.jee.StatelessBean;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
/**
* @version $Revision$ $Date$
@@ -75,9 +60,9 @@
EnterpriseBeanInfo beanInfo = ejbJarInfo.enterpriseBeans.get(0);
- Map<String, ResourceReferenceInfo> refs = new HashMap<String,ResourceReferenceInfo>();
+ Map<String, ResourceReferenceInfo> refs = new HashMap<String, ResourceReferenceInfo>();
for (ResourceReferenceInfo ref : beanInfo.jndiEnc.resourceRefs) {
- refs.put(ref.referenceName.replaceAll(".*/",""), ref);
+ refs.put(ref.referenceName.replaceAll(".*/", ""), ref);
}
ResourceReferenceInfo info;
@@ -93,83 +78,6 @@
assertNotNull(info);
assertEquals("PurpleDataSource", info.resourceID);
- }
-
- public void testJtaDataSourceAutoCreate() throws Exception {
-
- ConfigurationFactory config = new ConfigurationFactory();
- Assembler assembler = new Assembler();
-
- assembler.createProxyFactory(config.configureService(ProxyFactoryInfo.class));
- assembler.createTransactionManager(config.configureService(TransactionServiceInfo.class));
- assembler.createSecurityService(config.configureService(SecurityServiceInfo.class));
-
- AbstractService resource = new org.apache.openejb.config.sys.Resource("Orange", "DataSource");
- resource.getProperties().put("JdbcDriver", OrangeDriver.class.getName());
- resource.getProperties().put("JdbcUrl", "jdbc:orange:some:stuff");
- resource.getProperties().put("JtaManaged", "false");
-
- ResourceInfo nonJtaDataSource = config.configureService(resource, ResourceInfo.class);
- assembler.createResource(nonJtaDataSource);
-
- // Setup app
-
- PersistenceUnit unit = new PersistenceUnit("orange-unit");
- unit.setNonJtaDataSource("Orange");
-
- AppModule app = new AppModule(this.getClass().getClassLoader(), "test");
- app.getPersistenceModules().add(new PersistenceModule("root", new Persistence(unit)));
-
- // Create app
-
- AppInfo appInfo = config.configureApplication(app);
- assembler.createApplication(appInfo);
-
- // Check results
-
- PersistenceUnitInfo unitInfo = appInfo.persistenceUnits.get(0);
- assertNotNull(unitInfo);
-
- assertEquals("java:openejb/Resource/"+nonJtaDataSource.id, unitInfo.nonJtaDataSource);
-
- OpenEjbConfiguration configuration = SystemInstance.get().getComponent(OpenEjbConfiguration.class);
-
- ResourceInfo jtaDataSource = configuration.facilities.resources.get(1);
- assertNotNull(jtaDataSource);
- assertEquals(nonJtaDataSource.id+"Jta", jtaDataSource.id);
- assertEquals(nonJtaDataSource.service, jtaDataSource.service);
- assertEquals(nonJtaDataSource.className, jtaDataSource.className);
- assertEquals(nonJtaDataSource.properties.get("JdbcDriver"), jtaDataSource.properties.get("JdbcDriver"));
- assertEquals(nonJtaDataSource.properties.get("JdbcUrl"), jtaDataSource.properties.get("JdbcUrl"));
- assertEquals("true", jtaDataSource.properties.get("JtaManaged"));
-
- fail("");
- }
-
- public static class OrangeDriver implements java.sql.Driver {
- public boolean acceptsURL(String url) throws SQLException {
- return false;
- }
-
- public Connection connect(String url, Properties info) throws SQLException {
- return null;
- }
-
- public int getMajorVersion() {
- return 0;
- }
-
- public int getMinorVersion() {
- return 0;
- }
-
- public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException {
- return new DriverPropertyInfo[0];
- }
-
- public boolean jdbcCompliant() {
- return false;
- }
}
public static interface Widget {