summaryrefslogtreecommitdiff
path: root/cpp/tests
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/tests')
-rw-r--r--cpp/tests/AcceptorTest.cpp5
-rw-r--r--cpp/tests/Makefile.am1
2 files changed, 1 insertions, 5 deletions
diff --git a/cpp/tests/AcceptorTest.cpp b/cpp/tests/AcceptorTest.cpp
index 947ae2d11a..0b4b2c2578 100644
--- a/cpp/tests/AcceptorTest.cpp
+++ b/cpp/tests/AcceptorTest.cpp
@@ -49,10 +49,9 @@ class AcceptorTest : public CppUnit::TestCase, private Runnable
Acceptor::shared_ptr acceptor;
public:
- using TestCase::run; // Avoid hiding TestCase::run.
void run() {
- acceptor->run(&factory);
+ acceptor->run(factory);
}
void setUp() {
@@ -85,9 +84,7 @@ class AcceptorTest : public CppUnit::TestCase, private Runnable
CPPUNIT_ASSERT_EQUAL(int(2), int(init.getMinor()));
acceptor->shutdown();
- printf("== join\n"); // FIXME aconway 2007-03-28:
runThread.join();
- printf("== joined\n"); // FIXME aconway 2007-03-28:
factory.handler->waitForClosed();
}
};
diff --git a/cpp/tests/Makefile.am b/cpp/tests/Makefile.am
index e06901ed96..6ae3598a98 100644
--- a/cpp/tests/Makefile.am
+++ b/cpp/tests/Makefile.am
@@ -12,7 +12,6 @@ INCLUDES = \
# Unit tests
broker_tests = \
AccumulatedAckTest \
- AcceptorTest \
BrokerChannelTest \
ConfigurationTest \
ExchangeTest \