810903bdb9
Dives were directly imported into the global dive table and then merged in process_imported_dives(). Make this interface more flexible, by passing an independent dive table. The dive table of the to-be-imported dives will be sorted and merged. Then each dive is inserted in a one-by-one manner to into the global dive table. This actually introduces (at least) two functional changes: 1) If a new dive spans two old dives, it will only be merged to the first dive. But this seems like a pathological case, which is of dubious value anyway. 2) Dives unrelated to the import will not be merged. The old code would happily merge dives that were not even close to the newly imported dives. A surprising behavior. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
40 lines
1.0 KiB
C++
40 lines
1.0 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), 0);
|
|
process_loaded_dives();
|
|
dive_table.preexisting = dive_table.nr;
|
|
}
|
|
|
|
void TestRenumber::testMerge()
|
|
{
|
|
struct dive_table table = { 0 };
|
|
QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47b.xml", &table), 0);
|
|
process_imported_dives(&table, false);
|
|
QCOMPARE(dive_table.nr, 1);
|
|
QCOMPARE(unsaved_changes(), 1);
|
|
mark_divelist_changed(false);
|
|
dive_table.preexisting = dive_table.nr;
|
|
}
|
|
|
|
void TestRenumber::testMergeAndAppend()
|
|
{
|
|
struct dive_table table = { 0 };
|
|
QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47c.xml", &table), 0);
|
|
process_imported_dives(&table, false);
|
|
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)
|