diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-01-13 22:53:57 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-01-19 13:48:17 -0800 |
| commit | 891fcbf520f28ef6016d6171eba83c6773efca00 (patch) | |
| tree | 22952fe84f0ff56f9ceffdac35c1e1329c7534e3 /tests | |
| parent | ff9506b21bbb9910256841dcb577bcb2e19047e8 (diff) | |
| download | subsurface-891fcbf520f28ef6016d6171eba83c6773efca00.tar.gz | |
Import: control process_imported_dives() by flags
process_imported_dives() takes four boolean parameters. Replace these
by flags. This makes the function calls much more descriptive. Morover,
it becomes easier to add or remove flags.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testmerge.cpp | 8 | ||||
| -rw-r--r-- | tests/testrenumber.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/testmerge.cpp b/tests/testmerge.cpp index dc5ab5a2d..7b1e84149 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, false); + add_imported_dives(&table, &trips, IMPORT_MERGE_ALL_TRIPS); QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml", &table, &trips), 0); - add_imported_dives(&table, &trips, false, false, true, false); + add_imported_dives(&table, &trips, IMPORT_MERGE_ALL_TRIPS); 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, false); + add_imported_dives(&table, &trips, IMPORT_MERGE_ALL_TRIPS); QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &table, &trips), 0); - add_imported_dives(&table, &trips, false, false, true, false); + add_imported_dives(&table, &trips, IMPORT_MERGE_ALL_TRIPS); QCOMPARE(save_dives("./testmerge47+48.ssrf"), 0); QFile org(SUBSURFACE_TEST_DATA "/dives/test47+48.xml"); org.open(QFile::ReadOnly); diff --git a/tests/testrenumber.cpp b/tests/testrenumber.cpp index e7589fc0a..0b766f3cb 100644 --- a/tests/testrenumber.cpp +++ b/tests/testrenumber.cpp @@ -16,7 +16,7 @@ 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, false); + add_imported_dives(&table, &trips, IMPORT_MERGE_ALL_TRIPS); QCOMPARE(dive_table.nr, 1); QCOMPARE(unsaved_changes(), 1); mark_divelist_changed(false); @@ -27,7 +27,7 @@ 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, false); + add_imported_dives(&table, &trips, IMPORT_MERGE_ALL_TRIPS); QCOMPARE(dive_table.nr, 2); QCOMPARE(unsaved_changes(), 1); struct dive *d = get_dive(1); |