summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Glöckner <cgloeckner@freenet.de>2016-03-31 10:44:08 +0200
committerChristian Glöckner <cgloeckner@freenet.de>2016-03-31 10:44:08 +0200
commit2b45e54322086d97b26e1443d34b8a59dc76f8f8 (patch)
tree6f59cb4eb325f808c45e79c3a2d29fa495a7d7e7
parentad3e2c966872d14ce3d4add2fc8588cfc1ca1e9a (diff)
Improved mimicRealUse() test case
-rw-r--r--test/syncedsettings.cc33
1 files changed, 10 insertions, 23 deletions
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> foo;
Group<Bar> bar;
- Group<Idk> idk;
};
Settings s;
- // set some settings
- {
- Accessor<Settings::Foo> tmp{s.foo};
- tmp.data.enabled = true;
- tmp.data.a = 3;
- }
+ // set bar settings
{
Accessor<Settings::Bar> tmp{s.bar};
- tmp.data.enabled = false;
- tmp.data.a = 0.f;
- tmp.data.b = 0.f;
- }
- {
- Accessor<Settings::Idk> tmp{s.idk};
tmp.data.label = "hello world";
tmp.data.bla = 3.14f;
}
- // read some settings
+ // read foo settings
{
Accessor<Settings::Foo> 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);
}
};