fix merge conflicts with master

[ardour.git] / libs / pbd / test / signals_test.h

diff --git a/libs/pbd/test/signals_test.h b/libs/pbd/test/signals_test.h
index 9a66564705ea1ba49fd2b0d525e02bd36a6bfb2e..37fa9d9f9688f6f3302b611ddcc7e4953cd525b5 100644 (file)
--- a/libs/pbd/test/signals_test.h
+++ b/libs/pbd/test/signals_test.h
@@ -4,9 +4,14 @@
 class SignalsTest : public CppUnit::TestFixture
 {
        CPPUNIT_TEST_SUITE (SignalsTest);
+       CPPUNIT_TEST (testEmission);
        CPPUNIT_TEST (testDestruction);
+       CPPUNIT_TEST (testScopedConnectionList);
        CPPUNIT_TEST_SUITE_END ();
 
 public:
+       void setUp ();
+       void testEmission ();
        void testDestruction ();
+       void testScopedConnectionList ();
 };