mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 05:00:20 +00:00
1593f2ebad
The old way of merging log-files was not well defined: Trips were recognized as the same if and only if the first dives started at the same instant. Later dives did not matter. Change this to merge dives if they are overlapping. Moreover, on parsing and download generate trips in a separate trip-table. This will be fundamental for undo of dive-import: Firstly, we don't want to mix trips of imported and not-yet imported dives. Secondly, by merging trip-wise, we can autogroup the dives in the import-data to trips and merge these at once. This will simplify the code to decide to which trip dives should be autogrouped. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
69 lines
2.2 KiB
C++
69 lines
2.2 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
#include "testmerge.h"
|
|
#include "core/dive.h"
|
|
#include "core/divelist.h"
|
|
#include "core/file.h"
|
|
#include <QTextStream>
|
|
|
|
void TestMerge::initTestCase()
|
|
{
|
|
/* we need to manually tell that the resource exists, because we are using it as library. */
|
|
Q_INIT_RESOURCE(subsurface);
|
|
}
|
|
|
|
void TestMerge::cleanup()
|
|
{
|
|
clear_dive_file_data();
|
|
}
|
|
|
|
void TestMerge::testMergeEmpty()
|
|
{
|
|
/*
|
|
* check that we correctly merge mixed cylinder dives
|
|
*/
|
|
struct dive_table table = { 0 };
|
|
struct trip_table trips = { 0 };
|
|
QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &table, &trips), 0);
|
|
process_imported_dives(&table, &trips, false, false);
|
|
QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml", &table, &trips), 0);
|
|
process_imported_dives(&table, &trips, false, false);
|
|
QCOMPARE(save_dives("./testmerge47+48.ssrf"), 0);
|
|
QFile org(SUBSURFACE_TEST_DATA "/dives/test47+48.xml");
|
|
org.open(QFile::ReadOnly);
|
|
QFile out("./testmerge47+48.ssrf");
|
|
out.open(QFile::ReadOnly);
|
|
QTextStream orgS(&org);
|
|
QTextStream outS(&out);
|
|
QStringList readin = orgS.readAll().split("\n");
|
|
QStringList written = outS.readAll().split("\n");
|
|
while (readin.size() && written.size()) {
|
|
QCOMPARE(written.takeFirst().trimmed(), readin.takeFirst().trimmed());
|
|
}
|
|
}
|
|
|
|
void TestMerge::testMergeBackwards()
|
|
{
|
|
/*
|
|
* check that we correctly merge mixed cylinder dives
|
|
*/
|
|
struct dive_table table = { 0 };
|
|
struct trip_table trips = { 0 };
|
|
QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml", &table, &trips), 0);
|
|
process_imported_dives(&table, &trips, false, false);
|
|
QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &table, &trips), 0);
|
|
process_imported_dives(&table, &trips, false, false);
|
|
QCOMPARE(save_dives("./testmerge47+48.ssrf"), 0);
|
|
QFile org(SUBSURFACE_TEST_DATA "/dives/test47+48.xml");
|
|
org.open(QFile::ReadOnly);
|
|
QFile out("./testmerge47+48.ssrf");
|
|
out.open(QFile::ReadOnly);
|
|
QTextStream orgS(&org);
|
|
QTextStream outS(&out);
|
|
QStringList readin = orgS.readAll().split("\n");
|
|
QStringList written = outS.readAll().split("\n");
|
|
while (readin.size() && written.size()) {
|
|
QCOMPARE(written.takeFirst().trimmed(), readin.takeFirst().trimmed());
|
|
}
|
|
}
|
|
|
|
QTEST_GUILESS_MAIN(TestMerge)
|