mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 13:10:19 +00:00
5fae7ce7a0
Include unused tanks in merges of multiple logs into a single dive if the 'Show unused cylinders' preference is enabled. Also rename the preference (in code) to `include_unused_tanks` to reflect the fact that it is already used in more places than just the display (exporting, cloning dives). Simplified the cylinder model to make forced inclusion of unused tanks dependent on use of the model in planner. Leaving the persisted name of the preference as `display_unused_tanks` to avoid resetting this for all users - is there a good way to migrate preference names? Signed-off-by: Michael Keller <github@ike.ch>
115 lines
3.4 KiB
C++
115 lines
3.4 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
#include "testqPrefEquipment.h"
|
|
|
|
#include "core/pref.h"
|
|
#include "core/qthelper.h"
|
|
#include "core/settings/qPrefEquipment.h"
|
|
#include "core/settings/qPref.h"
|
|
|
|
#include <QTest>
|
|
#include <QSignalSpy>
|
|
|
|
void TestQPrefEquipment::initTestCase()
|
|
{
|
|
QCoreApplication::setOrganizationName("Subsurface");
|
|
QCoreApplication::setOrganizationDomain("subsurface.hohndel.org");
|
|
QCoreApplication::setApplicationName("SubsurfaceTestQPrefEquipment");
|
|
qPref::registerQML(NULL);
|
|
}
|
|
|
|
void TestQPrefEquipment::test_struct_get()
|
|
{
|
|
// Test struct pref -> get func.
|
|
|
|
auto tst = qPrefEquipment::instance();
|
|
prefs.default_cylinder = copy_qstring("new base11");
|
|
QCOMPARE(tst->default_cylinder(), QString(prefs.default_cylinder));
|
|
prefs.include_unused_tanks = true;
|
|
QCOMPARE(tst->include_unused_tanks(), prefs.include_unused_tanks);
|
|
}
|
|
|
|
void TestQPrefEquipment::test_set_struct()
|
|
{
|
|
// Test set func -> struct pref
|
|
|
|
auto tst = qPrefEquipment::instance();
|
|
tst->set_default_cylinder("new base21");
|
|
QCOMPARE(QString(prefs.default_cylinder), QString("new base21"));
|
|
tst->set_include_unused_tanks(false);
|
|
QCOMPARE(prefs.include_unused_tanks, false);
|
|
}
|
|
|
|
void TestQPrefEquipment::test_set_load_struct()
|
|
{
|
|
// test set func -> load -> struct pref
|
|
|
|
auto tst = qPrefEquipment::instance();
|
|
|
|
tst->set_default_cylinder("new base31");
|
|
prefs.default_cylinder = copy_qstring("error");
|
|
tst->set_include_unused_tanks(false);
|
|
prefs.include_unused_tanks = true;
|
|
tst->load();
|
|
QCOMPARE(QString(prefs.default_cylinder), QString("new base31"));
|
|
QCOMPARE(prefs.include_unused_tanks, false);
|
|
}
|
|
|
|
void TestQPrefEquipment::test_struct_disk()
|
|
{
|
|
// test struct prefs -> disk
|
|
|
|
auto tst = qPrefEquipment::instance();
|
|
prefs.default_cylinder = copy_qstring("base41");
|
|
prefs.include_unused_tanks = true;
|
|
|
|
tst->sync();
|
|
prefs.default_cylinder = copy_qstring("error");
|
|
prefs.include_unused_tanks = false;
|
|
|
|
tst->load();
|
|
QCOMPARE(QString(prefs.default_cylinder), QString("base41"));
|
|
QCOMPARE(prefs.include_unused_tanks, true);
|
|
|
|
}
|
|
|
|
#define TEST(METHOD, VALUE) \
|
|
QCOMPARE(METHOD, VALUE); \
|
|
equipment->sync(); \
|
|
equipment->load(); \
|
|
QCOMPARE(METHOD, VALUE);
|
|
|
|
void TestQPrefEquipment::test_oldPreferences()
|
|
{
|
|
auto equipment = qPrefEquipment::instance();
|
|
equipment->set_default_cylinder("cylinder_2");
|
|
TEST(equipment->default_cylinder(), QStringLiteral("cylinder_2"));
|
|
equipment->set_default_cylinder("cylinder_1");
|
|
TEST(equipment->default_cylinder(), QStringLiteral("cylinder_1"));
|
|
equipment->set_include_unused_tanks(true);
|
|
TEST(equipment->include_unused_tanks(), true);
|
|
equipment->set_include_unused_tanks(false);
|
|
TEST(equipment->include_unused_tanks(), false);
|
|
}
|
|
|
|
void TestQPrefEquipment::test_signals()
|
|
{
|
|
qPrefEquipment::set_default_cylinder("signal test");
|
|
QSignalSpy spy1(qPrefEquipment::instance(), &qPrefEquipment::default_cylinderChanged);
|
|
QSignalSpy spy2(qPrefEquipment::instance(), &qPrefEquipment::include_unused_tanksChanged);
|
|
|
|
// set default cylinder to same value it already had
|
|
qPrefEquipment::set_default_cylinder("signal test");
|
|
QCOMPARE(spy1.count(), 0);
|
|
|
|
// change default cylinder to different value
|
|
qPrefEquipment::set_default_cylinder("different value");
|
|
QCOMPARE(spy1.count(), 1);
|
|
QVERIFY(spy1.takeFirst().at(0).toBool() == true);
|
|
|
|
prefs.include_unused_tanks = true;
|
|
qPrefEquipment::set_include_unused_tanks(false);
|
|
QCOMPARE(spy2.count(), 1);
|
|
QVERIFY(spy2.takeFirst().at(0).toBool() == false);
|
|
}
|
|
|
|
QTEST_MAIN(TestQPrefEquipment)
|