[jboss-cvs] JBossAS SVN: r109745 - in trunk/testsuite/src: main/org/jboss/test/jca/test and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Dec 7 05:24:52 EST 2010
Author: weston.price at jboss.com
Date: 2010-12-07 05:24:52 -0500 (Tue, 07 Dec 2010)
New Revision: 109745
Modified:
trunk/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestServlet.java
trunk/testsuite/src/main/org/jboss/test/jca/test/DataSourceDeployerTestCase.java
trunk/testsuite/src/resources/jca/dsdeployer/war/web.xml
Log:
[JBAS-8559] Added test for overriding data source properties from descriptor to annotation as required by the TCK.
Modified: trunk/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestServlet.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestServlet.java 2010-12-07 10:23:49 UTC (rev 109744)
+++ trunk/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestServlet.java 2010-12-07 10:24:52 UTC (rev 109745)
@@ -8,6 +8,7 @@
import javax.annotation.Resource;
import javax.annotation.sql.DataSourceDefinition;
+import javax.annotation.sql.DataSourceDefinitions;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
@@ -15,7 +16,12 @@
import javax.servlet.http.HttpServletResponse;
import javax.sql.DataSource;
- at DataSourceDefinition(name="java:WebAnnotDS", className="org.hsqldb.jdbcDriver", url="jdbc:hsqldb:mem:JCADataSourceDeployerDB", user="sa")
+ at DataSourceDefinitions({
+ @DataSourceDefinition(name="WebAnnotDS", className="org.hsqldb.jdbcDriver", url="jdbc:hsqldb:mem:JCADataSourceDeployerDB", user="sa"),
+ @DataSourceDefinition(name="WebOverrideDS", className="org.hsqldb.jdbcDriver", url="jdbc:hsqldb:mem:JCADataSourceDeployerDB", user="sa", transactional=false)
+}
+)
+
@WebServlet(value="/test", name="TestServlet")
public class TestServlet extends HttpServlet
{
Modified: trunk/testsuite/src/main/org/jboss/test/jca/test/DataSourceDeployerTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/test/DataSourceDeployerTestCase.java 2010-12-07 10:23:49 UTC (rev 109744)
+++ trunk/testsuite/src/main/org/jboss/test/jca/test/DataSourceDeployerTestCase.java 2010-12-07 10:24:52 UTC (rev 109745)
@@ -17,6 +17,7 @@
private static final String WEBANNOTDS = "WebAnnotDS";
private static final String WEBXMLDS = "DSWebXML";
+ private static final String WEBOVRDS = "WebOverrideDS";
public DataSourceDeployerTestCase(String name)
@@ -26,23 +27,41 @@
public void testBasicDeployment() throws Exception
{
- deploy("jca-mockdriver.jar");
- Properties props = getConnectionProperties(EARXMLDS);
- assertTrue(props.containsKey("serverName") && props.containsKey("databaseName") && props.containsKey("portNumber"));
- assertTrue(deploymentUsesDataSource(EARXMLDS));
-
- props.clear();
-
- props = getConnectionProperties(DRIVEREARXML);
- assertTrue(props.size() == 0);
- assertFalse(deploymentUsesDataSource(DRIVEREARXML));
-
- props.clear();
- props = getConnectionProperties(XADSEARXML, true);
- assertTrue("XADataSourceProperties should have been set", props.size() > 0);
-
-
- undeploy("jca-mockdriver.jar");
+ try
+ {
+ deploy("jca-mockdriver.jar");
+ Properties props = getConnectionProperties(EARXMLDS);
+ assertTrue(props.containsKey("serverName") && props.containsKey("databaseName") && props.containsKey("portNumber"));
+ assertTrue(deploymentUsesDataSource(EARXMLDS));
+
+ props.clear();
+
+ props = getConnectionProperties(DRIVEREARXML);
+ assertTrue(props.size() == 0);
+ assertFalse(deploymentUsesDataSource(DRIVEREARXML));
+
+ props.clear();
+ props = getConnectionProperties(XADSEARXML, true);
+ assertTrue("XADataSourceProperties should have been set", props.size() > 0);
+
+ props.clear();
+ props = getConnectionProperties(WEBOVRDS, true);
+ assertTrue("XADataSourceProperties should have been set on overriden datasource", props.size() > 0);
+
+
+
+
+
+ }
+ catch(Exception e)
+ {
+ throw e;
+ }
+ finally
+ {
+ undeploy("jca-mockdriver.jar");
+
+ }
}
Modified: trunk/testsuite/src/resources/jca/dsdeployer/war/web.xml
===================================================================
--- trunk/testsuite/src/resources/jca/dsdeployer/war/web.xml 2010-12-07 10:23:49 UTC (rev 109744)
+++ trunk/testsuite/src/resources/jca/dsdeployer/war/web.xml 2010-12-07 10:24:52 UTC (rev 109745)
@@ -2,18 +2,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
- <!--
- <servlet>
- <servlet-name>TestServlet</servlet-name>
- <servlet-class>org.test.web.TestServlet</servlet-class>
- </servlet>
- -->
<data-source>
<description>en-dataSource2-desc</description>
-<!--
- <description xml:lang="fr">fr-dataSource2-desc</description>
- <description xml:lang="de">de-dataSource2-desc</description>
--->
<name>DSWebXML</name>
<class-name>org.jboss.test.jca.dsdeployer.MockDataSource</class-name>
<server-name>localhost</server-name>
@@ -31,5 +21,24 @@
<max-idle-time>2</max-idle-time>
<max-statements>2</max-statements>
</data-source>
+ <data-source>
+ <description>en-dataSource2-desc</description>
+ <name>WebOverrideDS</name>
+ <class-name>org.jboss.test.jca.dsdeployer.MockDataSource</class-name>
+ <server-name>localhost</server-name>
+ <port-number>2</port-number>
+ <database-name>localdb</database-name>
+ <url>jdbc:hsqldb:mem:JCADataSourceDeployerDB</url>
+ <user>sa</user>
+ <password></password>
+ <login-timeout>2</login-timeout>
+ <transactional>true</transactional>
+ <isolation-level>TRANSACTION_READ_COMMITTED</isolation-level>
+ <initial-pool-size>2</initial-pool-size>
+ <max-pool-size>2</max-pool-size>
+ <min-pool-size>2</min-pool-size>
+ <max-idle-time>2</max-idle-time>
+ <max-statements>2</max-statements>
+ </data-source>
</web-app>
More information about the jboss-cvs-commits
mailing list