diff options
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 b71bb0955..e710de66e 100644 --- a/tests/testmerge.cpp +++ b/tests/testmerge.cpp @@ -29,9 +29,9 @@ void TestMerge::testMergeEmpty() struct device_table devices; struct filter_preset_table filter_presets; QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &table, &trips, &sites, &devices, &filter_presets), 0); - add_imported_dives(&table, &trips, &sites, IMPORT_MERGE_ALL_TRIPS); + add_imported_dives(&table, &trips, &sites, &devices, IMPORT_MERGE_ALL_TRIPS); QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml", &table, &trips, &sites, &devices, &filter_presets), 0); - add_imported_dives(&table, &trips, &sites, IMPORT_MERGE_ALL_TRIPS); + add_imported_dives(&table, &trips, &sites, &devices, IMPORT_MERGE_ALL_TRIPS); QCOMPARE(save_dives("./testmerge47+48.ssrf"), 0); QFile org(SUBSURFACE_TEST_DATA "/dives/test47+48.xml"); org.open(QFile::ReadOnly); @@ -57,9 +57,9 @@ void TestMerge::testMergeBackwards() struct device_table devices; struct filter_preset_table filter_presets; QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml", &table, &trips, &sites, &devices, &filter_presets), 0); - add_imported_dives(&table, &trips, &sites, IMPORT_MERGE_ALL_TRIPS); + add_imported_dives(&table, &trips, &sites, &devices, IMPORT_MERGE_ALL_TRIPS); QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &table, &trips, &sites, &devices, &filter_presets), 0); - add_imported_dives(&table, &trips, &sites, IMPORT_MERGE_ALL_TRIPS); + add_imported_dives(&table, &trips, &sites, &devices, IMPORT_MERGE_ALL_TRIPS); QCOMPARE(save_dives("./testmerge47+48.ssrf"), 0); QFile org(SUBSURFACE_TEST_DATA "/dives/test48+47.xml"); org.open(QFile::ReadOnly); |