options name re-name to be more explicit & better test

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@727517 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 24 insertions, 19 deletions

diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp
index a1273c572b..418722f40b 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/cpp/src/qpid/broker/Queue.cpp
@@ -61,7 +61,7 @@ const std::string qpidNoLocal("no-local");
 const std::string qpidTraceIdentity("qpid.trace.id");
 const std::string qpidTraceExclude("qpid.trace.exclude");
 const std::string qpidLastValueQueue("qpid.last_value_queue");
-const std::string qpidLastValueQueueNoAcquire("qpid.last_value_queue_no_acquire");
+const std::string qpidLastValueQueueNoBrowse("qpid.last_value_queue_no_browse");
 const std::string qpidPersistLastNode("qpid.persist_last_node");
 const std::string qpidVQMatchProperty("qpid.LVQ_key");
 }
@@ -80,7 +80,7 @@ Queue::Queue(const string& _name, bool _autodelete,
     exclusive(0),
     noLocal(false),
     lastValueQueue(false),
-    lastValueQueueNoAcquire(false),
+    lastValueQueueNoBrowse(false),
     persistLastNode(false),
     inLastNodeFailure(false),
     persistenceId(0),
@@ -215,7 +215,7 @@ bool Queue::acquire(const QueuedMessage& msg) {
             || (lastValueQueue && (i->position == msg.position) && 
                 msg.payload.get() == checkLvqReplace(*i).payload.get()) )  {
 
-            if (!lastValueQueueNoAcquire) clearLVQIndex(msg);
+            clearLVQIndex(msg);
             messages.erase(i);
             QPID_LOG(debug, "Match found, acquire succeeded: " << i->position << " == " << msg.position);
             return true;
@@ -307,7 +307,7 @@ bool Queue::browseNextMessage(QueuedMessage& m, Consumer::shared_ptr c)
                 //consumer wants the message
                 c->position = msg.position;
                 m = msg;
-                if (!lastValueQueueNoAcquire) clearLVQIndex(msg);
+                if (!lastValueQueueNoBrowse) clearLVQIndex(msg);
                 return true;
             } else {
                 //browser hasn't got enough credit for the message
@@ -675,10 +675,10 @@ void Queue::configure(const FieldTable& _settings)
     lastValueQueue= _settings.get(qpidLastValueQueue);
     if (lastValueQueue) QPID_LOG(debug, "Configured queue as Last Value Queue");
 
-    lastValueQueueNoAcquire = _settings.get(qpidLastValueQueueNoAcquire);
-    if (lastValueQueueNoAcquire){
-        QPID_LOG(debug, "Configured queue as Last Value Queue No Acquire");
-        lastValueQueue = lastValueQueueNoAcquire;
+    lastValueQueueNoBrowse = _settings.get(qpidLastValueQueueNoBrowse);
+    if (lastValueQueueNoBrowse){
+        QPID_LOG(debug, "Configured queue as Last Value Queue No Browse");
+        lastValueQueue = lastValueQueueNoBrowse;
     }
     
     persistLastNode= _settings.get(qpidPersistLastNode);
diff --git a/cpp/src/qpid/broker/Queue.h b/cpp/src/qpid/broker/Queue.h
index 89cd3afc35..e0bcc25fa3 100644
--- a/cpp/src/qpid/broker/Queue.h
+++ b/cpp/src/qpid/broker/Queue.h
@@ -76,7 +76,7 @@ namespace qpid {
             OwnershipToken* exclusive;
             bool noLocal;
             bool lastValueQueue;
-            bool lastValueQueueNoAcquire;
+            bool lastValueQueueNoBrowse;
             bool persistLastNode;
             bool inLastNodeFailure;
             std::string traceId;
diff --git a/cpp/src/qpid/client/QueueOptions.cpp b/cpp/src/qpid/client/QueueOptions.cpp
index b360c1ab93..ac65b0bc22 100644
--- a/cpp/src/qpid/client/QueueOptions.cpp
+++ b/cpp/src/qpid/client/QueueOptions.cpp
@@ -38,7 +38,7 @@ const std::string QueueOptions::strRING_STRICT("ring_strict");
 const std::string QueueOptions::strLastValueQueue("qpid.last_value_queue");
 const std::string QueueOptions::strPersistLastNode("qpid.persist_last_node");
 const std::string QueueOptions::strLVQMatchProperty("qpid.LVQ_key");
-const std::string QueueOptions::strLastValueQueueNoAcquire("qpid.last_value_queue_no_acquire");
+const std::string QueueOptions::strLastValueQueueNoBrowse("qpid.last_value_queue_no_browse");
 
 
 QueueOptions::~QueueOptions()
@@ -80,8 +80,8 @@ void QueueOptions::setOrdering(QueueOrderingPolicy op)
 {
     if (op == LVQ){
         setInt(strLastValueQueue, 1); 
-    }else if (op == LVQ_NO_ACQUIRE){
-        setInt(strLastValueQueueNoAcquire, 1); 
+    }else if (op == LVQ_NO_BROWSE){
+        setInt(strLastValueQueueNoBrowse, 1); 
     }else {
         clearOrdering();
     }
diff --git a/cpp/src/qpid/client/QueueOptions.h b/cpp/src/qpid/client/QueueOptions.h
index c6cb071714..114e1e49c2 100644
--- a/cpp/src/qpid/client/QueueOptions.h
+++ b/cpp/src/qpid/client/QueueOptions.h
@@ -27,7 +27,7 @@ namespace qpid {
 namespace client {
 
 enum QueueSizePolicy {NONE, REJECT, FLOW_TO_DISK, RING, RING_STRICT};
-enum QueueOrderingPolicy {FIFO, LVQ, LVQ_NO_ACQUIRE};	
+enum QueueOrderingPolicy {FIFO, LVQ, LVQ_NO_BROWSE};	
 
 /**
  * A help class to set options on the Queue. Create a configured args while
@@ -94,7 +94,7 @@ class QueueOptions: public framing::FieldTable
     static const std::string strLastValueQueue;
     static const std::string strPersistLastNode;
     static const std::string strLVQMatchProperty;
-    static const std::string strLastValueQueueNoAcquire;
+    static const std::string strLastValueQueueNoBrowse;
 };
 
 }
diff --git a/cpp/src/tests/QueueTest.cpp b/cpp/src/tests/QueueTest.cpp
index fcd46da318..4d1de64180 100644
--- a/cpp/src/tests/QueueTest.cpp
+++ b/cpp/src/tests/QueueTest.cpp
@@ -43,7 +43,7 @@ public:
 
     intrusive_ptr<Message> last;
     bool received;
-    TestConsumer(): received(false) {};
+    TestConsumer(bool acquire = true):Consumer(acquire), received(false) {};
 
     virtual bool deliver(QueuedMessage& msg){
         last = msg.payload;
@@ -384,7 +384,7 @@ QPID_AUTO_TEST_CASE(testLVQAcquire){
     msg3->getProperties<MessageProperties>()->getApplicationHeaders().setString(key,"c");
     msg4->getProperties<MessageProperties>()->getApplicationHeaders().setString(key,"a");
     msg5->getProperties<MessageProperties>()->getApplicationHeaders().setString(key,"b");
-    msg6->getProperties<MessageProperties>()->getApplicationHeaders().setString(key,"a");
+    msg6->getProperties<MessageProperties>()->getApplicationHeaders().setString(key,"c");
 	
     //enqueue 4 message
     queue->deliver(msg1);
@@ -406,12 +406,17 @@ QPID_AUTO_TEST_CASE(testLVQAcquire){
     queue->deliver(msg5);
     BOOST_CHECK_EQUAL(queue->getMessageCount(), 3u);
 
-    // set mode to no acquire and check
-    args.setOrdering(client::LVQ_NO_ACQUIRE);
+    // set mode to no browse and check
+    args.setOrdering(client::LVQ_NO_BROWSE);
     queue->configure(args);
+    TestConsumer::shared_ptr c1(new TestConsumer(false));
+    
+    queue->dispatch(c1);
+    queue->dispatch(c1);
+    queue->dispatch(c1);
+    
     queue->deliver(msg6);
     BOOST_CHECK_EQUAL(queue->getMessageCount(), 3u);
- 
 }
 
 QPID_AUTO_TEST_CASE(testLVQMultiQueue){