[embjopr-commits] EMBJOPR SVN: r405 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5: jmsDestinations and 1 other directory.
embjopr-commits at lists.jboss.org
embjopr-commits at lists.jboss.org
Thu May 7 17:13:35 EDT 2009
Author: fjuma
Date: 2009-05-07 17:13:35 -0400 (Thu, 07 May 2009)
New Revision: 405
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/DatasourceOperationsTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSMetricsTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java
Log:
Modifying the metrics tests and the operations tests so that they don't expect fractional digits for metrics that have no units.
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 20:47:41 UTC (rev 404)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceMetricsTest.java 2009-05-07 21:13:35 UTC (rev 405)
@@ -50,14 +50,14 @@
// Set up the expected values
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");
- expectedMetrics.put(CONNECTION_DESTROYED_COUNT, "0.0");
- expectedMetrics.put(IN_USE_CONNECTION_COUNT, "0.0");
- expectedMetrics.put(MAX_CONNECTIONS_IN_USE_COUNT, "0.0");
- expectedMetrics.put(MAX_SIZE, "20.0");
- expectedMetrics.put(MIN_SIZE, "5.0");
+ expectedMetrics.put(AVAILABLE_CONNECTION_COUNT, "20");
+ expectedMetrics.put(CONNECTION_COUNT, "0");
+ expectedMetrics.put(CONNECTION_CREATED_COUNT, "0");
+ expectedMetrics.put(CONNECTION_DESTROYED_COUNT, "0");
+ expectedMetrics.put(IN_USE_CONNECTION_COUNT, "0");
+ expectedMetrics.put(MAX_CONNECTIONS_IN_USE_COUNT, "0");
+ expectedMetrics.put(MAX_SIZE, "20");
+ expectedMetrics.put(MIN_SIZE, "5");
checkMetrics(propertiesMap.get("jndi-name"), DatasourceType.LOCAL_TX_DATASOURCE, expectedMetrics);
@@ -108,14 +108,14 @@
// Set up the expected values
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");
- expectedMetrics.put(CONNECTION_DESTROYED_COUNT, "0.0");
- expectedMetrics.put(IN_USE_CONNECTION_COUNT, "1.0");
- expectedMetrics.put(MAX_CONNECTIONS_IN_USE_COUNT, "1.0");
- expectedMetrics.put(MAX_SIZE, "20.0");
- expectedMetrics.put(MIN_SIZE, "5.0");
+ expectedMetrics.put(AVAILABLE_CONNECTION_COUNT, "19");
+ expectedMetrics.put(CONNECTION_COUNT, "5");
+ expectedMetrics.put(CONNECTION_CREATED_COUNT, "5");
+ expectedMetrics.put(CONNECTION_DESTROYED_COUNT, "0");
+ expectedMetrics.put(IN_USE_CONNECTION_COUNT, "1");
+ expectedMetrics.put(MAX_CONNECTIONS_IN_USE_COUNT, "1");
+ expectedMetrics.put(MAX_SIZE, "20");
+ expectedMetrics.put(MIN_SIZE, "5");
checkMetrics(propertiesMap.get("jndi-name"), DatasourceType.LOCAL_TX_DATASOURCE, expectedMetrics);
@@ -169,14 +169,14 @@
// Set up the expected values
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");
- expectedMetrics.put(CONNECTION_DESTROYED_COUNT, "0.0");
- expectedMetrics.put(IN_USE_CONNECTION_COUNT, "6.0");
- expectedMetrics.put(MAX_CONNECTIONS_IN_USE_COUNT, "6.0");
- expectedMetrics.put(MAX_SIZE, "20.0");
- expectedMetrics.put(MIN_SIZE, "5.0");
+ expectedMetrics.put(AVAILABLE_CONNECTION_COUNT, "14");
+ expectedMetrics.put(CONNECTION_COUNT, "6");
+ expectedMetrics.put(CONNECTION_CREATED_COUNT, "6");
+ expectedMetrics.put(CONNECTION_DESTROYED_COUNT, "0");
+ expectedMetrics.put(IN_USE_CONNECTION_COUNT, "6");
+ expectedMetrics.put(MAX_CONNECTIONS_IN_USE_COUNT, "6");
+ expectedMetrics.put(MAX_SIZE, "20");
+ expectedMetrics.put(MIN_SIZE, "5");
checkMetrics(propertiesMap.get("jndi-name"), DatasourceType.NO_TX_DATASOURCE, expectedMetrics);
} finally {
@@ -236,14 +236,14 @@
// Set up the expected values
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
- expectedMetrics.put(AVAILABLE_CONNECTION_COUNT, "17.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");
- expectedMetrics.put(MAX_CONNECTIONS_IN_USE_COUNT, "5.0");
- expectedMetrics.put(MAX_SIZE, "20.0");
- expectedMetrics.put(MIN_SIZE, "5.0");
+ expectedMetrics.put(AVAILABLE_CONNECTION_COUNT, "17");
+ expectedMetrics.put(CONNECTION_COUNT, "5");
+ expectedMetrics.put(CONNECTION_CREATED_COUNT, "5");
+ expectedMetrics.put(CONNECTION_DESTROYED_COUNT, "0");
+ expectedMetrics.put(IN_USE_CONNECTION_COUNT, "3");
+ expectedMetrics.put(MAX_CONNECTIONS_IN_USE_COUNT, "5");
+ expectedMetrics.put(MAX_SIZE, "20");
+ expectedMetrics.put(MIN_SIZE, "5");
checkMetrics(propertiesMap.get("jndi-name"), DatasourceType.NO_TX_DATASOURCE, expectedMetrics);
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-05-07 20:47:41 UTC (rev 404)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/datasources/DatasourceOperationsTest.java 2009-05-07 21:13:35 UTC (rev 405)
@@ -52,14 +52,14 @@
// Make sure the metrics are updated appropriately
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");
- expectedMetrics.put(CONNECTION_DESTROYED_COUNT, "0.0");
- expectedMetrics.put(IN_USE_CONNECTION_COUNT, "0.0");
- expectedMetrics.put(MAX_CONNECTIONS_IN_USE_COUNT, "0.0");
- expectedMetrics.put(MAX_SIZE, "15.0");
- expectedMetrics.put(MIN_SIZE, "6.0");
+ expectedMetrics.put(AVAILABLE_CONNECTION_COUNT, "15");
+ expectedMetrics.put(CONNECTION_COUNT, "0");
+ expectedMetrics.put(CONNECTION_CREATED_COUNT, "0");
+ expectedMetrics.put(CONNECTION_DESTROYED_COUNT, "0");
+ expectedMetrics.put(IN_USE_CONNECTION_COUNT, "0");
+ expectedMetrics.put(MAX_CONNECTIONS_IN_USE_COUNT, "0");
+ expectedMetrics.put(MAX_SIZE, "15");
+ expectedMetrics.put(MIN_SIZE, "6");
checkMetrics(propertiesMap.get("jndi-name"), DatasourceType.XA_DATASOURCE, expectedMetrics);
@@ -113,14 +113,14 @@
// Make sure the metrics are updated appropriately
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");
- expectedMetrics.put(CONNECTION_DESTROYED_COUNT, "0.0");
- expectedMetrics.put(IN_USE_CONNECTION_COUNT, "0.0");
- expectedMetrics.put(MAX_CONNECTIONS_IN_USE_COUNT, "0.0");
- expectedMetrics.put(MAX_SIZE, "20.0");
- expectedMetrics.put(MIN_SIZE, "5.0");
+ expectedMetrics.put(AVAILABLE_CONNECTION_COUNT, "20");
+ expectedMetrics.put(CONNECTION_COUNT, "0");
+ expectedMetrics.put(CONNECTION_CREATED_COUNT, "0");
+ expectedMetrics.put(CONNECTION_DESTROYED_COUNT, "0");
+ expectedMetrics.put(IN_USE_CONNECTION_COUNT, "0");
+ expectedMetrics.put(MAX_CONNECTIONS_IN_USE_COUNT, "0");
+ expectedMetrics.put(MAX_SIZE, "20");
+ expectedMetrics.put(MIN_SIZE, "5");
checkMetrics(propertiesMap.get("jndi-name"), DatasourceType.LOCAL_TX_DATASOURCE, expectedMetrics);
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSMetricsTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSMetricsTest.java 2009-05-07 20:47:41 UTC (rev 404)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSMetricsTest.java 2009-05-07 21:13:35 UTC (rev 405)
@@ -57,12 +57,12 @@
// Set up the expected values
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
- expectedMetrics.put(ALL_MSG_COUNT, "0.0");
- expectedMetrics.put(ALL_SUB_COUNT, "0.0");
- expectedMetrics.put(DURABLE_MSG_COUNT, "0.0");
- expectedMetrics.put(DURABLE_SUB_COUNT, "0.0");
- expectedMetrics.put(NON_DURABLE_MSG_COUNT, "0.0");
- expectedMetrics.put(NON_DURABLE_SUB_COUNT, "0.0");
+ expectedMetrics.put(ALL_MSG_COUNT, "0");
+ expectedMetrics.put(ALL_SUB_COUNT, "0");
+ expectedMetrics.put(DURABLE_MSG_COUNT, "0");
+ expectedMetrics.put(DURABLE_SUB_COUNT, "0");
+ expectedMetrics.put(NON_DURABLE_MSG_COUNT, "0");
+ expectedMetrics.put(NON_DURABLE_SUB_COUNT, "0");
checkDestinationMetrics(jndiName, expectedMetrics, getTopicSummaryMetrics(),
DestinationType.TOPIC);
@@ -138,17 +138,17 @@
// Set up the expected values
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
- expectedMetrics.put(ALL_MSG_COUNT, "0.0");
- expectedMetrics.put(ALL_SUB_COUNT, "1.0");
- expectedMetrics.put(DURABLE_MSG_COUNT, "0.0");
- expectedMetrics.put(NON_DURABLE_MSG_COUNT, "0.0");
+ expectedMetrics.put(ALL_MSG_COUNT, "0");
+ expectedMetrics.put(ALL_SUB_COUNT, "1");
+ expectedMetrics.put(DURABLE_MSG_COUNT, "0");
+ expectedMetrics.put(NON_DURABLE_MSG_COUNT, "0");
if(isDurable) {
- expectedMetrics.put(DURABLE_SUB_COUNT, "1.0");
- expectedMetrics.put(NON_DURABLE_SUB_COUNT, "0.0");
+ expectedMetrics.put(DURABLE_SUB_COUNT, "1");
+ expectedMetrics.put(NON_DURABLE_SUB_COUNT, "0");
} else {
- expectedMetrics.put(DURABLE_SUB_COUNT, "0.0");
- expectedMetrics.put(NON_DURABLE_SUB_COUNT, "1.0");
+ expectedMetrics.put(DURABLE_SUB_COUNT, "0");
+ expectedMetrics.put(NON_DURABLE_SUB_COUNT, "1");
}
checkDestinationMetrics(jndiName, expectedMetrics, getTopicSummaryMetrics(),
@@ -197,12 +197,12 @@
// Set up the expected values
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
- expectedMetrics.put(ALL_MSG_COUNT, "0.0");
- expectedMetrics.put(ALL_SUB_COUNT, "4.0");
- expectedMetrics.put(DURABLE_MSG_COUNT, "0.0");
- expectedMetrics.put(NON_DURABLE_MSG_COUNT, "0.0");
- expectedMetrics.put(DURABLE_SUB_COUNT, "2.0");
- expectedMetrics.put(NON_DURABLE_SUB_COUNT, "2.0");
+ expectedMetrics.put(ALL_MSG_COUNT, "0");
+ expectedMetrics.put(ALL_SUB_COUNT, "4");
+ expectedMetrics.put(DURABLE_MSG_COUNT, "0");
+ expectedMetrics.put(NON_DURABLE_MSG_COUNT, "0");
+ expectedMetrics.put(DURABLE_SUB_COUNT, "2");
+ expectedMetrics.put(NON_DURABLE_SUB_COUNT, "2");
checkDestinationMetrics(jndiName, expectedMetrics, getTopicSummaryMetrics(),
DestinationType.TOPIC);
@@ -249,12 +249,12 @@
// Set up the expected values
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
- expectedMetrics.put(ALL_MSG_COUNT, "1.0");
- expectedMetrics.put(ALL_SUB_COUNT, "1.0");
- expectedMetrics.put(DURABLE_MSG_COUNT, "1.0");
- expectedMetrics.put(NON_DURABLE_MSG_COUNT, "0.0");
- expectedMetrics.put(DURABLE_SUB_COUNT, "1.0");
- expectedMetrics.put(NON_DURABLE_SUB_COUNT, "0.0");
+ expectedMetrics.put(ALL_MSG_COUNT, "1");
+ expectedMetrics.put(ALL_SUB_COUNT, "1");
+ expectedMetrics.put(DURABLE_MSG_COUNT, "1");
+ expectedMetrics.put(NON_DURABLE_MSG_COUNT, "0");
+ expectedMetrics.put(DURABLE_SUB_COUNT, "1");
+ expectedMetrics.put(NON_DURABLE_SUB_COUNT, "0");
checkDestinationMetrics(jndiName, expectedMetrics, getTopicSummaryMetrics(),
DestinationType.TOPIC);
@@ -305,12 +305,12 @@
// Set up the expected values
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
- expectedMetrics.put(ALL_MSG_COUNT, "6.0");
- expectedMetrics.put(ALL_SUB_COUNT, "2.0");
- expectedMetrics.put(DURABLE_MSG_COUNT, "3.0");
- expectedMetrics.put(NON_DURABLE_MSG_COUNT, "3.0");
- expectedMetrics.put(DURABLE_SUB_COUNT, "1.0");
- expectedMetrics.put(NON_DURABLE_SUB_COUNT, "1.0");
+ expectedMetrics.put(ALL_MSG_COUNT, "6");
+ expectedMetrics.put(ALL_SUB_COUNT, "2");
+ expectedMetrics.put(DURABLE_MSG_COUNT, "3");
+ expectedMetrics.put(NON_DURABLE_MSG_COUNT, "3");
+ expectedMetrics.put(DURABLE_SUB_COUNT, "1");
+ expectedMetrics.put(NON_DURABLE_SUB_COUNT, "1");
checkDestinationMetrics(jndiName, expectedMetrics, getTopicSummaryMetrics(),
DestinationType.TOPIC);
@@ -329,15 +329,15 @@
// Set up the expected values
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
- expectedMetrics.put(CONSUMER_COUNT, "0.0");
- expectedMetrics.put(DELIVERING_COUNT, "0.0");
- expectedMetrics.put(MSG_COUNT, "0.0");
- expectedMetrics.put(SCHEDULED_MSG_COUNT, "0.0");
- expectedMetrics.put(COUNT, "0.0");
- expectedMetrics.put(COUNT_DELTA, "0.0");
- expectedMetrics.put(DEPTH, "0.0");
- expectedMetrics.put(DEPTH_DELTA, "0.0");
- expectedMetrics.put(TIME_LAST_UPDATE, "0.0");
+ expectedMetrics.put(CONSUMER_COUNT, "0");
+ expectedMetrics.put(DELIVERING_COUNT, "0");
+ expectedMetrics.put(MSG_COUNT, "0");
+ expectedMetrics.put(SCHEDULED_MSG_COUNT, "0");
+ expectedMetrics.put(COUNT, "0");
+ expectedMetrics.put(COUNT_DELTA, "0");
+ expectedMetrics.put(DEPTH, "0");
+ expectedMetrics.put(DEPTH_DELTA, "0");
+ expectedMetrics.put(TIME_LAST_UPDATE, "0");
checkDestinationMetrics(jndiName, expectedMetrics, getQueueSummaryMetrics(),
DestinationType.QUEUE);
@@ -381,15 +381,15 @@
// Set up the expected values
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
- expectedMetrics.put(CONSUMER_COUNT, "1.0");
- expectedMetrics.put(DELIVERING_COUNT, "0.0");
- expectedMetrics.put(MSG_COUNT, "0.0");
- expectedMetrics.put(SCHEDULED_MSG_COUNT, "0.0");
- expectedMetrics.put(COUNT, "0.0");
- expectedMetrics.put(COUNT_DELTA, "0.0");
- expectedMetrics.put(DEPTH, "0.0");
- expectedMetrics.put(DEPTH_DELTA, "0.0");
- expectedMetrics.put(TIME_LAST_UPDATE, "0.0");
+ expectedMetrics.put(CONSUMER_COUNT, "1");
+ expectedMetrics.put(DELIVERING_COUNT, "0");
+ expectedMetrics.put(MSG_COUNT, "0");
+ expectedMetrics.put(SCHEDULED_MSG_COUNT, "0");
+ expectedMetrics.put(COUNT, "0");
+ expectedMetrics.put(COUNT_DELTA, "0");
+ expectedMetrics.put(DEPTH, "0");
+ expectedMetrics.put(DEPTH_DELTA, "0");
+ expectedMetrics.put(TIME_LAST_UPDATE, "0");
checkDestinationMetrics(jndiName, expectedMetrics, getQueueSummaryMetrics(),
DestinationType.QUEUE);
@@ -431,14 +431,14 @@
// Set up the expected values
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
- expectedMetrics.put(CONSUMER_COUNT, "0.0");
- expectedMetrics.put(DELIVERING_COUNT, "0.0");
- expectedMetrics.put(MSG_COUNT, "1.0");
- expectedMetrics.put(SCHEDULED_MSG_COUNT, "0.0");
- expectedMetrics.put(COUNT, "1.0");
- expectedMetrics.put(COUNT_DELTA, "1.0");
- expectedMetrics.put(DEPTH, "1.0");
- expectedMetrics.put(DEPTH_DELTA, "1.0");
+ expectedMetrics.put(CONSUMER_COUNT, "0");
+ expectedMetrics.put(DELIVERING_COUNT, "0");
+ expectedMetrics.put(MSG_COUNT, "1");
+ expectedMetrics.put(SCHEDULED_MSG_COUNT, "0");
+ expectedMetrics.put(COUNT, "1");
+ expectedMetrics.put(COUNT_DELTA, "1");
+ expectedMetrics.put(DEPTH, "1");
+ expectedMetrics.put(DEPTH_DELTA, "1");
checkDestinationMetrics(jndiName, expectedMetrics, getQueueSummaryMetrics(),
DestinationType.QUEUE);
@@ -480,14 +480,14 @@
// Set up the expected values
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
- expectedMetrics.put(CONSUMER_COUNT, "0.0");
- expectedMetrics.put(DELIVERING_COUNT, "0.0");
- expectedMetrics.put(MSG_COUNT, "3.0");
- expectedMetrics.put(SCHEDULED_MSG_COUNT, "0.0");
- expectedMetrics.put(COUNT, "3.0");
- expectedMetrics.put(COUNT_DELTA, "3.0");
- expectedMetrics.put(DEPTH, "3.0");
- expectedMetrics.put(DEPTH_DELTA, "3.0");
+ expectedMetrics.put(CONSUMER_COUNT, "0");
+ expectedMetrics.put(DELIVERING_COUNT, "0");
+ expectedMetrics.put(MSG_COUNT, "3");
+ expectedMetrics.put(SCHEDULED_MSG_COUNT, "0");
+ expectedMetrics.put(COUNT, "3");
+ expectedMetrics.put(COUNT_DELTA, "3");
+ expectedMetrics.put(DEPTH, "3");
+ expectedMetrics.put(DEPTH_DELTA, "3");
checkDestinationMetrics(jndiName, expectedMetrics, getQueueSummaryMetrics(),
DestinationType.QUEUE);
@@ -537,14 +537,14 @@
// Set up the expected values
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
- expectedMetrics.put(CONSUMER_COUNT, "1.0");
- expectedMetrics.put(DELIVERING_COUNT, "2.0");
- expectedMetrics.put(MSG_COUNT, "2.0");
- expectedMetrics.put(SCHEDULED_MSG_COUNT, "0.0");
- expectedMetrics.put(COUNT, "3.0");
- expectedMetrics.put(COUNT_DELTA, "3.0");
- expectedMetrics.put(DEPTH, "2.0");
- expectedMetrics.put(DEPTH_DELTA, "2.0");
+ expectedMetrics.put(CONSUMER_COUNT, "1");
+ expectedMetrics.put(DELIVERING_COUNT, "2");
+ expectedMetrics.put(MSG_COUNT, "2");
+ expectedMetrics.put(SCHEDULED_MSG_COUNT, "0");
+ expectedMetrics.put(COUNT, "3");
+ expectedMetrics.put(COUNT_DELTA, "3");
+ expectedMetrics.put(DEPTH, "2");
+ expectedMetrics.put(DEPTH_DELTA, "2");
checkDestinationMetrics(jndiName, expectedMetrics, getQueueSummaryMetrics(),
DestinationType.QUEUE);
@@ -590,14 +590,14 @@
// Set up the expected values
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
- expectedMetrics.put(SCHEDULED_MSG_COUNT, "2.0");
- expectedMetrics.put(COUNT, "2.0");
- expectedMetrics.put(COUNT_DELTA, "2.0");
- expectedMetrics.put(DEPTH, "0.0");
- expectedMetrics.put(DEPTH_DELTA, "0.0");
- expectedMetrics.put(CONSUMER_COUNT, "1.0");
- expectedMetrics.put(MSG_COUNT, "2.0");
- expectedMetrics.put(DELIVERING_COUNT, "0.0");
+ expectedMetrics.put(SCHEDULED_MSG_COUNT, "2");
+ expectedMetrics.put(COUNT, "2");
+ expectedMetrics.put(COUNT_DELTA, "2");
+ expectedMetrics.put(DEPTH, "0");
+ expectedMetrics.put(DEPTH_DELTA, "0");
+ expectedMetrics.put(CONSUMER_COUNT, "1");
+ expectedMetrics.put(MSG_COUNT, "2");
+ expectedMetrics.put(DELIVERING_COUNT, "0");
checkDestinationMetrics(jndiName, expectedMetrics, getQueueSummaryMetrics(),
DestinationType.QUEUE);
@@ -642,7 +642,7 @@
checkResourceMetricsNotNull(JMS_NAV_LABEL, DestinationType.QUEUE.getNavLabel(),
jndiName, expectedMetric.iterator(),
ZERO_VALUE_MESSAGE,
- "0.0");
+ "0");
// Clean up
disconnect();
deleteDestination(DestinationType.QUEUE, jndiName);
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java 2009-05-07 20:47:41 UTC (rev 404)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java 2009-05-07 21:13:35 UTC (rev 405)
@@ -62,12 +62,12 @@
// Set up the expected values
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
- expectedMetrics.put(ALL_MSG_COUNT, "0.0");
- expectedMetrics.put(ALL_SUB_COUNT, "0.0");
- expectedMetrics.put(DURABLE_MSG_COUNT, "0.0");
- expectedMetrics.put(NON_DURABLE_MSG_COUNT, "0.0");
- expectedMetrics.put(DURABLE_SUB_COUNT, "0.0");
- expectedMetrics.put(NON_DURABLE_SUB_COUNT, "0.0");
+ expectedMetrics.put(ALL_MSG_COUNT, "0");
+ expectedMetrics.put(ALL_SUB_COUNT, "0");
+ expectedMetrics.put(DURABLE_MSG_COUNT, "0");
+ expectedMetrics.put(NON_DURABLE_MSG_COUNT, "0");
+ expectedMetrics.put(DURABLE_SUB_COUNT, "0");
+ expectedMetrics.put(NON_DURABLE_SUB_COUNT, "0");
performDestinationOperationAndCheckMetrics(DestinationType.TOPIC,
jndiName, REMOVE_ALL_MSGS,
@@ -114,12 +114,12 @@
// Set up the expected values
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
- expectedMetrics.put(ALL_MSG_COUNT, "0.0");
- expectedMetrics.put(ALL_SUB_COUNT, "2.0");
- expectedMetrics.put(DURABLE_MSG_COUNT, "0.0");
- expectedMetrics.put(NON_DURABLE_MSG_COUNT, "0.0");
- expectedMetrics.put(DURABLE_SUB_COUNT, "1.0");
- expectedMetrics.put(NON_DURABLE_SUB_COUNT, "1.0");
+ expectedMetrics.put(ALL_MSG_COUNT, "0");
+ expectedMetrics.put(ALL_SUB_COUNT, "2");
+ expectedMetrics.put(DURABLE_MSG_COUNT, "0");
+ expectedMetrics.put(NON_DURABLE_MSG_COUNT, "0");
+ expectedMetrics.put(DURABLE_SUB_COUNT, "1");
+ expectedMetrics.put(NON_DURABLE_SUB_COUNT, "1");
performDestinationOperationAndCheckMetrics(DestinationType.TOPIC,
jndiName, REMOVE_ALL_MSGS,
@@ -142,14 +142,14 @@
// Set up the expected values
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
- expectedMetrics.put(CONSUMER_COUNT, "0.0");
- expectedMetrics.put(DELIVERING_COUNT, "0.0");
- expectedMetrics.put(MSG_COUNT, "0.0");
- expectedMetrics.put(SCHEDULED_MSG_COUNT, "0.0");
- expectedMetrics.put(COUNT, "0.0");
- expectedMetrics.put(COUNT_DELTA, "0.0");
- expectedMetrics.put(DEPTH, "0.0");
- expectedMetrics.put(DEPTH_DELTA, "0.0");
+ expectedMetrics.put(CONSUMER_COUNT, "0");
+ expectedMetrics.put(DELIVERING_COUNT, "0");
+ expectedMetrics.put(MSG_COUNT, "0");
+ expectedMetrics.put(SCHEDULED_MSG_COUNT, "0");
+ expectedMetrics.put(COUNT, "0");
+ expectedMetrics.put(COUNT_DELTA, "0");
+ expectedMetrics.put(DEPTH, "0");
+ expectedMetrics.put(DEPTH_DELTA, "0");
performDestinationOperationAndCheckMetrics(DestinationType.QUEUE,
jndiName, REMOVE_ALL_MSGS,
@@ -197,14 +197,14 @@
// Set up the expected values
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
- expectedMetrics.put(CONSUMER_COUNT, "0.0");
- expectedMetrics.put(DELIVERING_COUNT, "0.0");
- expectedMetrics.put(MSG_COUNT, "0.0");
- expectedMetrics.put(SCHEDULED_MSG_COUNT, "0.0");
- expectedMetrics.put(COUNT, "2.0");
- expectedMetrics.put(COUNT_DELTA, "2.0");
- expectedMetrics.put(DEPTH, "0.0");
- expectedMetrics.put(DEPTH_DELTA, "0.0");
+ expectedMetrics.put(CONSUMER_COUNT, "0");
+ expectedMetrics.put(DELIVERING_COUNT, "0");
+ expectedMetrics.put(MSG_COUNT, "0");
+ expectedMetrics.put(SCHEDULED_MSG_COUNT, "0");
+ expectedMetrics.put(COUNT, "2");
+ expectedMetrics.put(COUNT_DELTA, "2");
+ expectedMetrics.put(DEPTH, "0");
+ expectedMetrics.put(DEPTH_DELTA, "0");
performDestinationOperationAndCheckMetrics(DestinationType.QUEUE,
jndiName, REMOVE_ALL_MSGS,
@@ -228,14 +228,14 @@
// Set up the expected values
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
- expectedMetrics.put(CONSUMER_COUNT, "0.0");
- expectedMetrics.put(DELIVERING_COUNT, "0.0");
- expectedMetrics.put(MSG_COUNT, "0.0");
- expectedMetrics.put(SCHEDULED_MSG_COUNT, "0.0");
- expectedMetrics.put(COUNT, "0.0");
- expectedMetrics.put(COUNT_DELTA, "0.0");
- expectedMetrics.put(DEPTH, "0.0");
- expectedMetrics.put(DEPTH_DELTA, "0.0");
+ expectedMetrics.put(CONSUMER_COUNT, "0");
+ expectedMetrics.put(DELIVERING_COUNT, "0");
+ expectedMetrics.put(MSG_COUNT, "0");
+ expectedMetrics.put(SCHEDULED_MSG_COUNT, "0");
+ expectedMetrics.put(COUNT, "0");
+ expectedMetrics.put(COUNT_DELTA, "0");
+ expectedMetrics.put(DEPTH, "0");
+ expectedMetrics.put(DEPTH_DELTA, "0");
performDestinationOperationAndCheckMetrics(DestinationType.QUEUE,
jndiName, RESET_MSG_COUNTER,
@@ -281,14 +281,14 @@
// Set up the expected values
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
- expectedMetrics.put(CONSUMER_COUNT, "0.0");
- expectedMetrics.put(DELIVERING_COUNT, "0.0");
- expectedMetrics.put(MSG_COUNT, "3.0");
- expectedMetrics.put(SCHEDULED_MSG_COUNT, "0.0");
- expectedMetrics.put(COUNT, "0.0");
- expectedMetrics.put(COUNT_DELTA, "0.0");
- expectedMetrics.put(DEPTH, "3.0");
- expectedMetrics.put(DEPTH_DELTA, "3.0");
+ expectedMetrics.put(CONSUMER_COUNT, "0");
+ expectedMetrics.put(DELIVERING_COUNT, "0");
+ expectedMetrics.put(MSG_COUNT, "3");
+ expectedMetrics.put(SCHEDULED_MSG_COUNT, "0");
+ expectedMetrics.put(COUNT, "0");
+ expectedMetrics.put(COUNT_DELTA, "0");
+ expectedMetrics.put(DEPTH, "3");
+ expectedMetrics.put(DEPTH_DELTA, "3");
performDestinationOperationAndCheckMetrics(DestinationType.QUEUE,
jndiName, RESET_MSG_COUNTER,
@@ -312,14 +312,14 @@
// Set up the expected values
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
- expectedMetrics.put(CONSUMER_COUNT, "0.0");
- expectedMetrics.put(DELIVERING_COUNT, "0.0");
- expectedMetrics.put(MSG_COUNT, "0.0");
- expectedMetrics.put(SCHEDULED_MSG_COUNT, "0.0");
- expectedMetrics.put(COUNT, "0.0");
- expectedMetrics.put(COUNT_DELTA, "0.0");
- expectedMetrics.put(DEPTH, "0.0");
- expectedMetrics.put(DEPTH_DELTA, "0.0");
+ expectedMetrics.put(CONSUMER_COUNT, "0");
+ expectedMetrics.put(DELIVERING_COUNT, "0");
+ expectedMetrics.put(MSG_COUNT, "0");
+ expectedMetrics.put(SCHEDULED_MSG_COUNT, "0");
+ expectedMetrics.put(COUNT, "0");
+ expectedMetrics.put(COUNT_DELTA, "0");
+ expectedMetrics.put(DEPTH, "0");
+ expectedMetrics.put(DEPTH_DELTA, "0");
performDestinationOperationAndCheckMetrics(DestinationType.QUEUE,
jndiName, RESET_MSG_COUNTER_HISTORY,
@@ -363,14 +363,14 @@
// Set up the expected values
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
- expectedMetrics.put(CONSUMER_COUNT, "0.0");
- expectedMetrics.put(DELIVERING_COUNT, "0.0");
- expectedMetrics.put(MSG_COUNT, "3.0");
- expectedMetrics.put(SCHEDULED_MSG_COUNT, "0.0");
- expectedMetrics.put(COUNT, "3.0");
- expectedMetrics.put(COUNT_DELTA, "3.0");
- expectedMetrics.put(DEPTH, "3.0");
- expectedMetrics.put(DEPTH_DELTA, "3.0");
+ expectedMetrics.put(CONSUMER_COUNT, "0");
+ expectedMetrics.put(DELIVERING_COUNT, "0");
+ expectedMetrics.put(MSG_COUNT, "3");
+ expectedMetrics.put(SCHEDULED_MSG_COUNT, "0");
+ expectedMetrics.put(COUNT, "3");
+ expectedMetrics.put(COUNT_DELTA, "3");
+ expectedMetrics.put(DEPTH, "3");
+ expectedMetrics.put(DEPTH_DELTA, "3");
performDestinationOperationAndCheckMetrics(DestinationType.QUEUE,
jndiName, RESET_MSG_COUNTER_HISTORY,
More information about the embjopr-commits
mailing list