1 files changed, 9 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/SessionState.cpp b/qpid/cpp/src/tests/SessionState.cpp
index 19a146c759..f021861cd4 100644
--- a/qpid/cpp/src/tests/SessionState.cpp
+++ b/qpid/cpp/src/tests/SessionState.cpp
@@ -18,9 +18,9 @@
 
 #include "qpid/framing/SessionState.h"
 
-#define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
 #include <boost/bind.hpp>
+#include <boost/test/auto_unit_test.hpp>
+BOOST_AUTO_TEST_SUITE(SessionState);
 
 using namespace std;
 using namespace qpid::framing;
@@ -97,16 +97,21 @@ BOOST_AUTO_TEST_CASE(testReplay) {
     // Replay of all frames.
     SessionState session(100);
     sent(session, "abc"); 
+    session.suspend(); session.resuming();
     session.receivedAck(-1);
     BOOST_CHECK_EQUAL(replayChars(session.replay()), "abc");
 
     // Replay with acks
     session.receivedAck(0); // ack a.
+    session.suspend();
+    session.resuming();
     session.receivedAck(1); // ack b.
     BOOST_CHECK_EQUAL(replayChars(session.replay()), "c");
 
     // Replay after further frames.
     sent(session, "def");
+    session.suspend();
+    session.resuming();
     session.receivedAck(3);
     BOOST_CHECK_EQUAL(replayChars(session.replay()), "ef");
 
@@ -135,3 +140,5 @@ BOOST_AUTO_TEST_CASE(testReceived) {
     BOOST_CHECK(!s3.received(f));
     BOOST_CHECK_EQUAL(5u, *s3.received(f));
 }
+
+BOOST_AUTO_TEST_SUITE_END();