Author: fjuma Date: 2009-05-19 15:28:06 -0400 (Tue, 19 May 2009) New Revision: 452 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryTest.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSTest.java Log: Updated the metrics tests for connection factories and JMS destinations so that the metrics on the "Summary" page are now checked as well. (See JOPR-146) Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryTest.java 2009-05-19 18:40:39 UTC (rev 451) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryTest.java 2009-05-19 19:28:06 UTC (rev 452) @@ -283,9 +283,9 @@ protected ArrayList<String> getConnFactorySummaryMetrics() { ArrayList<String> connFactorySummaryMetrics = new ArrayList<String>(); - // The metrics we need to check on the summary tab - // TODO: add the summary page metrics that need to be checked - - // currently no summary metrics are displayed on the page (EMBJOPR-90) + // The metrics that appear on the "Summary" page + connFactorySummaryMetrics.add(AVAILABLE_CONNECTION_COUNT); + connFactorySummaryMetrics.add(CONNECTION_COUNT); return connFactorySummaryMetrics; } Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSTest.java 2009-05-19 18:40:39 UTC (rev 451) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSTest.java 2009-05-19 19:28:06 UTC (rev 452) @@ -543,9 +543,9 @@ protected ArrayList<String> getTopicSummaryMetrics() { ArrayList<String> topicSummaryMetrics = new ArrayList<String>(); - // The metrics we need to check on the summary tab - // TODO: add the summary page metrics that need to be checked - - // currently no summary metrics are displayed on the page (EMBJOPR-90) + // The metrics that appear on the "Summary" page + topicSummaryMetrics.add(ALL_MSG_COUNT); + topicSummaryMetrics.add(ALL_SUB_COUNT); return topicSummaryMetrics; } @@ -557,9 +557,9 @@ protected ArrayList<String> getQueueSummaryMetrics() { ArrayList<String> queueSummaryMetrics = new ArrayList<String>(); - // The metrics we need to check on the summary tab - // TODO: add the summary page metrics that need to be checked - - // currently no summary metrics are displayed on the page (EMBJOPR-90) + // The metrics that appear on the "Summary" page + queueSummaryMetrics.add(CONSUMER_COUNT); + queueSummaryMetrics.add(MSG_COUNT); return queueSummaryMetrics; }