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/syncedsettings.cc | 173 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+) create mode 100644 test/syncedsettings.cc (limited to 'test/syncedsettings.cc') 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/syncedsettings.cc') 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/syncedsettings.cc') 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