From 37146c5742503becf75468fb07aab56011cb9101 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Thu, 28 Feb 2019 22:45:17 +0100 Subject: Parser: parse into custom dive site table To extend the undo system to dive sites, the importers and downloaders must not parse directly into the global dive site table. Instead, pass a dive_site_table argument to parse into. For now, always pass the global dive_site_table so that this commit should not cause any functional change. Signed-off-by: Berthold Stoeger --- tests/testrenumber.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/testrenumber.cpp') diff --git a/tests/testrenumber.cpp b/tests/testrenumber.cpp index 0b766f3cb..d674c4922 100644 --- a/tests/testrenumber.cpp +++ b/tests/testrenumber.cpp @@ -7,7 +7,7 @@ void TestRenumber::setup() { - QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &dive_table, &trip_table), 0); + QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &dive_table, &trip_table, &dive_site_table), 0); process_loaded_dives(); } @@ -15,7 +15,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); + QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47b.xml", &table, &trip_table, &dive_site_table), 0); add_imported_dives(&table, &trips, IMPORT_MERGE_ALL_TRIPS); QCOMPARE(dive_table.nr, 1); QCOMPARE(unsaved_changes(), 1); @@ -26,7 +26,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); + QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47c.xml", &table, &trip_table, &dive_site_table), 0); add_imported_dives(&table, &trips, IMPORT_MERGE_ALL_TRIPS); QCOMPARE(dive_table.nr, 2); QCOMPARE(unsaved_changes(), 1); -- cgit v1.2.3-70-g09d2