Drop _EXPECTED_FAILURES macro, doesn't work with all boost versions.

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

3 files changed, 6 insertions, 28 deletions

diff --git a/qpid/cpp/src/tests/ClientSessionTest.cpp b/qpid/cpp/src/tests/ClientSessionTest.cpp
index 7a6373ac17..3ed7491f7d 100644
--- a/qpid/cpp/src/tests/ClientSessionTest.cpp
+++ b/qpid/cpp/src/tests/ClientSessionTest.cpp
@@ -147,8 +147,8 @@ QPID_AUTO_TEST_CASE(testDispatcherThread)
         BOOST_CHECK_EQUAL(boost::lexical_cast<string>(i), listener.messages[i].getData());
 }
 
-QPID_AUTO_TEST_CASE_EXPECTED_FAILURES(testSuspend0Timeout, 1)
-{
+// FIXME aconway 2009-06-17: test for unimplemented feature, enable when implemented.
+void testSuspend0Timeout() {
     ClientSessionFixture fix;
     fix.session.suspend();  // session has 0 timeout.
     try {
@@ -168,8 +168,8 @@ QPID_AUTO_TEST_CASE(testUseSuspendedError)
     } catch(const NotAttachedException&) {}
 }
 
-QPID_AUTO_TEST_CASE_EXPECTED_FAILURES(testSuspendResume, 1)
-{
+// FIXME aconway 2009-06-17: test for unimplemented feature, enable when implemented.
+void testSuspendResume() {
     ClientSessionFixture fix;
     fix.session.timeout(60);
     fix.session.suspend();
diff --git a/qpid/cpp/src/tests/cluster_test.cpp b/qpid/cpp/src/tests/cluster_test.cpp
index cad782cea0..72d5ee5a3f 100644
--- a/qpid/cpp/src/tests/cluster_test.cpp
+++ b/qpid/cpp/src/tests/cluster_test.cpp
@@ -388,7 +388,8 @@ QPID_AUTO_TEST_CASE(testUnacked) {
     BOOST_CHECK_EQUAL(c1.subs.get("q2", TIMEOUT).getData(), "22");
 }
 
-QPID_AUTO_TEST_CASE_EXPECTED_FAILURES(testUpdateTxState, 1) {
+// FIXME aconway 2009-06-17: test for unimplemented feature, enable when implemented.
+void testUpdateTxState() {
     // Verify that we update transaction state correctly to new members.
     ClusterFixture::Args args;
     prepareArgs(args, durableFlag);
diff --git a/qpid/cpp/src/tests/unit_test.h b/qpid/cpp/src/tests/unit_test.h
index fc542e62ad..ed9623bcc0 100644
--- a/qpid/cpp/src/tests/unit_test.h
+++ b/qpid/cpp/src/tests/unit_test.h
@@ -51,25 +51,6 @@
 
 #endif  // Workarounds for BOOST_AUTO_TEST_CASE|SUITE|SUITE_END
 
-// Workaround for BOOST_AUTO_TEST_SUITE_EXPECTED_FAILURES
-// 
-#if (BOOST_VERSION < 103600)
-
-// Keep the test function for compilation but do not not register it.
-// TODO aconway 2008-04-23: better workaround for expected failures.
-# define QPID_AUTO_TEST_CASE_EXPECTED_FAILURES(test_name,n)             \
-    namespace { struct test_name { void test_method(); };  }            \
-    void test_name::test_method()
-
-#endif  // Workaround for BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES
-
-// Correct syntax for boost > 1.36
-#if (BOOST_VERSION > 103500)
-# define QPID_AUTO_TEST_CASE_EXPECTED_FAILURES(name,n) \
-    BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES(name,n) \
-    BOOST_AUTO_TEST_CASE(name)
-#endif  // Correct syntax for boost > 1.36
-
 //
 // Default definitions for latest version of boost.
 //
@@ -82,10 +63,6 @@
 # define QPID_AUTO_TEST_CASE(name)  BOOST_AUTO_TEST_CASE(name)
 #endif
 
-#ifndef QPID_AUTO_TEST_CASE_EXPECTED_FAILURES
-# define QPID_AUTO_TEST_CASE_EXPECTED_FAILURES(name,n)  BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES(name,n)
-#endif
-
 #ifndef QPID_AUTO_TEST_SUITE_END
 # define QPID_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()
 #endif