diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-02-21 17:23:19 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-02-21 18:22:56 -0800 |
| commit | 3fef6ec31da786bde7f249dd9c07121944ddd9ee (patch) | |
| tree | dc1d579f1072a6bf351935165cbafae20099ab7c /dives | |
| parent | c4976b505a2c4a1fe62610b3c875eac56957c924 (diff) | |
| download | subsurface-3fef6ec31da786bde7f249dd9c07121944ddd9ee.tar.gz | |
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>
Diffstat (limited to 'dives')
| -rw-r--r-- | dives/test47+48.xml | 22 | ||||
| -rw-r--r-- | dives/test48.xml | 13 |
2 files changed, 35 insertions, 0 deletions
diff --git a/dives/test47+48.xml b/dives/test47+48.xml new file mode 100644 index 000000000..aa4c129c0 --- /dev/null +++ b/dives/test47+48.xml @@ -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> diff --git a/dives/test48.xml b/dives/test48.xml new file mode 100644 index 000000000..421325c4b --- /dev/null +++ b/dives/test48.xml @@ -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> |