diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-01-13 08:12:47 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-01-19 13:48:17 -0800 |
| commit | 1cd0863cca678cf54dfa8a71f3ca9f94bfc4f693 (patch) | |
| tree | 6c93ffdab364c718bb9876ee9ac463b773e8ea5d /tests/testmerge.cpp | |
| parent | 31eb86c73365deefc2bcf51f7ad86bf4ba314379 (diff) | |
| download | subsurface-1cd0863cca678cf54dfa8a71f3ca9f94bfc4f693.tar.gz | |
Import: add add_to_new_trip flag to process_imported_dives()
If this flag is set, dives that are not assigned to a trip will
be assigned to a new trip. This flag is set if the user checked
"add to new trip" in the download dialog of the desktop version.
Currently this is a no-op as the dives will already have been
added to a new trip by the downloading code. This will be removed
in a subsequent commit.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'tests/testmerge.cpp')
| -rw-r--r-- | tests/testmerge.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/testmerge.cpp b/tests/testmerge.cpp index 130c91b6d..dc5ab5a2d 100644 --- a/tests/testmerge.cpp +++ b/tests/testmerge.cpp @@ -24,9 +24,9 @@ void TestMerge::testMergeEmpty() struct dive_table table = { 0 }; struct trip_table trips = { 0 }; QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &table, &trips), 0); - add_imported_dives(&table, &trips, false, false, true); + add_imported_dives(&table, &trips, false, false, true, false); QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml", &table, &trips), 0); - add_imported_dives(&table, &trips, false, false, true); + add_imported_dives(&table, &trips, false, false, true, false); QCOMPARE(save_dives("./testmerge47+48.ssrf"), 0); QFile org(SUBSURFACE_TEST_DATA "/dives/test47+48.xml"); org.open(QFile::ReadOnly); @@ -49,9 +49,9 @@ void TestMerge::testMergeBackwards() struct dive_table table = { 0 }; struct trip_table trips = { 0 }; QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml", &table, &trips), 0); - add_imported_dives(&table, &trips, false, false, true); + add_imported_dives(&table, &trips, false, false, true, false); QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &table, &trips), 0); - add_imported_dives(&table, &trips, false, false, true); + add_imported_dives(&table, &trips, false, false, true, false); QCOMPARE(save_dives("./testmerge47+48.ssrf"), 0); QFile org(SUBSURFACE_TEST_DATA "/dives/test47+48.xml"); org.open(QFile::ReadOnly); |