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

[embjopr-commits at lists.jboss.org]

Author: fjuma
Date: 2009-05-07 13:47:06 -0400 (Thu, 07 May 2009)
New Revision: 398

Modified:
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceConfigurationTest.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceMetricsTest.java
Log:
Modifying the expected value for "Connection Count" in testMetricsAfterClosingConnections().


Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java	2009-05-07 17:41:24 UTC (rev 397)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java	2009-05-07 17:47:06 UTC (rev 398)
@@ -459,12 +459,11 @@
         Map<String, String> propertiesMap = new HashMap<String, String>();
         propertiesMap.put("jndi-name", datasourceName);
         propertiesMap.put("prefill", "true");
-        propertiesMap.put("track-connection-by-tx", "false");
+        propertiesMap.put("track-connection-by-tx", "true");
         propertiesMap.put("max-pool-size", "20");
         propertiesMap.put("min-pool-size", "5");
         propertiesMap.put("blocking-timeout-millis", "55000");
         propertiesMap.put("idle-timeout-minutes", "60");
-        propertiesMap.put("no-tx-separate-pools", "true");
         propertiesMap.put("user-name", "sa");
         propertiesMap.put("password", "");
         propertiesMap.put("domain", "HsqlDbRealm");

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceConfigurationTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceConfigurationTest.java	2009-05-07 17:41:24 UTC (rev 397)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceConfigurationTest.java	2009-05-07 17:47:06 UTC (rev 398)
@@ -141,7 +141,6 @@
         enableOrDisableFormInput("idle-timeout-minutes", Boolean.FALSE, RESOURCE_CONFIGURATION_FORM);
         enableOrDisableFormInput("track-connection-by-tx", Boolean.FALSE, RESOURCE_CONFIGURATION_FORM);
         enableOrDisableFormInput("domain", Boolean.FALSE, RESOURCE_CONFIGURATION_FORM);
-        enableOrDisableFormInput("no-tx-separate-pools", Boolean.FALSE, RESOURCE_CONFIGURATION_FORM);
         client.click(SAVE_BUTTON);
 
         // Check for the appropriate success messages

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceMetricsTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceMetricsTest.java	2009-05-07 17:41:24 UTC (rev 397)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceMetricsTest.java	2009-05-07 17:47:06 UTC (rev 398)
@@ -237,7 +237,7 @@
             // Set up the expected values
             Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
             expectedMetrics.put(AVAILABLE_CONNECTION_COUNT, "17.0"); 
-            expectedMetrics.put(CONNECTION_COUNT, "3.0");          
+            expectedMetrics.put(CONNECTION_COUNT, "5.0");          
             expectedMetrics.put(CONNECTION_CREATED_COUNT, "5.0");    
             expectedMetrics.put(CONNECTION_DESTROYED_COUNT, "0.0");   
             expectedMetrics.put(IN_USE_CONNECTION_COUNT, "3.0");