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/12 20:03:01 UTC
svn commit: r803635 - in /qpid/trunk/qpid/java:
broker/src/main/java/org/apache/qpid/server/logging/messages/
broker/src/test/java/org/apache/qpid/server/logging/messages/
systests/src/main/java/org/apache/qpid/server/logging/
Author: ritchiem
Date: Wed Aug 12 18:03:00 2009
New Revision: 803635
URL: http://svn.apache.org/viewvc?rev=803635&view=rev
Log:
QPID-2002 : Made owner an optional value on the queue log message
Update tests to ensure Owner is not present
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages.properties
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages_en_US.properties
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages.properties
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages.properties?rev=803635&r1=803634&r2=803635&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages.properties (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages.properties Wed Aug 12 18:03:00 2009
@@ -84,7 +84,7 @@
#Queue
# 0 - owner
# 1 - priority
-QUE-1001 = Create : Owner: {0}[ AutoDelete][ Durable][ Transient][ Priority: {1,number,#}]
+QUE-1001 = Create :[ Owner: {0}][ AutoDelete][ Durable][ Transient][ Priority: {1,number,#}]
QUE-1002 = Deleted
#Exchange
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages_en_US.properties
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages_en_US.properties?rev=803635&r1=803634&r2=803635&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages_en_US.properties (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages_en_US.properties Wed Aug 12 18:03:00 2009
@@ -250,7 +250,7 @@
#Queue
# 0 - owner
# 1 - priority
-QUE-1001 = Create : Owner: {0}[ AutoDelete][ Durable][ Transient][ Priority: {1,number,#}]
+QUE-1001 = Create :[ Owner: {0}][ AutoDelete][ Durable][ Transient][ Priority: {1,number,#}]
QUE-1002 = Deleted
#Exchange
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java?rev=803635&r1=803634&r2=803635&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java Wed Aug 12 18:03:00 2009
@@ -29,7 +29,7 @@
String owner = "guest";
Integer priority = 3;
- _logMessage = QueueMessages.QUE_1001(owner, priority, true, true, true, true);
+ _logMessage = QueueMessages.QUE_1001(owner, priority, true, true, true, true, true);
List<Object> log = performLog();
String[] expected = {"Create :", "Owner:", owner, "AutoDelete",
@@ -39,11 +39,11 @@
validateLogMessage(log, "QUE-1001", expected);
}
- public void testMessage1001AutoDelete()
+ public void testMessage1001OwnerAutoDelete()
{
String owner = "guest";
- _logMessage = QueueMessages.QUE_1001(owner, null, true, false, false, false);
+ _logMessage = QueueMessages.QUE_1001(owner, null, true, true, false, false, false);
List<Object> log = performLog();
String[] expected = {"Create :", "Owner:", owner, "AutoDelete"};
@@ -51,12 +51,12 @@
validateLogMessage(log, "QUE-1001", expected);
}
- public void testMessage1001Priority()
+ public void testMessage1001OwnerPriority()
{
String owner = "guest";
Integer priority = 3;
- _logMessage = QueueMessages.QUE_1001(owner, priority, false, false, false, true);
+ _logMessage = QueueMessages.QUE_1001(owner, priority, true, false, false, false, true);
List<Object> log = performLog();
String[] expected = {"Create :", "Owner:", owner, "Priority:",
@@ -65,12 +65,12 @@
validateLogMessage(log, "QUE-1001", expected);
}
- public void testMessage1001AutoDeletePriority()
+ public void testMessage1001OwnerAutoDeletePriority()
{
String owner = "guest";
Integer priority = 3;
- _logMessage = QueueMessages.QUE_1001(owner, priority, true, false, false, true);
+ _logMessage = QueueMessages.QUE_1001(owner, priority, true, true, false, false, true);
List<Object> log = performLog();
String[] expected = {"Create :", "Owner:", owner, "AutoDelete",
@@ -80,25 +80,25 @@
validateLogMessage(log, "QUE-1001", expected);
}
- public void testMessage1001AutoDeleteTransient()
+ public void testMessage1001OwnerAutoDeleteTransient()
{
String owner = "guest";
- _logMessage = QueueMessages.QUE_1001(owner, null, true, false, true, false);
+ _logMessage = QueueMessages.QUE_1001(owner, null, true, true, false, true, false);
List<Object> log = performLog();
String[] expected = {"Create :", "Owner:", owner, "AutoDelete",
- "Transient"};
+ "Transient"};
validateLogMessage(log, "QUE-1001", expected);
}
- public void testMessage1001AutoDeleteTransientPriority()
+ public void testMessage1001OwnerAutoDeleteTransientPriority()
{
String owner = "guest";
Integer priority = 3;
- _logMessage = QueueMessages.QUE_1001(owner, priority, true, false, true, true);
+ _logMessage = QueueMessages.QUE_1001(owner, priority, true, true, false, true, true);
List<Object> log = performLog();
String[] expected = {"Create :", "Owner:", owner, "AutoDelete",
@@ -108,11 +108,11 @@
validateLogMessage(log, "QUE-1001", expected);
}
- public void testMessage1001AutoDeleteDurable()
+ public void testMessage1001OwnerAutoDeleteDurable()
{
String owner = "guest";
- _logMessage = QueueMessages.QUE_1001(owner, null, true, true, false, false);
+ _logMessage = QueueMessages.QUE_1001(owner, null, true, true, true, false, false);
List<Object> log = performLog();
String[] expected = {"Create :", "Owner:", owner, "AutoDelete",
@@ -121,12 +121,12 @@
validateLogMessage(log, "QUE-1001", expected);
}
- public void testMessage1001AutoDeleteDurablePriority()
+ public void testMessage1001OwnerAutoDeleteDurablePriority()
{
String owner = "guest";
Integer priority = 3;
- _logMessage = QueueMessages.QUE_1001(owner, priority, true, true, false, true);
+ _logMessage = QueueMessages.QUE_1001(owner, priority, true, true, true, false, true);
List<Object> log = performLog();
String[] expected = {"Create :", "Owner:", owner, "AutoDelete",
@@ -136,6 +136,93 @@
validateLogMessage(log, "QUE-1001", expected);
}
+ public void testMessage1001AutoDelete()
+ {
+ _logMessage = QueueMessages.QUE_1001(null, null, false, true, false, false, false);
+ List<Object> log = performLog();
+
+ String[] expected = {"Create :", "AutoDelete"};
+
+ validateLogMessage(log, "QUE-1001", expected);
+ }
+
+ public void testMessage1001Priority()
+ {
+ Integer priority = 3;
+
+ _logMessage = QueueMessages.QUE_1001(null, priority, false, false, false, false, true);
+ List<Object> log = performLog();
+
+ String[] expected = {"Create :", "Priority:",
+ String.valueOf(priority)};
+
+ validateLogMessage(log, "QUE-1001", expected);
+ }
+
+ public void testMessage1001AutoDeletePriority()
+ {
+ Integer priority = 3;
+
+ _logMessage = QueueMessages.QUE_1001(null, priority, false, true, false, false, true);
+ List<Object> log = performLog();
+
+ String[] expected = {"Create :", "AutoDelete",
+ "Priority:",
+ String.valueOf(priority)};
+
+ validateLogMessage(log, "QUE-1001", expected);
+ }
+
+ public void testMessage1001AutoDeleteTransient()
+ {
+ _logMessage = QueueMessages.QUE_1001(null, null, false, true, false, true, false);
+ List<Object> log = performLog();
+
+ String[] expected = {"Create :", "AutoDelete",
+ "Transient"};
+
+ validateLogMessage(log, "QUE-1001", expected);
+ }
+
+ public void testMessage1001AutoDeleteTransientPriority()
+ {
+ Integer priority = 3;
+
+ _logMessage = QueueMessages.QUE_1001(null, priority, false, true, false, true, true);
+ List<Object> log = performLog();
+
+ String[] expected = {"Create :", "AutoDelete",
+ "Transient", "Priority:",
+ String.valueOf(priority)};
+
+ validateLogMessage(log, "QUE-1001", expected);
+ }
+
+ public void testMessage1001AutoDeleteDurable()
+ {
+ _logMessage = QueueMessages.QUE_1001(null, null, false, true, true, false, false);
+ List<Object> log = performLog();
+
+ String[] expected = {"Create :", "AutoDelete",
+ "Durable"};
+
+ validateLogMessage(log, "QUE-1001", expected);
+ }
+
+ public void testMessage1001AutoDeleteDurablePriority()
+ {
+ Integer priority = 3;
+
+ _logMessage = QueueMessages.QUE_1001(null, priority, false, true, true, false, true);
+ List<Object> log = performLog();
+
+ String[] expected = {"Create :", "AutoDelete",
+ "Durable", "Priority:",
+ String.valueOf(priority)};
+
+ validateLogMessage(log, "QUE-1001", expected);
+ }
+
public void testMessage1002()
{
_logMessage = QueueMessages.QUE_1002();
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java?rev=803635&r1=803634&r2=803635&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java Wed Aug 12 18:03:00 2009
@@ -162,8 +162,8 @@
assertEquals(TRANSIENT + " keyword not correct in log entry.",
!_durable, fromMessage(log).contains(TRANSIENT));
- assertTrue("Queue does not have correct owner value:" + fromMessage(log),
- fromMessage(log).contains("Owner: null"));
+ assertFalse("Queue should not contain Owner tag:" + fromMessage(log),
+ fromMessage(log).contains("Owner"));
}
/**
@@ -217,8 +217,8 @@
assertTrue("Queue does not have the AutoDelete keyword in log:" + fromMessage(log),
fromMessage(log).contains("AutoDelete"));
- assertTrue("Queue does not have correct owner value:" + fromMessage(log),
- fromMessage(log).contains("Owner: null"));
+ assertFalse("Queue should not contain Owner tag:" + fromMessage(log),
+ fromMessage(log).contains("Owner"));
}
/**
@@ -277,8 +277,8 @@
assertTrue("Queue does not have the right Priority value keyword in log:" + fromMessage(log),
fromMessage(log).contains("Priority: " + PRIORITIES));
- assertTrue("Queue does not have correct owner value:" + fromMessage(log),
- fromMessage(log).contains("Owner: null"));
+ assertFalse("Queue should not contain Owner tag:" + fromMessage(log),
+ fromMessage(log).contains("Owner"));
}
/**
@@ -342,8 +342,8 @@
assertTrue("Queue does not have the AutoDelete keyword in log:" + fromMessage(log),
fromMessage(log).contains("AutoDelete"));
- assertTrue("Queue does not have correct owner value:" + fromMessage(log),
- fromMessage(log).contains("Owner: null"));
+ assertFalse("Queue should not contain Owner tag:" + fromMessage(log),
+ fromMessage(log).contains("Owner"));
}
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org