diff options
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 a99fd65e7..4559ad9b9 100644 --- a/tests/testmerge.cpp +++ b/tests/testmerge.cpp @@ -23,9 +23,9 @@ void TestMerge::testMergeEmpty() */ struct dive_table table = { 0 }; QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &table), 0); - process_imported_dives(&table, false); + process_imported_dives(&table, false, false); QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml", &table), 0); - process_imported_dives(&table, false); + process_imported_dives(&table, false, false); QCOMPARE(save_dives("./testmerge47+48.ssrf"), 0); QFile org(SUBSURFACE_TEST_DATA "/dives/test47+48.xml"); org.open(QFile::ReadOnly); @@ -47,9 +47,9 @@ void TestMerge::testMergeBackwards() */ struct dive_table table = { 0 }; QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml", &table), 0); - process_imported_dives(&table, false); + process_imported_dives(&table, false, false); QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &table), 0); - process_imported_dives(&table, false); + process_imported_dives(&table, false, false); 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 9c409c512..89ce1f8d0 100644 --- a/tests/testrenumber.cpp +++ b/tests/testrenumber.cpp @@ -15,7 +15,7 @@ void TestRenumber::testMerge() { struct dive_table table = { 0 }; QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47b.xml", &table), 0); - process_imported_dives(&table, false); + process_imported_dives(&table, false, false); QCOMPARE(dive_table.nr, 1); QCOMPARE(unsaved_changes(), 1); mark_divelist_changed(false); @@ -25,7 +25,7 @@ void TestRenumber::testMergeAndAppend() { struct dive_table table = { 0 }; QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47c.xml", &table), 0); - process_imported_dives(&table, false); + process_imported_dives(&table, false, false); QCOMPARE(dive_table.nr, 2); QCOMPARE(unsaved_changes(), 1); struct dive *d = get_dive(1); |