Author: ozizka(a)redhat.com Date: 2009-10-02 15:51:36 -0400 (Fri, 02 Oct 2009) New Revision: 775 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryCreationTest.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceCreationTest.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceTest.java Log: * ConnFactory and Datasource tests: JNDI names changed to be hierarchical (prepended "EJtest/") Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java 2009-10-02 19:42:47 UTC (rev 774) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java 2009-10-02 19:51:36 UTC (rev 775) @@ -392,7 +392,7 @@ protected Map<String, MetaValue> createDatasourcePropertiesAsMetaValues() { Map<String, MetaValue> propertiesMap = new LinkedHashMap<String, MetaValue>(); - propertiesMap.put("jndi-name", SimpleValueSupport.wrap("TestDS")); + propertiesMap.put("jndi-name", SimpleValueSupport.wrap("EJtest/TestDS")); propertiesMap.put("user-name", SimpleValueSupport.wrap("testUser")); propertiesMap.put("password", SimpleValueSupport.wrap("password")); propertiesMap.put("min-pool-size", SimpleValueSupport.wrap(new Integer(5))); Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryCreationTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryCreationTest.java 2009-10-02 19:42:47 UTC (rev 774) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryCreationTest.java 2009-10-02 19:51:36 UTC (rev 775) @@ -22,20 +22,17 @@ package org.jboss.jopr.jsfunit.as5.connfactories; -import org.jboss.jopr.jsfunit.*; -import com.gargoylesoftware.htmlunit.html.*; import java.io.*; import junit.framework.Test; import junit.framework.TestSuite; import org.jboss.jopr.jsfunit.exceptions.*; -import org.jboss.jopr.jsfunit.as5.ResourceTestBase; import org.jboss.managed.api.ComponentType; import org.jboss.metatype.api.values.SimpleValueSupport; import org.jboss.metatype.api.values.MetaValue; -import java.util.Map; -import java.util.HashMap; +import java.util.*; + /** * This class contains tests for creating Connection Factories with JBoss AS 5. * @@ -56,7 +53,7 @@ */ public void testCreateTxConnectionFactory() throws Exception { - String jndiName = "CreateTxConnFactory"; + String jndiName = "EJtest/CreateTxConnFactory"; Map<String, MetaValue> propertiesMapAsMetaValues = createConnFactoryPropertiesAsMetaValues(jndiName); // Add an additional property @@ -74,7 +71,7 @@ */ public void testCreateNoTxConnectionFactory() throws Exception { - String jndiName = "CreateNoTxConnFactory"; + String jndiName = "EJtest/CreateNoTxConnFactory"; Map<String, MetaValue> propertiesMapAsMetaValues = createConnFactoryPropertiesAsMetaValues(jndiName); createConnFactoryCommon(jndiName, CFType.NO_TX_CF, Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceCreationTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceCreationTest.java 2009-10-02 19:42:47 UTC (rev 774) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceCreationTest.java 2009-10-02 19:51:36 UTC (rev 775) @@ -22,22 +22,12 @@ package org.jboss.jopr.jsfunit.as5.datasources; -import org.jboss.jopr.jsfunit.*; -import com.gargoylesoftware.htmlunit.html.*; import java.io.IOException; import java.util.*; import junit.framework.Test; import junit.framework.TestSuite; -import javax.management.ObjectName; -import java.util.Map; -import javax.management.JMException; -import java.sql.Connection; import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException; -import org.jboss.deployers.spi.management.KnownComponentTypes; -import org.jboss.managed.api.ComponentType; -import org.jboss.metatype.api.values.SimpleValueSupport; import org.jboss.metatype.api.values.MetaValue; -import org.jboss.jopr.jsfunit.exceptions.HtmlElementNotFoundException; /** * This class contains creation tests for datasources. Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceTest.java 2009-10-02 19:42:47 UTC (rev 774) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceTest.java 2009-10-02 19:51:36 UTC (rev 775) @@ -25,9 +25,6 @@ import org.jboss.jopr.jsfunit.*; import com.gargoylesoftware.htmlunit.html.*; import java.io.IOException; -import java.util.*; -import junit.framework.Test; -import junit.framework.TestSuite; import javax.management.ObjectName; import java.util.Map; import javax.management.JMException;