Simple test case for merging dives

We do some merging in a couple of the other tests as well, but the idea
is to have specific test cases that exercise our merge logic.

This one starts simple. Merge a dive with some valid info with a second
one that has less data filled. And then try it in both possible orders.

It shows a few potential problems.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-02-21 17:23:19 -08:00
parent c4976b505a
commit 3fef6ec31d
5 changed files with 112 additions and 0 deletions

22
dives/test47+48.xml Normal file
View file

@ -0,0 +1,22 @@
<divelog program='subsurface' version='3'>
<settings>
</settings>
<divesites>
<site uuid='15ae02d0' name='Test dive'>
</site>
</divesites>
<dives>
<dive number='1' tags='test' divesiteid='15ae02d0' 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>

13
dives/test48.xml Normal file
View file

@ -0,0 +1,13 @@
<divelog program='subsurface' version='3'>
<divesites>
<site uuid='15ae02d1'>
</site>
</divesites>
<dives>
<dive number='1' tags='test' divesiteid='15ae02d1' date='2015-10-01' time='08:00:25' duration='46:00 min'>
<divecomputer date='2015-10-05' time='08:45:25'>
<depth max='13.716 m' mean='10.595 m' />
</divecomputer>
</dive>
</dives>
</divelog>