Author: aconway
Date: Wed Jun 17 13:45:31 2009
New Revision: 785601
URL: http://svn.apache.org/viewvc?rev=785601&view=rev
Log:
Drop _EXPECTED_FAILURES macro, doesn't work with all boost versions.
Modified:
qpid/trunk/qpid/cpp/src/tests/ClientSessionTest.cpp
qpid/trunk/qpid/cpp/src/tests/cluster_test.cpp
qpid/trunk/qpid/cpp/src/tests/unit_test.h
Modified: qpid/trunk/qpid/cpp/src/tests/ClientSessionTest.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ClientSessionTest.cpp?rev=785601&r1=785600&r2=785601&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ClientSessionTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/ClientSessionTest.cpp Wed Jun 17 13:45:31 2009
@@ -147,8 +147,8 @@
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 @@
} 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();
Modified: qpid/trunk/qpid/cpp/src/tests/cluster_test.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/cluster_test.cpp?rev=785601&r1=785600&r2=785601&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/cluster_test.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/cluster_test.cpp Wed Jun 17 13:45:31 2009
@@ -388,7 +388,8 @@
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);
Modified: qpid/trunk/qpid/cpp/src/tests/unit_test.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/unit_test.h?rev=785601&r1=785600&r2=785601&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/unit_test.h (original)
+++ qpid/trunk/qpid/cpp/src/tests/unit_test.h Wed Jun 17 13:45:31 2009
@@ -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
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
