diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-12-23 22:08:00 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-01-09 20:58:04 -0800 |
| commit | 0249e125898134d3f6d4a2a8972f3eeb30c02803 (patch) | |
| tree | 4830c88c2d61a096a2f1afdcc71bddf8d330cf73 /tests/testmerge.cpp | |
| parent | fd196f143ae9c6b3a51b057ba134c5e3a280e30f (diff) | |
| download | subsurface-0249e125898134d3f6d4a2a8972f3eeb30c02803.tar.gz | |
Import: split process_imported_dives() function
Split the process_imported_dives() function in two:
1) process_imported_dives() processes the dives and generates
a list of dives and trips to be added and removed.
2) add_imported_dives() calls process_imported_dives() and
does the actual removal / addition of dives and trips.
The goal is to split preparation and actual work, to
make dive import undo-able.
The code adds extra checks to never merge into the same
dive twice, as this would lead to a double-free() bug.
This should in principle never happen, as dives that
compare equal according to is_same_dive() are merged
in the imported-dives list, but perhaps in some pathologival
corner-cases is_same_dive() turns out to be non-transitive.
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 7e32ba32e..130c91b6d 100644 --- a/tests/testmerge.cpp +++ b/tests/testmerge.cpp @@ -24,9 +24,9 @@ void TestMerge::testMergeEmpty() struct dive_table table = { 0 }; struct trip_table trips = { 0 }; QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &table, &trips), 0); - process_imported_dives(&table, &trips, false, false, true); + add_imported_dives(&table, &trips, false, false, true); QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml", &table, &trips), 0); - process_imported_dives(&table, &trips, false, false, true); + add_imported_dives(&table, &trips, false, false, true); QCOMPARE(save_dives("./testmerge47+48.ssrf"), 0); QFile org(SUBSURFACE_TEST_DATA "/dives/test47+48.xml"); org.open(QFile::ReadOnly); @@ -49,9 +49,9 @@ void TestMerge::testMergeBackwards() struct dive_table table = { 0 }; struct trip_table trips = { 0 }; QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml", &table, &trips), 0); - process_imported_dives(&table, &trips, false, false, true); + add_imported_dives(&table, &trips, false, false, true); QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &table, &trips), 0); - process_imported_dives(&table, &trips, false, false, true); + add_imported_dives(&table, &trips, false, false, true); QCOMPARE(save_dives("./testmerge47+48.ssrf"), 0); QFile org(SUBSURFACE_TEST_DATA "/dives/test47+48.xml"); org.open(QFile::ReadOnly); |