[embjopr-commits] EMBJOPR SVN: r290 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: as5 and 1 other directory.

[embjopr-commits at lists.jboss.org]

Author: fjuma
Date: 2009-04-15 14:24:15 -0400 (Wed, 15 Apr 2009)
New Revision: 290

Modified:
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java
Log:
Modified the datasource creation tests to set the "no-tx-separate-pools" property instead of "noTxSeparatePools".


Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java	2009-04-15 17:04:18 UTC (rev 289)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java	2009-04-15 18:24:15 UTC (rev 290)
@@ -441,7 +441,7 @@
         propertiesMap.put("min-pool-size", "5");
         propertiesMap.put("blocking-timeout-millis", "55000");
         propertiesMap.put("idle-timeout-minutes", "60");
-        propertiesMap.put("noTxSeparatePools", "true");
+        propertiesMap.put("no-tx-separate-pools", "true");
         propertiesMap.put("user-name", "sa");
         propertiesMap.put("password", "");
         propertiesMap.put("domain", "HsqlDbRealm");
@@ -675,7 +675,7 @@
      */
     public void testCreateDatasourcePropertyOutOfRange() throws IOException, EmbJoprTestException {
         Map<String, String> propertiesMap = new HashMap<String, String>();
-        propertiesMap.put("jndi-name", "InvalidDS");
+        propertiesMap.put("jndi-name", "PropertyOutOfRangeDS");
         propertiesMap.put("user-name", "testUser");
         propertiesMap.put("password", "password");
         propertiesMap.put("xa-datasource-class", "org.postgresql.xa.PGXADataSource");
@@ -703,7 +703,7 @@
      */
     public void testCreateDatasourceInvalidPropertyType() throws IOException, EmbJoprTestException {
         Map<String, String> propertiesMap = new HashMap<String, String>();
-        propertiesMap.put("jndi-name", "InvalidDS");
+        propertiesMap.put("jndi-name", "InvalidPropertyTypeDS");
         propertiesMap.put("min-pool-size", "10");
         propertiesMap.put("max-pool-size", "20");
         propertiesMap.put("driver-class", "org.hsqldb.jdbcDriver");
@@ -731,7 +731,7 @@
      */
     public void testCreateDatasourcePropertyNotAllowed() throws IOException, EmbJoprTestException {
         Map<String, String> propertiesMap = new HashMap<String, String>();
-        propertiesMap.put("jndi-name", "InvalidDS");
+        propertiesMap.put("jndi-name", "PropertyNotAllowedDS");
         propertiesMap.put("driver-class", "org.hsqldb.jdbcDriver");
         propertiesMap.put("connection-url", "jdbc:hsqldb:.");
 

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java	2009-04-15 17:04:18 UTC (rev 289)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java	2009-04-15 18:24:15 UTC (rev 290)
@@ -497,7 +497,7 @@
         enableOrDisableFormInput("idle-timeout-minutes", Boolean.FALSE);
         enableOrDisableFormInput("track-connection-by-tx", Boolean.FALSE);
         enableOrDisableFormInput("domain", Boolean.FALSE);
-        enableOrDisableFormInput("noTxSeparatePools", Boolean.FALSE);
+        enableOrDisableFormInput("no-tx-separate-pools", Boolean.FALSE);
         client.click("resourceConfigurationForm:saveButton");
 
         // Check for the appropriate success messages