Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 20044 invoked from network); 29 Dec 2005 16:07:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 29 Dec 2005 16:07:26 -0000 Received: (qmail 86593 invoked by uid 500); 29 Dec 2005 16:07:26 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 86562 invoked by uid 500); 29 Dec 2005 16:07:25 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 86553 invoked by uid 99); 29 Dec 2005 16:07:25 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Dec 2005 08:07:25 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 29 Dec 2005 08:07:25 -0800 Received: (qmail 19950 invoked by uid 65534); 29 Dec 2005 16:07:05 -0000 Message-ID: <20051229160704.19949.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r359830 - in /incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq: broker/policy/StrictOrderDispatchPolicyTest.java util/MessageList.java Date: Thu, 29 Dec 2005 16:07:04 -0000 To: activemq-commits@geronimo.apache.org From: jstrachan@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jstrachan Date: Thu Dec 29 08:07:01 2005 New Revision: 359830 URL: http://svn.apache.org/viewcvs?rev=359830&view=rev Log: fixed up test cases after they broker with the MessageList refactor Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/StrictOrderDispatchPolicyTest.java incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/MessageList.java Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/StrictOrderDispatchPolicyTest.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/StrictOrderDispatchPolicyTest.java?rev=359830&r1=359829&r2=359830&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/StrictOrderDispatchPolicyTest.java (original) +++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/StrictOrderDispatchPolicyTest.java Thu Dec 29 08:07:01 2005 @@ -21,6 +21,7 @@ import org.apache.activemq.broker.region.policy.PolicyEntry; import org.apache.activemq.broker.region.policy.PolicyMap; import org.apache.activemq.broker.region.policy.StrictOrderDispatchPolicy; +import org.apache.activemq.util.MessageList; import java.util.List; import java.util.Iterator; @@ -97,10 +98,10 @@ // Get basis of order Iterator i = consumers.keySet().iterator(); - List messageOrder = (List)consumers.get(i.next()); + MessageList messageOrder = (MessageList)consumers.get(i.next()); for (;i.hasNext();) { - List messageList = (List)consumers.get(i.next()); + MessageList messageList = (MessageList)consumers.get(i.next()); assertTrue("Messages are not ordered.", messageOrder.equals(messageList)); } } Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/MessageList.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/MessageList.java?rev=359830&r1=359829&r2=359830&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/MessageList.java (original) +++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/util/MessageList.java Thu Dec 29 08:07:01 2005 @@ -16,14 +16,14 @@ */ package org.apache.activemq.util; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - import javax.jms.Message; import javax.jms.MessageListener; import javax.jms.TextMessage; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + import junit.framework.Assert; /** @@ -43,6 +43,26 @@ public MessageList(Object semaphore) { this.semaphore = semaphore; + } + + public boolean equals(Object that) { + if (that instanceof MessageList) { + MessageList thatList = (MessageList) that; + return getMessages().equals(thatList.getMessages()); + } + return false; + } + + public int hashCode() { + synchronized (semaphore) { + return messages.hashCode() + 1; + } + } + + public String toString() { + synchronized (semaphore) { + return messages.toString(); + } } /**