From 1256ed9262d0a8f769a72eb83b1669b33e1f7f59 Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Fri, 23 Apr 2010 19:07:14 +0000 Subject: Cluster management improvements: 1) Enable all management methods via QMFv2 for clusters 2) Disable all management methods via QMFv1 for clusters 3) The broker-resident management agent can handle both v1 and v2 method calls 4) qmf.console (Python) now works with new and old brokers by detecting whether the broker can handle v2 commands git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@937472 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/ManagementTest.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'cpp/src/tests') diff --git a/cpp/src/tests/ManagementTest.cpp b/cpp/src/tests/ManagementTest.cpp index 99b9c1f03e..e9b8ac32b9 100644 --- a/cpp/src/tests/ManagementTest.cpp +++ b/cpp/src/tests/ManagementTest.cpp @@ -33,7 +33,7 @@ using namespace qpid::framing; using namespace qpid::management; QPID_AUTO_TEST_CASE(testObjectIdSerializeStream) { - std::string text("0-10-4-2500-80000000000"); + std::string text("0-10-4-2500-80000000000()"); std::stringstream input(text); ObjectId oid(input); @@ -45,7 +45,7 @@ QPID_AUTO_TEST_CASE(testObjectIdSerializeStream) { } QPID_AUTO_TEST_CASE(testObjectIdSerializeString) { - std::string text("0-10-4-2500-80000000000"); + std::string text("0-10-4-2500-80000000000()"); ObjectId oid(text); @@ -65,7 +65,7 @@ QPID_AUTO_TEST_CASE(testObjectIdEncode) { std::stringstream out1; out1 << oid; - BOOST_CHECK_EQUAL(out1.str(), "1-2-3-myAgent-9999"); + BOOST_CHECK_EQUAL(out1.str(), "1-2-3-myAgent-9999(testkey)"); } QPID_AUTO_TEST_CASE(testObjectIdAttach) { @@ -77,13 +77,13 @@ QPID_AUTO_TEST_CASE(testObjectIdAttach) { std::stringstream out1; out1 << oid; - BOOST_CHECK_EQUAL(out1.str(), "10-20-0-MrSmith-0"); + BOOST_CHECK_EQUAL(out1.str(), "10-20-0-MrSmith-0(GabbaGabbaHey)"); agent.setBanks(30, 40); std::stringstream out2; out2 << oid; - BOOST_CHECK_EQUAL(out2.str(), "10-20-30-MrSmith-0"); + BOOST_CHECK_EQUAL(out2.str(), "10-20-30-MrSmith-0(GabbaGabbaHey)"); } QPID_AUTO_TEST_CASE(testConsoleObjectId) { -- cgit v1.2.1