diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2012-12-06 13:06:16 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2012-12-06 13:06:16 -0800 |
| commit | c796c16115dc3d7d52976395dfcfedc7e8bd1bec (patch) | |
| tree | e8452cd78c5b15a12efd5d376bd047dffd8ea423 | |
| parent | 936d289cb7d5c1af9aa47784557bbf053cdbb988 (diff) | |
| download | subsurface-c796c16115dc3d7d52976395dfcfedc7e8bd1bec.tar.gz | |
Add two test dives that triggered the bug fixed in the previous commit
Loading these two XML files created a divelist with two trips that each
started at the same time but that were NOT linked together (because the
code in insert_trip detected that they started at the same time). Since
the trips were not linked together, trying to then merge those two trips
from the UI got us into an infinite loop, trying to move a dive from one
trip into the same trip (as the code couldn't find the trip that wasn't
linked into the dive_trip_list).
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | dives/test25.xml | 23 | ||||
| -rw-r--r-- | dives/test26.xml | 23 |
2 files changed, 46 insertions, 0 deletions
diff --git a/dives/test25.xml b/dives/test25.xml new file mode 100644 index 000000000..a53925830 --- /dev/null +++ b/dives/test25.xml @@ -0,0 +1,23 @@ +<dives> +<program name='subsurface' version='1'></program> +<trip date='2011-12-06' time='6:00:00' location='First Trip'> +<dive number='26' date='2011-12-02' time='6:00:00' duration='30:00 min'> + <depth max='24.3 m' mean='12.773 m' /> + <temperature air='24.3 C' water='24.2 C' /> + <surface pressure='0.981 bar' /> + <water salinity='1000 g/l' /> + <location>Dive location</location> + <notes>New trip format + includes a divecomputer section</notes> + <cylinder size='15.0 l' workpressure='202.6 bar' description='AL106' /> + <divecomputer model='Model Product' deviceid='e04d0248' diveid='00000002'> + <event time='27:50 min' name='Speed Alarm' /> + <sample time='0:06 min' depth='1.86 m' temp='24.3 C' ndl='99:00 min' /> + <sample time='1:00 min' depth='20 m' temp='24.2 C' /> + <sample time='27:00 min' depth='20 m' /> + <sample time='28:00 min' depth='3 m' /> + <sample time='29:00 min' depth='3 m' /> + <sample time='30:00 min' depth='0.3 m' /> + </divecomputer> +</dive> +</trip> +</dives> diff --git a/dives/test26.xml b/dives/test26.xml new file mode 100644 index 000000000..3552d5f31 --- /dev/null +++ b/dives/test26.xml @@ -0,0 +1,23 @@ +<dives> +<program name='subsurface' version='1'></program> +<trip date='2011-12-06' time='6:00:00' location='First Trip'> +<dive number='27' date='2011-12-02' time='6:35:00' duration='30:00 min'> + <depth max='24.3 m' mean='12.773 m' /> + <temperature air='24.3 C' water='24.2 C' /> + <surface pressure='0.981 bar' /> + <water salinity='1000 g/l' /> + <location>Same dive location</location> + <notes>New trip format + includes a divecomputer section - designed to be manually merged wiht previous dive.</notes> + <cylinder size='15.0 l' workpressure='202.6 bar' description='AL106' /> + <divecomputer model='Model Product' deviceid='e04d0248' diveid='00000002'> + <event time='27:50 min' name='Speed Alarm' /> + <sample time='0:06 min' depth='1.86 m' temp='24.3 C' ndl='99:00 min' /> + <sample time='1:00 min' depth='20 m' temp='24.2 C' /> + <sample time='27:00 min' depth='20 m' /> + <sample time='28:00 min' depth='3 m' /> + <sample time='29:00 min' depth='3 m' /> + <sample time='30:00 min' depth='0.3 m' /> + </divecomputer> +</dive> +</trip> +</dives> |