mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dive site: fix merging tests

Browse source 
The handling of dive site merging changed and therefore the tests
have to be adapted.

1) Dive sites are recognized as identical based on their name.
   Therefore, give the dive sites that should be merged the same name.
2) The dive site id of the first imported dive is kept. Thus,
   merge and reverse merge produce two different output files.
   Create a second file reflecting that fact.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-04-05 21:56:20 +02:00 • committed by Dirk Hohndel
parent b024ca101e
commit 858d3e2eed
3 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
dives/test48+47.xml Normal file
View file

@ -0,0 +1,22 @@
<divelog program='subsurface' version='3'>
<settings>
</settings>
<divesites>
<site uuid='15ae02d1' name='Test dive'>
</site>
</divesites>
<dives>
<dive number='1' tags='test' divesiteid='15ae02d1' date='2015-10-01' time='08:00:25' duration='46:00 min'>
<cylinder size='11.1 l' workpressure='207.0 bar' description='unknown' />
<divecomputer model='do not care' date='2015-10-05' time='08:45:25'>
<depth max='13.716 m' mean='10.595 m' />
<sample time='0:00 min' depth='0.0 m' />
<sample time='0:36 min' depth='13.716 m' />
<sample time='20:00 min' depth='13.716 m' />
<sample time='42:00 min' depth='4.572 m' />
<sample time='45:00 min' depth='4.572 m' />
<sample time='46:00 min' depth='0.0 m' />
</divecomputer>
</dive>
</dives>
</divelog>

2
dives/test48.xml
View file

@ -1,6 +1,6 @@
<divelog program='subsurface' version='3'>
<divesites>
<site uuid='15ae02d1'>
<site uuid='15ae02d1' name='Test dive'>
</site>
</divesites>
<dives>

2
tests/testmerge.cpp
View file

@ -55,7 +55,7 @@ void TestMerge::testMergeBackwards()
QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml", &table, &trips, &sites), 0);
add_imported_dives(&table, &trips, &sites, IMPORT_MERGE_ALL_TRIPS);
QCOMPARE(save_dives("./testmerge47+48.ssrf"), 0);
QFile org(SUBSURFACE_TEST_DATA "/dives/test47+48.xml");
QFile org(SUBSURFACE_TEST_DATA "/dives/test48+47.xml");
org.open(QFile::ReadOnly);
QFile out("./testmerge47+48.ssrf");
out.open(QFile::ReadOnly);