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 4559ad9b9..42bac30cf 100644 --- a/tests/testmerge.cpp +++ b/tests/testmerge.cpp @@ -22,9 +22,9 @@ void TestMerge::testMergeEmpty() * check that we correctly merge mixed cylinder dives */ struct dive_table table = { 0 }; - QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &table), 0); + QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &table, &trip_table), 0); process_imported_dives(&table, false, false); - QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml", &table), 0); + QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml", &table, &trip_table), 0); process_imported_dives(&table, false, false); QCOMPARE(save_dives("./testmerge47+48.ssrf"), 0); QFile org(SUBSURFACE_TEST_DATA "/dives/test47+48.xml"); @@ -46,9 +46,9 @@ void TestMerge::testMergeBackwards() * check that we correctly merge mixed cylinder dives */ struct dive_table table = { 0 }; - QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml", &table), 0); + QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml", &table, &trip_table), 0); process_imported_dives(&table, false, false); - QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &table), 0); + QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &table, &trip_table), 0); process_imported_dives(&table, false, false); QCOMPARE(save_dives("./testmerge47+48.ssrf"), 0); QFile org(SUBSURFACE_TEST_DATA "/dives/test47+48.xml"); |