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 | |
| 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')
| -rw-r--r-- | tests/testgitstorage.cpp | 2 | ||||
| -rw-r--r-- | tests/testmerge.cpp | 8 | ||||
| -rw-r--r-- | tests/testrenumber.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tests/testgitstorage.cpp b/tests/testgitstorage.cpp index f6d0899cd..dfe64a3b3 100644 --- a/tests/testgitstorage.cpp +++ b/tests/testgitstorage.cpp @@ -137,7 +137,7 @@ void TestGitStorage::testGitStorageCloudOfflineSync() // read the local repo from the previous test and add dive 10 QCOMPARE(parse_file(qPrintable(localCacheRepo), &dive_table, &trip_table), 0); QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test10.xml", &dive_table, &trip_table), 0); - // calling process_loaded_dives() sorts the table, but calling process_imported_dives() + // calling process_loaded_dives() sorts the table, but calling add_imported_dives() // causes it to try to update the window title... let's not do that process_loaded_dives(); // now save only to the local cache but not to the remote server 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); diff --git a/tests/testrenumber.cpp b/tests/testrenumber.cpp index e6e802676..6d3ac7fa5 100644 --- a/tests/testrenumber.cpp +++ b/tests/testrenumber.cpp @@ -16,7 +16,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); - process_imported_dives(&table, &trips, false, false, true); + add_imported_dives(&table, &trips, false, false, true); QCOMPARE(dive_table.nr, 1); QCOMPARE(unsaved_changes(), 1); mark_divelist_changed(false); @@ -27,7 +27,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); - process_imported_dives(&table, &trips, false, false, true); + add_imported_dives(&table, &trips, false, false, true); QCOMPARE(dive_table.nr, 2); QCOMPARE(unsaved_changes(), 1); struct dive *d = get_dive(1); |