diff options
| -rw-r--r-- | src/notifier.h | 18 | ||||
| -rw-r--r-- | test/Makefile.am | 9 | ||||
| -rw-r--r-- | test/notifiertest.cc | 103 |
3 files changed, 123 insertions, 7 deletions
diff --git a/src/notifier.h b/src/notifier.h index ff59741..f044d98 100644 --- a/src/notifier.h +++ b/src/notifier.h @@ -27,10 +27,9 @@ #pragma once #include <functional> -#include <vector> -#include <map> +#include <list> +#include <utility> #include <set> -#include <memory> namespace aux { @@ -124,7 +123,7 @@ public: template<typename O, typename F> void connect(O* p, const F& fn) { - slots[p] = std::move(construct_mem_fn(fn, p, aux::gen_int_sequence<sizeof...(Args)>{})); + slots.emplace_back(std::make_pair(p, std::move(construct_mem_fn(fn, p, aux::gen_int_sequence<sizeof...(Args)>{})))); if(p && dynamic_cast<Listener*>(p)) { dynamic_cast<Listener*>(p)->registerNotifier(this); @@ -134,7 +133,14 @@ public: //! \brief Disconnect object from this Notifier. void disconnect(Listener* object) { - slots.erase(object); + for(auto it = slots.begin(); it != slots.end(); ++it) + { + if(it->first == object) + { + slots.erase(it); + return; + } + } } //! \brief Activate this notifier by pretending it is a function. @@ -148,7 +154,7 @@ public: } private: - std::map<Listener*, callback_type> slots; + std::list<std::pair<Listener*, callback_type>> slots; template<typename F, typename O, int... Ns> callback_type construct_mem_fn(const F& fn, O* p, aux::int_sequence<Ns...>) const diff --git a/test/Makefile.am b/test/Makefile.am index 08ef4fa..871b3b4 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -6,7 +6,7 @@ if ENABLE_TESTS TESTS = resource enginetest paintertest resampler configfile audiocache \ audiocachefile audiocacheidmanager audiocacheeventhandler \ memchecker randomtest atomictest syncedsettingstest imagecachetest \ - semaphoretest drumkitcreatortest bytesizeparsertest + semaphoretest drumkitcreatortest bytesizeparsertest notifiertest if ENABLE_LV2 TESTS += lv2 @@ -205,4 +205,11 @@ bytesizeparsertest_SOURCES = \ bytesizeparsertest.cc \ test.cc +notifiertest_CXXFLAGS = -DOUTPUT=\"notifiertest\" $(CPPUNIT_CFLAGS) \ + -I$(top_srcdir)/src +notifiertest_LDFLAGS = $(CPPUNIT_LIBS) +notifiertest_SOURCES = \ + notifiertest.cc \ + test.cc + endif diff --git a/test/notifiertest.cc b/test/notifiertest.cc new file mode 100644 index 0000000..2b2e92e --- /dev/null +++ b/test/notifiertest.cc @@ -0,0 +1,103 @@ +/* -*- Mode: c++ -*- */ +/*************************************************************************** + * notifiertest.cc + * + * Sat Jul 15 09:56:51 CEST 2017 + * Copyright 2017 Bent Bisballe Nyeng + * deva@aasimon.org + ****************************************************************************/ + +/* + * This file is part of DrumGizmo. + * + * DrumGizmo is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DrumGizmo is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with DrumGizmo; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ +#include <cppunit/extensions/HelperMacros.h> + +#include <vector> + +#include <notifier.h> + +class Probe + : public Listener +{ +public: + Probe(std::vector<Probe*>& triggers) + : triggers(triggers) + { + } + + void slot() + { + triggers.push_back(this); + } + + std::vector<Probe*>& triggers; +}; + +class NotifierTest + : public CppUnit::TestFixture +{ + CPPUNIT_TEST_SUITE(NotifierTest); + CPPUNIT_TEST(testTest); + CPPUNIT_TEST_SUITE_END(); + +public: + void setUp() { } + void tearDown() { } + + //! This just creates some drumkit. + void testTest() + { + Notifier<> notifier; + std::vector<Probe*> triggers; + Probe foo1(triggers); + Probe foo2(triggers); + + { // Order as initialisation + notifier.connect(&foo1, &Probe::slot); + notifier.connect(&foo2, &Probe::slot); + notifier(); + std::vector<Probe*> ref; + ref.push_back(&foo1); + ref.push_back(&foo2); + CPPUNIT_ASSERT_EQUAL(ref.size(), triggers.size()); + CPPUNIT_ASSERT_EQUAL(ref[0], triggers[0]); + CPPUNIT_ASSERT_EQUAL(ref[1], triggers[1]); + notifier.disconnect(&foo1); + notifier.disconnect(&foo2); + triggers.clear(); + } + + { // Reverse order + notifier.connect(&foo2, &Probe::slot); + notifier.connect(&foo1, &Probe::slot); + notifier(); + std::vector<Probe*> ref; + ref.push_back(&foo2); + ref.push_back(&foo1); + CPPUNIT_ASSERT_EQUAL(ref.size(), triggers.size()); + CPPUNIT_ASSERT_EQUAL(ref[0], triggers[0]); + CPPUNIT_ASSERT_EQUAL(ref[1], triggers[1]); + notifier.disconnect(&foo1); + notifier.disconnect(&foo2); + triggers.clear(); + } + + } +}; + +// Registers the fixture into the 'registry' +CPPUNIT_TEST_SUITE_REGISTRATION(NotifierTest); |