diff options
author | jan Iversen <jani@apache.org> | 2018-08-20 11:51:48 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2018-08-25 11:49:47 -0700 |
commit | ebc0e6d3f3edb90851295399dd22e081fe00a0c8 (patch) | |
tree | 5d08f827e6ed92eb26a778b540e132dbfad5742a /tests/testqPrefAnimations.cpp | |
parent | 82b626b3fdd82bbe251d56a9972941ed207825a3 (diff) | |
download | subsurface-ebc0e6d3f3edb90851295399dd22e081fe00a0c8.tar.gz |
core/tests: merge Animations and add vars. to qPrefDisplay
Add class variable tooltip_position to qPrefDisplay
Add class variable lastDir to qPrefDisplay
qPrefDisplay is updated to use new qPrefPrivate functions
Adjust test cases incl. qml tests
qPrefAnimations only has 1 variable, that really is a display variable
Merge the variable into qPrefDisplay, to simplify setup (and avoid loading
extra page in qml).
correct theme to save in correct place, and make it a static
class variable
Signed-off-by: Jan Iversen <jani@apache.org>
Diffstat (limited to 'tests/testqPrefAnimations.cpp')
-rw-r--r-- | tests/testqPrefAnimations.cpp | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/tests/testqPrefAnimations.cpp b/tests/testqPrefAnimations.cpp deleted file mode 100644 index 90292f28f..000000000 --- a/tests/testqPrefAnimations.cpp +++ /dev/null @@ -1,83 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include "testqPrefAnimations.h" - -#include "core/pref.h" -#include "core/qthelper.h" -#include "core/settings/qPref.h" - -#include <QDate> -#include <QTest> - -void TestQPrefAnimations::initTestCase() -{ - QCoreApplication::setOrganizationName("Subsurface"); - QCoreApplication::setOrganizationDomain("subsurface.hohndel.org"); - QCoreApplication::setApplicationName("SubsurfaceTestQPrefAnimations"); -} - -void TestQPrefAnimations::test_struct_get() -{ - // Test struct pref -> get func. - - auto tst = qPrefAnimations::instance(); - - prefs.animation_speed = 17; - - QCOMPARE(tst->animation_speed(), prefs.animation_speed); -} - -void TestQPrefAnimations::test_set_struct() -{ - // Test set func -> struct pref - - auto tst = qPrefAnimations::instance(); - - tst->set_animation_speed(27); - - QCOMPARE(prefs.animation_speed, 27); -} - -void TestQPrefAnimations::test_set_load_struct() -{ - // test set func -> load -> struct pref - - auto tst = qPrefAnimations::instance(); - - tst->set_animation_speed(33); - - prefs.animation_speed = 17; - - tst->load(); - QCOMPARE(prefs.animation_speed, 33); -} - -void TestQPrefAnimations::test_struct_disk() -{ - // test struct prefs -> disk - - auto tst = qPrefAnimations::instance(); - - prefs.animation_speed = 27; - - tst->sync(); - prefs.animation_speed = 35; - - tst->load(); - QCOMPARE(prefs.animation_speed, 27); -} - -void TestQPrefAnimations::test_multiple() -{ - // test multiple instances have the same information - - prefs.animation_speed = 37; - auto tst_direct = new qPrefAnimations; - - prefs.animation_speed = 25; - auto tst = qPrefAnimations::instance(); - - QCOMPARE(tst->animation_speed(), tst_direct->animation_speed()); - QCOMPARE(tst_direct->animation_speed(), 25); -} - -QTEST_MAIN(TestQPrefAnimations) |