You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2009/08/07 10:12:55 UTC
svn commit: r801906 -
/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java
Author: ritchiem
Date: Fri Aug 7 08:12:55 2009
New Revision: 801906
URL: http://svn.apache.org/viewvc?rev=801906&view=rev
Log:
QPID-2002 : Fix for BindingLoggingTest : Where Binding Delete message order is not guarranteed
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java?rev=801906&r1=801905&r2=801906&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java Fri Aug 7 08:12:55 2009
@@ -230,7 +230,9 @@
assertEquals("Log Message not as expected", message, getMessageString(fromMessage(log)));
- String exchange = "direct/<<default>>";
+ String DEFAULT = "direct/<<default>>";
+ String DIRECT = "direct/amq.direct";
+
messageID = "BND-1002";
message = "Deleted";
@@ -243,12 +245,12 @@
AbstractTestLogSubject.getSlice("rk", subject).startsWith("TempQueue"));
assertEquals("Virtualhost not correct.", "/test",
AbstractTestLogSubject.getSlice("vh", subject));
- assertEquals("Exchange not correct.", exchange,
- AbstractTestLogSubject.getSlice("ex", subject));
+
+ boolean defaultFirst = DEFAULT.equals(AbstractTestLogSubject.getSlice("ex", subject));
+ boolean directFirst = DIRECT.equals(AbstractTestLogSubject.getSlice("ex", subject));
assertEquals("Log Message not as expected", message, getMessageString(fromMessage(log)));
- exchange = "direct/amq.direct";
log = getLog(results.get(3));
validateMessageID(messageID, log);
@@ -259,8 +261,17 @@
AbstractTestLogSubject.getSlice("rk", subject).startsWith("TempQueue"));
assertEquals("Virtualhost not correct.", "/test",
AbstractTestLogSubject.getSlice("vh", subject));
- assertEquals("Exchange not correct.", exchange,
- AbstractTestLogSubject.getSlice("ex", subject));
+
+ if (!defaultFirst)
+ {
+ assertEquals(DEFAULT, AbstractTestLogSubject.getSlice("ex", subject));
+ assertTrue("First Exchange Log was not a direct exchange delete",directFirst);
+ }
+ else
+ {
+ assertEquals(DIRECT, AbstractTestLogSubject.getSlice("ex", subject));
+ assertTrue("First Exchange Log was not a default exchange delete",defaultFirst);
+ }
assertEquals("Log Message not as expected", message, getMessageString(fromMessage(log)));
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org