mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
0249e12589
Split the process_imported_dives() function in two: 1) process_imported_dives() processes the dives and generates a list of dives and trips to be added and removed. 2) add_imported_dives() calls process_imported_dives() and does the actual removal / addition of dives and trips. The goal is to split preparation and actual work, to make dive import undo-able. The code adds extra checks to never merge into the same dive twice, as this would lead to a double-free() bug. This should in principle never happen, as dives that compare equal according to is_same_dive() are merged in the imported-dives list, but perhaps in some pathologival corner-cases is_same_dive() turns out to be non-transitive. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
39 lines
1.1 KiB
C++
39 lines
1.1 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
#include "testrenumber.h"
|
|
#include "core/dive.h"
|
|
#include "core/divelist.h"
|
|
#include "core/file.h"
|
|
#include <QTextStream>
|
|
|
|
void TestRenumber::setup()
|
|
{
|
|
QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &dive_table, &trip_table), 0);
|
|
process_loaded_dives();
|
|
}
|
|
|
|
void TestRenumber::testMerge()
|
|
{
|
|
struct dive_table table = { 0 };
|
|
struct trip_table trips = { 0 };
|
|
QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47b.xml", &table, &trip_table), 0);
|
|
add_imported_dives(&table, &trips, false, false, true);
|
|
QCOMPARE(dive_table.nr, 1);
|
|
QCOMPARE(unsaved_changes(), 1);
|
|
mark_divelist_changed(false);
|
|
}
|
|
|
|
void TestRenumber::testMergeAndAppend()
|
|
{
|
|
struct dive_table table = { 0 };
|
|
struct trip_table trips = { 0 };
|
|
QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47c.xml", &table, &trip_table), 0);
|
|
add_imported_dives(&table, &trips, false, false, true);
|
|
QCOMPARE(dive_table.nr, 2);
|
|
QCOMPARE(unsaved_changes(), 1);
|
|
struct dive *d = get_dive(1);
|
|
QVERIFY(d != NULL);
|
|
if (d)
|
|
QCOMPARE(d->number, 2);
|
|
}
|
|
|
|
QTEST_GUILESS_MAIN(TestRenumber)
|