From 6265f9a0d8b213529905324f90059941a4f2a99a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gl=C3=B6ckner?= Date: Wed, 23 Mar 2016 22:40:27 +0100 Subject: atomic workaround --- test/Makefile.am | 7 ++++- test/atomictest.cc | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 test/atomictest.cc (limited to 'test') diff --git a/test/Makefile.am b/test/Makefile.am index ccb21e6..ea0912b 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -3,7 +3,7 @@ include $(top_srcdir)/src/Makefile.am.drumgizmo TESTS = resource engine gui resampler lv2 configfile audiocache \ audiocachefile audiocacheidmanager audiocacheeventhandler \ - memchecker random + memchecker random atomictest check_PROGRAMS = $(TESTS) @@ -138,5 +138,10 @@ random_SOURCES = \ test.cc \ randomtest.cc +atomictest_CXXFLAGS = -DOUTPUT=\"atomictest\" $(CPPUNIT_CFLAGS) \ + -I$(top_srcdir)/src -I$(top_srcdir)/hugin +atomictest_LDFLAGS = $(CPPUNIT_LIBS) +atomictest_SOURCES = atomictest.cc test.cc + EXTRA_DIST = \ lv2_test_host.h diff --git a/test/atomictest.cc b/test/atomictest.cc new file mode 100644 index 0000000..d4cacf0 --- /dev/null +++ b/test/atomictest.cc @@ -0,0 +1,77 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/*************************************************************************** + * atomic.cc + * + * Wed Mar 23 09:17:12 CET 2016 + * Copyright 2016 Christian Glöckner + * cgloeckner@freenet.de + ****************************************************************************/ + +/* + * This file is part of DrumGizmo. + * + * DrumGizmo is free software; you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public License for more details. + * + * You should have received a copy of the GNU 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 + +#include + +class AtomicTest + : public CppUnit::TestFixture { + + CPPUNIT_TEST_SUITE(AtomicTest); + CPPUNIT_TEST(atomicIntUsesStandardImpl); + CPPUNIT_TEST(atomicFloatUsesStandardImpl); + CPPUNIT_TEST(atomicBoolUsesStandardImpl); + CPPUNIT_TEST(atomicStringCanBeUsed); + CPPUNIT_TEST_SUITE_END(); + + public: + void setUp() {} + void tearDown() {} + + void atomicIntUsesStandardImpl() { + CPPUNIT_ASSERT(isUsingStandardImpl()); + } + + void atomicFloatUsesStandardImpl() { + CPPUNIT_ASSERT(isUsingStandardImpl()); + } + + void atomicBoolUsesStandardImpl() { + CPPUNIT_ASSERT(isUsingStandardImpl()); + } + + void atomicDoubleUsesStandardImpl() { + CPPUNIT_ASSERT(isUsingStandardImpl()); + } + + void atomicStringCanBeUsed() { + // note: if it couldn't be used, the compiler would complain + Atomic tmp; + } + + // todo: further testing + + private: + template + bool isUsingStandardImpl() { + return std::is_base_of, Atomic>::value; + } +}; + +// Registers the fixture into the 'registry' +CPPUNIT_TEST_SUITE_REGISTRATION(AtomicTest); + -- cgit v1.2.3 From c9f773c9f2c9ea52d5e0ed69b13870c0c5f96acf Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 23 Mar 2016 23:02:09 +0100 Subject: Fix tests. --- test/engine.cc | 3 ++- test/memcheckertest.cc | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/engine.cc b/test/engine.cc index 86f4f4d..89c0158 100644 --- a/test/engine.cc +++ b/test/engine.cc @@ -40,9 +40,10 @@ public: void tearDown() {} void loading() { + Settings settings; AudioOutputEngine *oe = NULL; AudioInputEngine *ie = NULL; - DrumGizmo dg(oe, ie); + DrumGizmo dg(settings, oe, ie); dg.setFrameSize(100); // Switch kits emmidiately with giving the loader time to work: diff --git a/test/memcheckertest.cc b/test/memcheckertest.cc index 90bd254..e312ca7 100644 --- a/test/memcheckertest.cc +++ b/test/memcheckertest.cc @@ -52,6 +52,7 @@ class MemCheckerTest CPPUNIT_TEST(check_free_ram); CPPUNIT_TEST_SUITE_END(); private: + Settings settings; DrumKit kit; const std::string small_kit_path = "kit/small_kit.xml"; @@ -70,7 +71,7 @@ public: void small_drumkit() { // load the small kit - DrumKitParser parser(kit); + DrumKitParser parser(settings, kit); CPPUNIT_ASSERT(!parser.parseFile(small_kit_path)); // check if the memchecker thinks it fits into memory @@ -80,7 +81,7 @@ public: void huge_drumkit() { // load the huge kit - DrumKitParser parser(kit); + DrumKitParser parser(settings, kit); CPPUNIT_ASSERT(!parser.parseFile(huge_kit_path)); // check if the memchecker thinks it doesn't fit into memory @@ -94,7 +95,7 @@ public: CPPUNIT_ASSERT_EQUAL(bytes_per_channel, calcBytesPerChannel(audiofile)); // load the huge kit - DrumKitParser parser(kit); + DrumKitParser parser(settings, kit); CPPUNIT_ASSERT(!parser.parseFile(huge_kit_path)); // check if the protected method of the memchecker reports the correct size -- cgit v1.2.3 From 0d2668121d2b3e188dc60cb7bdb5d9dcc39beab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gl=C3=B6ckner?= Date: Thu, 31 Mar 2016 08:10:44 +0200 Subject: Fixed API of class Atomic for POD --- test/atomictest.cc | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'test') diff --git a/test/atomictest.cc b/test/atomictest.cc index d4cacf0..d73695e 100644 --- a/test/atomictest.cc +++ b/test/atomictest.cc @@ -36,6 +36,12 @@ class AtomicTest CPPUNIT_TEST(atomicFloatUsesStandardImpl); CPPUNIT_TEST(atomicBoolUsesStandardImpl); CPPUNIT_TEST(atomicStringCanBeUsed); + CPPUNIT_TEST(podAtomicCanBeDefaultInitialized); + CPPUNIT_TEST(nonPodAtomicCanBeDefaultInitialized); + CPPUNIT_TEST(podAtomicCanBeValueInitialized); + CPPUNIT_TEST(nonPodAtomicCanBeValueInitialized); + CPPUNIT_TEST(podAtomicCanBeValueAssigned); + CPPUNIT_TEST(nonPodAtomicCanBeValueAssigned); CPPUNIT_TEST_SUITE_END(); public: @@ -63,6 +69,38 @@ class AtomicTest Atomic tmp; } + void podAtomicCanBeDefaultInitialized() { + Atomic i; + // note: i is initialized with garbage + } + + void nonPodAtomicCanBeDefaultInitialized() { + Atomic s; + CPPUNIT_ASSERT_EQUAL(s.load(), std::string{}); + } + + void podAtomicCanBeValueInitialized() { + Atomic i{5}; + CPPUNIT_ASSERT_EQUAL(i.load(), 5); + } + + void nonPodAtomicCanBeValueInitialized() { + Atomic s{"hello world"}; + CPPUNIT_ASSERT_EQUAL(s.load(), std::string{"hello world"}); + } + + void podAtomicCanBeValueAssigned() { + Atomic i; + i = 5; + CPPUNIT_ASSERT_EQUAL(i.load(), 5); + } + + void nonPodAtomicCanBeValueAssigned() { + Atomic s; + s = "hello world"; + CPPUNIT_ASSERT_EQUAL(s.load(), std::string{"hello world"}); + } + // todo: further testing private: -- cgit v1.2.3 From 6a25f7e4e1524db7125cc67116cd989ce994c7f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gl=C3=B6ckner?= Date: Thu, 31 Mar 2016 08:29:09 +0200 Subject: Added Atomic Tests about being lock free --- test/atomictest.cc | 56 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 18 deletions(-) (limited to 'test') diff --git a/test/atomictest.cc b/test/atomictest.cc index d73695e..1718b33 100644 --- a/test/atomictest.cc +++ b/test/atomictest.cc @@ -32,41 +32,38 @@ class AtomicTest : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE(AtomicTest); - CPPUNIT_TEST(atomicIntUsesStandardImpl); - CPPUNIT_TEST(atomicFloatUsesStandardImpl); - CPPUNIT_TEST(atomicBoolUsesStandardImpl); - CPPUNIT_TEST(atomicStringCanBeUsed); + CPPUNIT_TEST(podAtomicsUseStandardImpl); + CPPUNIT_TEST(nonPodAtomicsUseOwnImpl); CPPUNIT_TEST(podAtomicCanBeDefaultInitialized); CPPUNIT_TEST(nonPodAtomicCanBeDefaultInitialized); CPPUNIT_TEST(podAtomicCanBeValueInitialized); CPPUNIT_TEST(nonPodAtomicCanBeValueInitialized); CPPUNIT_TEST(podAtomicCanBeValueAssigned); CPPUNIT_TEST(nonPodAtomicCanBeValueAssigned); + CPPUNIT_TEST(podAtomicsAreLockFree); CPPUNIT_TEST_SUITE_END(); public: void setUp() {} void tearDown() {} - void atomicIntUsesStandardImpl() { + void podAtomicsUseStandardImpl() { + CPPUNIT_ASSERT(isUsingStandardImpl()); + CPPUNIT_ASSERT(isUsingStandardImpl()); + CPPUNIT_ASSERT(isUsingStandardImpl()); + CPPUNIT_ASSERT(isUsingStandardImpl()); CPPUNIT_ASSERT(isUsingStandardImpl()); - } - - void atomicFloatUsesStandardImpl() { + CPPUNIT_ASSERT(isUsingStandardImpl()); + CPPUNIT_ASSERT(isUsingStandardImpl()); + CPPUNIT_ASSERT(isUsingStandardImpl()); + CPPUNIT_ASSERT(isUsingStandardImpl()); CPPUNIT_ASSERT(isUsingStandardImpl()); - } - - void atomicBoolUsesStandardImpl() { - CPPUNIT_ASSERT(isUsingStandardImpl()); - } - - void atomicDoubleUsesStandardImpl() { CPPUNIT_ASSERT(isUsingStandardImpl()); + CPPUNIT_ASSERT(isUsingStandardImpl()); } - void atomicStringCanBeUsed() { - // note: if it couldn't be used, the compiler would complain - Atomic tmp; + void nonPodAtomicsUseOwnImpl() { + CPPUNIT_ASSERT(!isUsingStandardImpl()); } void podAtomicCanBeDefaultInitialized() { @@ -101,6 +98,23 @@ class AtomicTest CPPUNIT_ASSERT_EQUAL(s.load(), std::string{"hello world"}); } + void podAtomicsAreLockFree() { + CPPUNIT_ASSERT(isLockFree()); + CPPUNIT_ASSERT(isLockFree()); + CPPUNIT_ASSERT(isLockFree()); + CPPUNIT_ASSERT(isLockFree()); + CPPUNIT_ASSERT(isLockFree()); + CPPUNIT_ASSERT(isLockFree()); + CPPUNIT_ASSERT(isLockFree()); + CPPUNIT_ASSERT(isLockFree()); + CPPUNIT_ASSERT(isLockFree()); + CPPUNIT_ASSERT(isLockFree()); + CPPUNIT_ASSERT(isLockFree()); + + // compile error: undefined reference to `__atomic_is_lock_free' + //CPPUNIT_ASSERT(isLockFree()); + } + // todo: further testing private: @@ -108,6 +122,12 @@ class AtomicTest bool isUsingStandardImpl() { return std::is_base_of, Atomic>::value; } + + template + bool isLockFree() { + Atomic a; + return a.is_lock_free(); + } }; // Registers the fixture into the 'registry' -- cgit v1.2.3 From 3ecca5323cba595fa05a599777f0b4c455bdd058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gl=C3=B6ckner?= Date: Thu, 31 Mar 2016 10:09:40 +0200 Subject: Added API for accessing structs in a thread-safe way --- test/Makefile.am | 7 +- test/syncedsettings.cc | 173 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 179 insertions(+), 1 deletion(-) create mode 100644 test/syncedsettings.cc (limited to 'test') diff --git a/test/Makefile.am b/test/Makefile.am index ea0912b..f9d9c77 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -3,7 +3,7 @@ include $(top_srcdir)/src/Makefile.am.drumgizmo TESTS = resource engine gui resampler lv2 configfile audiocache \ audiocachefile audiocacheidmanager audiocacheeventhandler \ - memchecker random atomictest + memchecker random atomictest syncedsettingstest check_PROGRAMS = $(TESTS) @@ -143,5 +143,10 @@ atomictest_CXXFLAGS = -DOUTPUT=\"atomictest\" $(CPPUNIT_CFLAGS) \ atomictest_LDFLAGS = $(CPPUNIT_LIBS) atomictest_SOURCES = atomictest.cc test.cc +syncedsettingstest_CXXFLAGS = -DOUTPUT=\"syncedsettingstest\" $(CPPUNIT_CFLAGS) \ + -I$(top_srcdir)/src -I$(top_srcdir)/hugin +syncedsettingstest_LDFLAGS = $(CPPUNIT_LIBS) +syncedsettingstest_SOURCES = syncedsettings.cc test.cc + EXTRA_DIST = \ lv2_test_host.h diff --git a/test/syncedsettings.cc b/test/syncedsettings.cc new file mode 100644 index 0000000..a04c870 --- /dev/null +++ b/test/syncedsettings.cc @@ -0,0 +1,173 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/*************************************************************************** + * syncedsettings.cc + * + * Wed Mar 31 09:32:12 CET 2016 + * Copyright 2016 Christian Glöckner + * cgloeckner@freenet.de + ****************************************************************************/ + +/* + * This file is part of DrumGizmo. + * + * DrumGizmo is free software; you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public License for more details. + * + * You should have received a copy of the GNU 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 + +#include + +class SyncedSettingsTest + : public CppUnit::TestFixture { + + CPPUNIT_TEST_SUITE(SyncedSettingsTest); + CPPUNIT_TEST(groupCanBeDefaultInitialized); + CPPUNIT_TEST(groupDataCanBeCopied); + CPPUNIT_TEST(groupCanBeCreatedByReference); + CPPUNIT_TEST(groupCanBeCreatedByRvalueReference); + + CPPUNIT_TEST(accessorCanGetFields); + CPPUNIT_TEST(accessorCanSetFields); + + CPPUNIT_TEST(groupHasCopyCtor); + CPPUNIT_TEST(groupHasMoveCtor); + CPPUNIT_TEST(groupHasCopyAssignOp); + CPPUNIT_TEST(groupHasMoveAssignOp); + CPPUNIT_TEST_SUITE_END(); + + private: + struct TestData { + float foo; + bool bar; + std::string msg; + }; + + public: + void setUp() {} + void tearDown() {} + + void groupCanBeDefaultInitialized() { + Group data; + } + + void groupDataCanBeCopied() { + Group data; + (TestData)data; // copies + } + + void groupCanBeCreatedByReference() { + TestData tmp{3.f, false, "hello"}; + Group data{tmp}; + TestData copy = data; + CPPUNIT_ASSERT_EQUAL(copy.foo, 3.f); + CPPUNIT_ASSERT_EQUAL(copy.bar, false); + CPPUNIT_ASSERT_EQUAL(copy.msg, std::string{"hello"}); + } + + void groupCanBeCreatedByRvalueReference() { + TestData tmp{3.f, false, "hello"}; + Group data{std::move(tmp)}; + TestData copy = data; + CPPUNIT_ASSERT_EQUAL(copy.foo, 3.f); + CPPUNIT_ASSERT_EQUAL(copy.bar, false); + CPPUNIT_ASSERT_EQUAL(copy.msg, std::string{"hello"}); + } + + void accessorCanGetFields() { + TestData tmp{3.f, false, "hello"}; + Group data{tmp}; + Accessor a{data}; + CPPUNIT_ASSERT_EQUAL(a.data.foo, 3.f); + CPPUNIT_ASSERT_EQUAL(a.data.bar, false); + CPPUNIT_ASSERT_EQUAL(a.data.msg, std::string{"hello"}); + } + + void accessorCanSetFields() { + Group data; + Accessor a{data}; + a.data.foo = 3.f; + a.data.bar = false; + a.data.msg = "hello"; + TestData copy = data; + CPPUNIT_ASSERT_EQUAL(copy.foo, 3.f); + CPPUNIT_ASSERT_EQUAL(copy.bar, false); + CPPUNIT_ASSERT_EQUAL(copy.msg, std::string{"hello"}); + } + + void groupHasCopyCtor() { + Group tmp; + { + Accessor a{tmp}; + a.data.foo = 3.f; + a.data.bar = false; + a.data.msg = "hello"; + } + Group data{tmp}; + TestData copy = data; + CPPUNIT_ASSERT_EQUAL(copy.foo, 3.f); + CPPUNIT_ASSERT_EQUAL(copy.bar, false); + CPPUNIT_ASSERT_EQUAL(copy.msg, std::string{"hello"}); + } + + void groupHasMoveCtor() { + Group tmp; + { + Accessor a{tmp}; + a.data.foo = 3.f; + a.data.bar = false; + a.data.msg = "hello"; + } + Group data{std::move(tmp)}; + TestData copy = data; + CPPUNIT_ASSERT_EQUAL(copy.foo, 3.f); + CPPUNIT_ASSERT_EQUAL(copy.bar, false); + CPPUNIT_ASSERT_EQUAL(copy.msg, std::string{"hello"}); + } + + void groupHasCopyAssignOp() { + Group tmp; + { + Accessor a{tmp}; + a.data.foo = 3.f; + a.data.bar = false; + a.data.msg = "hello"; + } + Group data = tmp; + TestData copy = data; + CPPUNIT_ASSERT_EQUAL(copy.foo, 3.f); + CPPUNIT_ASSERT_EQUAL(copy.bar, false); + CPPUNIT_ASSERT_EQUAL(copy.msg, std::string{"hello"}); + } + + void groupHasMoveAssignOp() { + Group tmp; + { + Accessor a{tmp}; + a.data.foo = 3.f; + a.data.bar = false; + a.data.msg = "hello"; + } + Group data = std::move(tmp); + TestData copy = data; + CPPUNIT_ASSERT_EQUAL(copy.foo, 3.f); + CPPUNIT_ASSERT_EQUAL(copy.bar, false); + CPPUNIT_ASSERT_EQUAL(copy.msg, std::string{"hello"}); + } + + // todo: further testing +}; + +// Registers the fixture into the 'registry' +CPPUNIT_TEST_SUITE_REGISTRATION(SyncedSettingsTest); + -- cgit v1.2.3 From 8bbb15566e1025fe5784190fa0f594cc837c2673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gl=C3=B6ckner?= Date: Thu, 31 Mar 2016 10:40:02 +0200 Subject: Removed unused features and fixed tests --- test/syncedsettings.cc | 109 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 76 insertions(+), 33 deletions(-) (limited to 'test') diff --git a/test/syncedsettings.cc b/test/syncedsettings.cc index a04c870..7de7c42 100644 --- a/test/syncedsettings.cc +++ b/test/syncedsettings.cc @@ -34,8 +34,6 @@ class SyncedSettingsTest CPPUNIT_TEST_SUITE(SyncedSettingsTest); CPPUNIT_TEST(groupCanBeDefaultInitialized); CPPUNIT_TEST(groupDataCanBeCopied); - CPPUNIT_TEST(groupCanBeCreatedByReference); - CPPUNIT_TEST(groupCanBeCreatedByRvalueReference); CPPUNIT_TEST(accessorCanGetFields); CPPUNIT_TEST(accessorCanSetFields); @@ -44,6 +42,8 @@ class SyncedSettingsTest CPPUNIT_TEST(groupHasMoveCtor); CPPUNIT_TEST(groupHasCopyAssignOp); CPPUNIT_TEST(groupHasMoveAssignOp); + + CPPUNIT_TEST(mimicRealUse); CPPUNIT_TEST_SUITE_END(); private: @@ -66,18 +66,14 @@ class SyncedSettingsTest (TestData)data; // copies } - void groupCanBeCreatedByReference() { - TestData tmp{3.f, false, "hello"}; - Group data{tmp}; - TestData copy = data; - CPPUNIT_ASSERT_EQUAL(copy.foo, 3.f); - CPPUNIT_ASSERT_EQUAL(copy.bar, false); - CPPUNIT_ASSERT_EQUAL(copy.msg, std::string{"hello"}); - } - - void groupCanBeCreatedByRvalueReference() { - TestData tmp{3.f, false, "hello"}; - Group data{std::move(tmp)}; + void accessorCanSetFields() { + Group data; + { + Accessor a{data}; + a.data.foo = 3.f; + a.data.bar = false; + a.data.msg = "hello"; + } TestData copy = data; CPPUNIT_ASSERT_EQUAL(copy.foo, 3.f); CPPUNIT_ASSERT_EQUAL(copy.bar, false); @@ -85,26 +81,22 @@ class SyncedSettingsTest } void accessorCanGetFields() { - TestData tmp{3.f, false, "hello"}; - Group data{tmp}; - Accessor a{data}; - CPPUNIT_ASSERT_EQUAL(a.data.foo, 3.f); - CPPUNIT_ASSERT_EQUAL(a.data.bar, false); - CPPUNIT_ASSERT_EQUAL(a.data.msg, std::string{"hello"}); - } - - void accessorCanSetFields() { Group data; - Accessor a{data}; - a.data.foo = 3.f; - a.data.bar = false; - a.data.msg = "hello"; - TestData copy = data; - CPPUNIT_ASSERT_EQUAL(copy.foo, 3.f); - CPPUNIT_ASSERT_EQUAL(copy.bar, false); - CPPUNIT_ASSERT_EQUAL(copy.msg, std::string{"hello"}); + { + Accessor a{data}; + a.data.foo = 3.f; + a.data.bar = false; + a.data.msg = "hello"; + } + // now read + { + Accessor a{data}; + CPPUNIT_ASSERT_EQUAL(a.data.foo, 3.f); + CPPUNIT_ASSERT_EQUAL(a.data.bar, false); + CPPUNIT_ASSERT_EQUAL(a.data.msg, std::string{"hello"}); + } } - + void groupHasCopyCtor() { Group tmp; { @@ -165,7 +157,58 @@ class SyncedSettingsTest CPPUNIT_ASSERT_EQUAL(copy.msg, std::string{"hello"}); } - // todo: further testing + void mimicRealUse() { + struct Settings { + struct Foo { + int a, b; + bool enabled; + }; + struct Bar { + float a, b; + bool enabled; + }; + struct Idk { + std::string label; + float bla; + }; + + Group foo; + Group bar; + Group idk; + }; + + Settings s; + + // set some settings + { + Accessor tmp{s.foo}; + tmp.data.enabled = true; + tmp.data.a = 3; + } + { + Accessor tmp{s.bar}; + tmp.data.enabled = false; + tmp.data.a = 0.f; + tmp.data.b = 0.f; + } + { + Accessor tmp{s.idk}; + tmp.data.label = "hello world"; + tmp.data.bla = 3.14f; + } + + // read some settings + { + Accessor tmp{s.foo}; + if (tmp.data.enabled) { + // do some while locked + } + } + Settings::Bar copy = s.bar; + if (copy.enabled) { + // do some stuff without locking + } + } }; // Registers the fixture into the 'registry' -- cgit v1.2.3 From ba8f8ed02dc666d405c60804fbae87101ccf6bba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gl=C3=B6ckner?= Date: Thu, 31 Mar 2016 10:44:08 +0200 Subject: Improved mimicRealUse() test case --- test/syncedsettings.cc | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) (limited to 'test') diff --git a/test/syncedsettings.cc b/test/syncedsettings.cc index 7de7c42..62bd8c6 100644 --- a/test/syncedsettings.cc +++ b/test/syncedsettings.cc @@ -160,54 +160,41 @@ class SyncedSettingsTest void mimicRealUse() { struct Settings { struct Foo { - int a, b; - bool enabled; + float a{5}; + float b{3}; + bool enabled{true}; }; struct Bar { - float a, b; - bool enabled; - }; - struct Idk { - std::string label; - float bla; + std::string label{"empty"}; + float bla{0.f}; }; Group foo; Group bar; - Group idk; }; Settings s; - // set some settings - { - Accessor tmp{s.foo}; - tmp.data.enabled = true; - tmp.data.a = 3; - } + // set bar settings { Accessor tmp{s.bar}; - tmp.data.enabled = false; - tmp.data.a = 0.f; - tmp.data.b = 0.f; - } - { - Accessor tmp{s.idk}; tmp.data.label = "hello world"; tmp.data.bla = 3.14f; } - // read some settings + // read foo settings { Accessor tmp{s.foo}; if (tmp.data.enabled) { // do some while locked } } - Settings::Bar copy = s.bar; + // or: + Settings::Foo copy = s.foo; if (copy.enabled) { // do some stuff without locking } + CPPUNIT_ASSERT(copy.enabled); } }; -- cgit v1.2.3 From 036a667a2b0eca1339ba14beafc13a7fdfc23c34 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 31 Mar 2016 22:17:04 +0200 Subject: Fix unit tests. --- test/Makefile.am | 2 -- 1 file changed, 2 deletions(-) (limited to 'test') diff --git a/test/Makefile.am b/test/Makefile.am index f9d9c77..3633ad8 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -29,7 +29,6 @@ audiocache_SOURCES = \ $(top_srcdir)/src/thread.cc \ $(top_srcdir)/src/mutex.cc \ $(top_srcdir)/src/semaphore.cc \ - $(top_srcdir)/src/configuration.cc \ $(top_srcdir)/src/audiofile.cc \ test.cc \ audiocachetest.cc @@ -43,7 +42,6 @@ audiocachefile_SOURCES = \ $(top_srcdir)/src/thread.cc \ $(top_srcdir)/src/mutex.cc \ $(top_srcdir)/src/semaphore.cc \ - $(top_srcdir)/src/configuration.cc \ $(top_srcdir)/src/audiofile.cc \ test.cc \ audiocachefiletest.cc -- cgit v1.2.3