diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-08-18 15:06:15 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-08-23 10:17:12 -0700 |
| commit | d815e0c9476ef62e6b84fb28ce48ab7cddefe77e (patch) | |
| tree | 997b938f8080518d339797aae4630eb66b81e204 /tests/testmerge.cpp | |
| parent | ecb64d7e3e3c6c875defc9dc4aab01c65ccddf8a (diff) | |
| download | subsurface-d815e0c9476ef62e6b84fb28ce48ab7cddefe77e.tar.gz | |
Parse: pass dive_table argument to parse_file()
To enable undo of divelog-importing it is crucial that parse_file()
can parse into arbitrary dive tables.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
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 a664e1a35..b102e239f 100644 --- a/tests/testmerge.cpp +++ b/tests/testmerge.cpp @@ -21,9 +21,9 @@ void TestMerge::testMergeEmpty() /* * check that we correctly merge mixed cylinder dives */ - QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml"), 0); + QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &dive_table), 0); process_dives(true, false); - QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml"), 0); + QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml", &dive_table), 0); process_dives(true, false); QCOMPARE(save_dives("./testmerge47+48.ssrf"), 0); QFile org(SUBSURFACE_TEST_DATA "/dives/test47+48.xml"); @@ -44,9 +44,9 @@ void TestMerge::testMergeBackwards() /* * check that we correctly merge mixed cylinder dives */ - QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml"), 0); + QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml", &dive_table), 0); process_dives(true, false); - QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml"), 0); + QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &dive_table), 0); process_dives(true, false); QCOMPARE(save_dives("./testmerge47+48.ssrf"), 0); QFile org(SUBSURFACE_TEST_DATA "/dives/test47+48.xml"); |