Remove optimistic consume options. Better default message for SSL errors.

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

2 files changed, 12 insertions, 48 deletions

diff --git a/cpp/src/tests/QueueOptionsTest.cpp b/cpp/src/tests/QueueOptionsTest.cpp
index a662458b36..7d9bfa68fb 100644
--- a/cpp/src/tests/QueueOptionsTest.cpp
+++ b/cpp/src/tests/QueueOptionsTest.cpp
@@ -34,48 +34,44 @@ QPID_AUTO_TEST_CASE(testSizePolicy)
 {
     QueueOptions ft;
 	
-	ft.setSizePolicy(REJECT,1,2);
+    ft.setSizePolicy(REJECT,1,2);
 	
     BOOST_CHECK(QueueOptions::strREJECT == ft.getAsString(QueueOptions::strTypeKey));
     BOOST_CHECK(1 == ft.getAsInt(QueueOptions::strMaxSizeKey));
     BOOST_CHECK(2 == ft.getAsInt(QueueOptions::strMaxCountKey));
 
-	ft.setSizePolicy(FLOW_TO_DISK,0,2);
+    ft.setSizePolicy(FLOW_TO_DISK,0,2);
     BOOST_CHECK(QueueOptions::strFLOW_TO_DISK == ft.getAsString(QueueOptions::strTypeKey));
     BOOST_CHECK(1 == ft.getAsInt(QueueOptions::strMaxSizeKey));
     BOOST_CHECK(2 == ft.getAsInt(QueueOptions::strMaxCountKey));
 
-	ft.setSizePolicy(RING,1,0);
+    ft.setSizePolicy(RING,1,0);
     BOOST_CHECK(QueueOptions::strRING == ft.getAsString(QueueOptions::strTypeKey));
 
-	ft.setSizePolicy(RING_STRICT,1,0);
+    ft.setSizePolicy(RING_STRICT,1,0);
     BOOST_CHECK(QueueOptions::strRING_STRICT == ft.getAsString(QueueOptions::strTypeKey));
 	
-	ft.clearSizePolicy();
-	BOOST_CHECK(!ft.isSet(QueueOptions::strTypeKey));
-	BOOST_CHECK(!ft.isSet(QueueOptions::strMaxSizeKey));
-	BOOST_CHECK(!ft.isSet(QueueOptions::strMaxCountKey));
+    ft.clearSizePolicy();
+    BOOST_CHECK(!ft.isSet(QueueOptions::strTypeKey));
+    BOOST_CHECK(!ft.isSet(QueueOptions::strMaxSizeKey));
+    BOOST_CHECK(!ft.isSet(QueueOptions::strMaxCountKey));
 }
 
 QPID_AUTO_TEST_CASE(testFlags)
 {
     QueueOptions ft;
 	
-	ft.setOptimisticConsume();
-	ft.setPersistLastNode();
+    ft.setPersistLastNode();
     ft.setOrdering(LVQ);
 	
-    BOOST_CHECK(1 == ft.getAsInt(QueueOptions::strOptimisticConsume));
     BOOST_CHECK(1 == ft.getAsInt(QueueOptions::strPersistLastNode));
     BOOST_CHECK(1 == ft.getAsInt(QueueOptions::strLastValueQueue));
 	
-	ft.clearOptimisticConsume();
-	ft.clearPersistLastNode();
+    ft.clearPersistLastNode();
     ft.setOrdering(FIFO);
 
-	BOOST_CHECK(!ft.isSet(QueueOptions::strOptimisticConsume));
-	BOOST_CHECK(!ft.isSet(QueueOptions::strPersistLastNode));
-	BOOST_CHECK(!ft.isSet(QueueOptions::strLastValueQueue));
+    BOOST_CHECK(!ft.isSet(QueueOptions::strPersistLastNode));
+    BOOST_CHECK(!ft.isSet(QueueOptions::strLastValueQueue));
 
 }
 
diff --git a/cpp/src/tests/QueueTest.cpp b/cpp/src/tests/QueueTest.cpp
index e854510eba..80ea05c073 100644
--- a/cpp/src/tests/QueueTest.cpp
+++ b/cpp/src/tests/QueueTest.cpp
@@ -289,38 +289,6 @@ class TestMessageStoreOC : public NullMessageStore
 };
 
 
-QPID_AUTO_TEST_CASE(testOptimisticConsume){
-
-    client::QueueOptions args;
-	args.setPersistLastNode();
-
-    // set queue mode
-	
-	TestMessageStoreOC store;
-	Queue::shared_ptr queue(new Queue("my-queue", true, &store));
-	queue->setLastNodeFailure();
-	
-    intrusive_ptr<Message> msg1 = create_message("e", "A");
-	msg1->forcePersistent();
-
-	//change mode
-	args.setOptimisticConsume();
-    queue->configure(args);
-	
-	//enqueue 1 message
-    queue->deliver(msg1);
-	
-    TestConsumer::shared_ptr consumer(new TestConsumer());
-    queue->consume(consumer);
-    queue->dispatch(consumer);
-    if (!consumer->received)
-        sleep(2);
-
-    BOOST_CHECK_EQUAL(msg1.get(), consumer->last.get());
-    BOOST_CHECK_EQUAL(uint32_t(0), queue->getMessageCount());
-
-}
-
 QPID_AUTO_TEST_CASE(testLVQOrdering){
 
     client::QueueOptions args;