diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testmerge.cpp | 18 | ||||
| -rw-r--r-- | tests/testrenumber.cpp | 6 |
2 files changed, 14 insertions, 10 deletions
diff --git a/tests/testmerge.cpp b/tests/testmerge.cpp index 42bac30cf..73856804d 100644 --- a/tests/testmerge.cpp +++ b/tests/testmerge.cpp @@ -22,10 +22,11 @@ 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, &trip_table), 0); - process_imported_dives(&table, false, false); - QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml", &table, &trip_table), 0); - process_imported_dives(&table, false, false); + struct trip_table trips = { 0 }; + QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &table, &trips), 0); + process_imported_dives(&table, &trips, false, false); + QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml", &table, &trips), 0); + process_imported_dives(&table, &trips, false, false); QCOMPARE(save_dives("./testmerge47+48.ssrf"), 0); QFile org(SUBSURFACE_TEST_DATA "/dives/test47+48.xml"); org.open(QFile::ReadOnly); @@ -46,10 +47,11 @@ 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, &trip_table), 0); - process_imported_dives(&table, false, false); - QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &table, &trip_table), 0); - process_imported_dives(&table, false, false); + struct trip_table trips = { 0 }; + QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml", &table, &trips), 0); + process_imported_dives(&table, &trips, false, false); + QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &table, &trips), 0); + process_imported_dives(&table, &trips, 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 b2075a849..e69a276ca 100644 --- a/tests/testrenumber.cpp +++ b/tests/testrenumber.cpp @@ -14,8 +14,9 @@ void TestRenumber::setup() 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); - process_imported_dives(&table, false, false); + process_imported_dives(&table, &trips, false, false); QCOMPARE(dive_table.nr, 1); QCOMPARE(unsaved_changes(), 1); mark_divelist_changed(false); @@ -24,8 +25,9 @@ void TestRenumber::testMerge() 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); - process_imported_dives(&table, false, false); + process_imported_dives(&table, &trips, false, false); QCOMPARE(dive_table.nr, 2); QCOMPARE(unsaved_changes(), 1); struct dive *d = get_dive(1); |