aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-05-15 21:41:58 -0400
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-05-16 00:36:34 -0400
commit19750ed15ae7d6a8176c266a132e269989e91fed (patch)
tree7f820d777b41807e023510d8301660350bf8a21d
parent6766c5622089d0205460a5d74664b2d5dd8e7ac5 (diff)
downloadsubsurface-19750ed15ae7d6a8176c266a132e269989e91fed.tar.gz
Adjust test dives to comply with the current trip syntax
Otherwise the tests fail - we no longer support the old format. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--dives/test21.xml3
-rw-r--r--dives/test22.xml3
-rw-r--r--dives/test23.xml3
3 files changed, 6 insertions, 3 deletions
diff --git a/dives/test21.xml b/dives/test21.xml
index ce6b82f35..936597f75 100644
--- a/dives/test21.xml
+++ b/dives/test21.xml
@@ -1,9 +1,10 @@
<dives>
<program name='subsurface' version='1'></program>
-<trip date='2011-12-02' time='14:00:00' />
+<trip date='2011-12-02' time='14:00:00' >
<dive number='20' tripflag='INTRIP' date='2011-12-02' time='14:00:00' duration='30:00 min'>
<depth max='20.0 m' mean='15.0 m' />
<location>20th test dive - this should be in a trip with same location</location>
<notes>We are testing that the location of the dive is picked up in the trip if the trip has no location</notes>
</dive>
+</trip>
</dives>
diff --git a/dives/test22.xml b/dives/test22.xml
index e8112287d..763b75498 100644
--- a/dives/test22.xml
+++ b/dives/test22.xml
@@ -1,9 +1,10 @@
<dives>
<program name='subsurface' version='1'></program>
-<trip date='2011-12-02' location='trip location' time='15:00:00' />
+<trip date='2011-12-02' location='trip location' time='15:00:00' >
<dive number='21' tripflag='INTRIP' date='2011-12-02' time='15:00:00' duration='30:00 min'>
<depth max='20.0 m' mean='15.0 m' />
<location>21st test dive - this should be in a trip with a trip location</location>
<notes>We are testing that the location of the dive is not picked up in the trip if the trip has a location</notes>
</dive>
+</trip>
</dives>
diff --git a/dives/test23.xml b/dives/test23.xml
index defdfdd90..5fd0af3fe 100644
--- a/dives/test23.xml
+++ b/dives/test23.xml
@@ -1,11 +1,12 @@
<dives>
<program name='subsurface' version='1'></program>
-<trip date='2011-12-02' time='6:00:00' location='trip location' />
+<trip date='2011-12-02' time='6:00:00' location='trip location' >
<dive number='23' tripflag='INTRIP' date='2011-12-02' time='6:00:00' duration='30:00 min'>
<depth max='20.0 m' mean='15.0 m' />
<location>23rd test dive - this should be in a trip</location>
<notes>We are testing that the NOTRIP flag works</notes>
</dive>
+</trip>
<dive number='22' tripflag='NOTRIP' date='2011-12-03' time='7:00:00' duration='30:00 min'>
<depth max='20.0 m' mean='15.0 m' />
<location>22nd test dive - this should not be in a trip</location>