Author: charles.crouch(a)jboss.com Date: 2009-03-12 16:34:17 -0400 (Thu, 12 Mar 2009) New Revision: 216 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java Log: use LinkedHashMap for metrics we are comparing so we have a specified order in which the metrics are checked 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-03-12 20:32:49 UTC (rev 215) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java 2009-03-12 20:34:17 UTC (rev 216) @@ -509,7 +509,7 @@ performDatasourceOperation(propertiesMap.get("jndi-name"), DatasourceType.XA_DATASOURCE, "Flush"); // Make sure the metrics are updated appropriately - Map<String, String> expectedMetrics = new HashMap<String, String>(); + Map<String, String> expectedMetrics = new LinkedHashMap<String, String>(); expectedMetrics.put("Available Connection Count", "15.0"); expectedMetrics.put("Connection Count", "0.0"); expectedMetrics.put("Connection Created Count", "0.0"); @@ -569,7 +569,7 @@ performDatasourceOperation(propertiesMap.get("jndi-name"), DatasourceType.LOCAL_TX_DATASOURCE, "Flush"); // Make sure the metrics are updated appropriately - Map<String, String> expectedMetrics = new HashMap<String, String>(); + Map<String, String> expectedMetrics = new LinkedHashMap<String, String>(); expectedMetrics.put("Available Connection Count", "20.0"); expectedMetrics.put("Connection Count", "0.0"); expectedMetrics.put("Connection Created Count", "0.0"); @@ -799,7 +799,7 @@ Map<String, String> propertiesMap = createLocalTXDatasource("MetricsCreateDS"); // Set up the expected values - Map<String, String> expectedMetrics = new HashMap<String, String>(); + Map<String, String> expectedMetrics = new LinkedHashMap<String, String>(); expectedMetrics.put("Available Connection Count", "20.0"); expectedMetrics.put("Connection Count", "0.0"); expectedMetrics.put("Connection Created Count", "0.0"); @@ -856,7 +856,7 @@ assertNotNull(con); // Set up the expected values - Map<String, String> expectedMetrics = new HashMap<String, String>(); + Map<String, String> expectedMetrics = new LinkedHashMap<String, String>(); expectedMetrics.put("Available Connection Count", "19.0"); expectedMetrics.put("Connection Count", "5.0"); expectedMetrics.put("Connection Created Count", "5.0"); @@ -913,7 +913,7 @@ propertiesMap.get("password")); // Set up the expected values - Map<String, String> expectedMetrics = new HashMap<String, String>(); + Map<String, String> expectedMetrics = new LinkedHashMap<String, String>(); expectedMetrics.put("Available Connection Count", "14.0"); expectedMetrics.put("Connection Count", "6.0"); expectedMetrics.put("Connection Created Count", "6.0"); @@ -974,7 +974,7 @@ disconnectDB(connections.get(1)); // Set up the expected values - Map<String, String> expectedMetrics = new HashMap<String, String>(); + Map<String, String> expectedMetrics = new LinkedHashMap<String, String>(); expectedMetrics.put("Available Connection Count", "17.0"); expectedMetrics.put("Connection Count", "3.0"); expectedMetrics.put("Connection Created Count", "5.0");