[embjopr-commits] EMBJOPR SVN: r658 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations.
embjopr-commits at lists.jboss.org
embjopr-commits at lists.jboss.org
Sat Aug 8 17:21:49 EDT 2009
Author: ozizka at redhat.com
Date: 2009-08-08 17:21:48 -0400 (Sat, 08 Aug 2009)
New Revision: 658
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/JMSOperationsTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSTest.java
Log:
* JMSDestinations tests - removed checking of * Delta properties. See the last comment on JBAS-7125.
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-08-08 21:01:41 UTC (rev 657)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSMetricsTest.java 2009-08-08 21:21:48 UTC (rev 658)
@@ -22,14 +22,9 @@
package org.jboss.jopr.jsfunit.as5.jmsDestinations;
-import com.gargoylesoftware.htmlunit.html.*;
-import junit.framework.Test;
import java.util.Map;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.ArrayList;
-import org.jboss.jopr.jsfunit.*;
-import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException;
import javax.jms.Topic;
import javax.jms.TopicSession;
import javax.jms.Queue;
@@ -344,9 +339,9 @@
expectedMetrics.put(MSG_COUNT, "0");
expectedMetrics.put(SCHEDULED_MSG_COUNT, "0");
expectedMetrics.put(COUNT, "0");
- expectedMetrics.put(COUNT_DELTA, "0");
+ //expectedMetrics.put(COUNT_DELTA, "0");
expectedMetrics.put(DEPTH, "0");
- expectedMetrics.put(DEPTH_DELTA, "0");
+ //expectedMetrics.put(DEPTH_DELTA, "0");
//expectedMetrics.put(TIME_LAST_UPDATE, "0");
checkDestinationMetrics(jndiName, expectedMetrics, getQueueSummaryMetrics(),
@@ -396,9 +391,9 @@
expectedMetrics.put(MSG_COUNT, "0");
expectedMetrics.put(SCHEDULED_MSG_COUNT, "0");
expectedMetrics.put(COUNT, "0");
- expectedMetrics.put(COUNT_DELTA, "0");
+ //expectedMetrics.put(COUNT_DELTA, "0");
expectedMetrics.put(DEPTH, "0");
- expectedMetrics.put(DEPTH_DELTA, "0");
+ //expectedMetrics.put(DEPTH_DELTA, "0");
//expectedMetrics.put(TIME_LAST_UPDATE, "0"); // This currently changes
//(09:27:08) ozizka: There's a metric, Time Last Update, which has a description: The timestamp of the last message add
//(09:27:31) ozizka: But it changes upon queue receiver creation... so, is the description wrong or the behavior?
@@ -448,9 +443,9 @@
expectedMetrics.put(MSG_COUNT, "1");
expectedMetrics.put(SCHEDULED_MSG_COUNT, "0");
expectedMetrics.put(COUNT, "1");
- expectedMetrics.put(COUNT_DELTA, "1");
+ //expectedMetrics.put(COUNT_DELTA, "1");
expectedMetrics.put(DEPTH, "1");
- expectedMetrics.put(DEPTH_DELTA, "1");
+ //expectedMetrics.put(DEPTH_DELTA, "1");
checkDestinationMetrics(jndiName, expectedMetrics, getQueueSummaryMetrics(),
DestinationType.QUEUE);
@@ -497,9 +492,9 @@
expectedMetrics.put(MSG_COUNT, "3");
expectedMetrics.put(SCHEDULED_MSG_COUNT, "0");
expectedMetrics.put(COUNT, "3");
- expectedMetrics.put(COUNT_DELTA, "3");
+ //expectedMetrics.put(COUNT_DELTA, "3");
expectedMetrics.put(DEPTH, "3");
- expectedMetrics.put(DEPTH_DELTA, "3");
+ //expectedMetrics.put(DEPTH_DELTA, "3");
checkDestinationMetrics(jndiName, expectedMetrics, getQueueSummaryMetrics(),
DestinationType.QUEUE);
@@ -554,9 +549,9 @@
expectedMetrics.put(MSG_COUNT, "2");
expectedMetrics.put(SCHEDULED_MSG_COUNT, "0");
expectedMetrics.put(COUNT, "3");
- expectedMetrics.put(COUNT_DELTA, "3");
+ //expectedMetrics.put(COUNT_DELTA, "3");
expectedMetrics.put(DEPTH, "2");
- expectedMetrics.put(DEPTH_DELTA, "2");
+ //expectedMetrics.put(DEPTH_DELTA, "2");
checkDestinationMetrics(jndiName, expectedMetrics, getQueueSummaryMetrics(),
DestinationType.QUEUE);
@@ -604,7 +599,7 @@
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
expectedMetrics.put(SCHEDULED_MSG_COUNT, "2");
expectedMetrics.put(COUNT, "2");
- expectedMetrics.put(COUNT_DELTA, "2");
+ //expectedMetrics.put(COUNT_DELTA, "2");
expectedMetrics.put(CONSUMER_COUNT, "1");
expectedMetrics.put(MSG_COUNT, "2");
expectedMetrics.put(DELIVERING_COUNT, "0");
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-08-08 21:01:41 UTC (rev 657)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java 2009-08-08 21:21:48 UTC (rev 658)
@@ -156,9 +156,9 @@
expectedMetrics.put(MSG_COUNT, "0");
expectedMetrics.put(SCHEDULED_MSG_COUNT, "0");
expectedMetrics.put(COUNT, "0");
- expectedMetrics.put(COUNT_DELTA, "0");
+ //expectedMetrics.put(COUNT_DELTA, "0");
expectedMetrics.put(DEPTH, "0");
- expectedMetrics.put(DEPTH_DELTA, "0");
+ //expectedMetrics.put(DEPTH_DELTA, "0");
performDestinationOperationAndCheckMetrics(DestinationType.QUEUE,
jndiName, REMOVE_ALL_MSGS,
@@ -211,9 +211,9 @@
expectedMetrics.put(MSG_COUNT, "0");
expectedMetrics.put(SCHEDULED_MSG_COUNT, "0");
expectedMetrics.put(COUNT, "2");
- expectedMetrics.put(COUNT_DELTA, "2");
+ //expectedMetrics.put(COUNT_DELTA, "2");
expectedMetrics.put(DEPTH, "0");
- expectedMetrics.put(DEPTH_DELTA, "0");
+ //expectedMetrics.put(DEPTH_DELTA, "0");
performDestinationOperationAndCheckMetrics(DestinationType.QUEUE,
jndiName, REMOVE_ALL_MSGS,
@@ -242,9 +242,9 @@
expectedMetrics.put(MSG_COUNT, "0");
expectedMetrics.put(SCHEDULED_MSG_COUNT, "0");
expectedMetrics.put(COUNT, "0");
- expectedMetrics.put(COUNT_DELTA, "0");
+ //expectedMetrics.put(COUNT_DELTA, "0");
expectedMetrics.put(DEPTH, "0");
- expectedMetrics.put(DEPTH_DELTA, "0");
+ //expectedMetrics.put(DEPTH_DELTA, "0");
performDestinationOperationAndCheckMetrics(DestinationType.QUEUE,
jndiName, RESET_MSG_COUNTER,
@@ -295,9 +295,9 @@
expectedMetrics.put(MSG_COUNT, "3");
expectedMetrics.put(SCHEDULED_MSG_COUNT, "0");
expectedMetrics.put(COUNT, "0");
- expectedMetrics.put(COUNT_DELTA, "0");
+ //expectedMetrics.put(COUNT_DELTA, "0");
expectedMetrics.put(DEPTH, "3");
- expectedMetrics.put(DEPTH_DELTA, "3");
+ //expectedMetrics.put(DEPTH_DELTA, "3");
performDestinationOperationAndCheckMetrics(DestinationType.QUEUE,
jndiName, RESET_MSG_COUNTER,
@@ -326,9 +326,9 @@
expectedMetrics.put(MSG_COUNT, "0");
expectedMetrics.put(SCHEDULED_MSG_COUNT, "0");
expectedMetrics.put(COUNT, "0");
- expectedMetrics.put(COUNT_DELTA, "0");
+ //expectedMetrics.put(COUNT_DELTA, "0");
expectedMetrics.put(DEPTH, "0");
- expectedMetrics.put(DEPTH_DELTA, "0");
+ //expectedMetrics.put(DEPTH_DELTA, "0");
performDestinationOperationAndCheckMetrics(DestinationType.QUEUE,
jndiName, RESET_MSG_COUNTER_HISTORY,
@@ -377,9 +377,9 @@
expectedMetrics.put(MSG_COUNT, "3");
expectedMetrics.put(SCHEDULED_MSG_COUNT, "0");
expectedMetrics.put(COUNT, "3");
- expectedMetrics.put(COUNT_DELTA, "3");
+ //expectedMetrics.put(COUNT_DELTA, "3");
expectedMetrics.put(DEPTH, "3");
- expectedMetrics.put(DEPTH_DELTA, "3");
+ //expectedMetrics.put(DEPTH_DELTA, "3");
performDestinationOperationAndCheckMetrics(DestinationType.QUEUE,
jndiName, RESET_MSG_COUNTER_HISTORY,
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-08-08 21:01:41 UTC (rev 657)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSTest.java 2009-08-08 21:21:48 UTC (rev 658)
@@ -24,12 +24,10 @@
import com.gargoylesoftware.htmlunit.html.*;
import java.io.IOException;
-import junit.framework.Test;
import java.util.Map;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.ArrayList;
-import org.jboss.jopr.jsfunit.*;
import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException;
import org.jboss.jopr.jsfunit.as5.ResourceTestBase;
import org.jboss.deployers.spi.management.KnownComponentTypes;
@@ -49,7 +47,6 @@
import javax.jms.QueueSession;
import javax.jms.QueueSender;
import javax.jms.QueueReceiver;
-import javax.jms.ConnectionFactory;
import javax.jms.TextMessage;
import javax.jms.JMSException;
import javax.jms.DeliveryMode;
More information about the embjopr-commits
mailing list