Author: ozizka(a)redhat.com Date: 2009-08-08 17:01:41 -0400 (Sat, 08 Aug 2009) New Revision: 657 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryOperationsTest.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceOperationsTest.java Log: * Removed trackByTxn property - see JBAS-6918 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java 2009-08-08 20:53:20 UTC (rev 656) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java 2009-08-08 21:01:41 UTC (rev 657) @@ -139,7 +139,7 @@ // Datasource and Connection Factory properties to check during the "List Statistics" tests public String[] listStatisticsProps = new String[] { "blocking-timeout-millis", "idle-timeout-minutes", "max-pool-size", "min-pool-size", "no-tx-separate-pools", - "prefill", "track-connection-by-tx" }; + "prefill" /*, "track-connection-by-tx" JBAS-6918 */ }; /** * Create a new resource using the given type, template, and properties. @@ -661,7 +661,7 @@ expectedStatistics.put("noTxnSeperatePool", propertiesMap.get("no-tx-separate-pools")); expectedStatistics.put("prefill", propertiesMap.get("prefill")); - expectedStatistics.put("trackByTxn", propertiesMap.get("track-connection-by-tx")); + // expectedStatistics.put("trackByTxn", propertiesMap.get("track-connection-by-tx")); // Deprecated - JBAS-6918 return expectedStatistics; } Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryOperationsTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryOperationsTest.java 2009-08-08 20:53:20 UTC (rev 656) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryOperationsTest.java 2009-08-08 21:01:41 UTC (rev 657) @@ -325,12 +325,13 @@ expectedBuffer.append("Sub Pool Count: 1\n"); expectedBuffer.append(POOL_SEPARATOR); expectedBuffer.append("\n\n"); - - if(cfType == CFType.NO_TX_CF) { + + // Deprecated property, was removed - JBAS-6918 + /*if(cfType == CFType.NO_TX_CF) { expectedBuffer.append("Track By Transaction: false\n"); } else { expectedBuffer.append("Track By Transaction: true\n"); - } + }*/ expectedBuffer.append("Available Connections Count: 14\n"); expectedBuffer.append("Max Connections In Use Count:6\n"); expectedBuffer.append("Connections Destroyed Count:0\n"); @@ -435,12 +436,13 @@ expectedBuffer.append("Sub Pool Count: 1\n"); expectedBuffer.append(POOL_SEPARATOR); expectedBuffer.append("\n\n"); - - if(cfType == CFType.NO_TX_CF) { + + // Deprecated property, was removed - JBAS-6918 + /*if(cfType == CFType.NO_TX_CF) { expectedBuffer.append("Track By Transaction: false\n"); } else { expectedBuffer.append("Track By Transaction: true\n"); - } + }*/ expectedBuffer.append("Available Connections Count: 12\n"); expectedBuffer.append("Max Connections In Use Count:10\n"); Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceOperationsTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceOperationsTest.java 2009-08-08 20:53:20 UTC (rev 656) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceOperationsTest.java 2009-08-08 21:01:41 UTC (rev 657) @@ -207,7 +207,7 @@ expectedBuffer.append("Sub Pool Count: 1\n"); expectedBuffer.append(POOL_SEPARATOR); expectedBuffer.append("\n\n"); - expectedBuffer.append("Track By Transaction: true\n"); + //expectedBuffer.append("Track By Transaction: true\n"); // Deprecated property - JBAS-6918 expectedBuffer.append("Available Connections Count: 16\n"); expectedBuffer.append("Max Connections In Use Count:4\n"); expectedBuffer.append("Connections Destroyed Count:0\n"); @@ -281,7 +281,7 @@ expectedBuffer.append("Sub Pool Count: 1\n"); expectedBuffer.append(POOL_SEPARATOR); expectedBuffer.append("\n\n"); - expectedBuffer.append("Track By Transaction: true\n"); + //expectedBuffer.append("Track By Transaction: true\n"); // Deprecated property - JBAS-6918 expectedBuffer.append("Available Connections Count: 12\n"); expectedBuffer.append("Max Connections In Use Count:10\n"); expectedBuffer.append("Connections Destroyed Count:0\n");