Fix for QPID-534. Get now detects closure correctly. Also fixed broker to allow channel.close-ok (and fixed client to send it).

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

2 files changed, 69 insertions, 1 deletions

diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am
index 76f821798d..ee1a7317e0 100644
--- a/qpid/cpp/src/tests/Makefile.am
+++ b/qpid/cpp/src/tests/Makefile.am
@@ -95,6 +95,7 @@ unit_tests =		\
 
 testprogs=		\
   client_test		\
+  exception_test	\
   echo_service		\
   topic_listener	\
   topic_publisher	
@@ -103,7 +104,7 @@ check_PROGRAMS += $(testprogs) interop_runner
 
 TESTS_ENVIRONMENT = VALGRIND=$(VALGRIND) srcdir=$(srcdir) $(srcdir)/run_test
 
-system_tests = client_test quick_topictest
+system_tests = client_test exception_test quick_topictest
 TESTS += run-unit-tests start_broker $(system_tests) python_tests kill_broker 
 
 EXTRA_DIST +=								\
diff --git a/qpid/cpp/src/tests/exception_test.cpp b/qpid/cpp/src/tests/exception_test.cpp
new file mode 100644
index 0000000000..fffae796dd
--- /dev/null
+++ b/qpid/cpp/src/tests/exception_test.cpp
@@ -0,0 +1,67 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include <iostream>
+
+#include "TestOptions.h"
+#include "qpid/QpidError.h"
+#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Connection.h"
+#include "qpid/client/ClientMessage.h"
+
+using namespace qpid::client;
+using namespace qpid::sys;
+using std::string;
+
+int main(int argc, char** argv)
+{
+    qpid::TestOptions opts;
+    opts.parse(argc, argv);
+
+    try {
+	Connection con(opts.trace);
+	con.open(opts.host, opts.port, opts.username, opts.password, opts.virtualhost);
+
+        Queue queue("I don't exist!");
+        Channel channel;      
+        con.openChannel(channel);
+        channel.start();
+        //test handling of get (which is a bit odd)
+        try {
+            Message msg;
+            if (channel.get(msg, queue)) {
+                std::cout << "Received " << msg.getData() << " from " << queue.getName() << std::endl;
+            } else {
+                std::cout << "Queue " << queue.getName() << " was empty." << std::endl;
+            }
+            con.close();
+            return 1;
+        } catch (const qpid::ChannelException& e) {
+            std::cout << "get failed as expected: " << e.what() << std::endl;
+        }
+
+        con.close();
+        return 0;
+    } catch(const std::exception& e) {
+	std::cout << "got unexpected exception: " << e.what() << std::endl;
+        return 1;
+    }
+}