From 2a1d7a510c60ad26e456b40e4f34caeb145339e3 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Mon, 3 Sep 2012 10:31:25 -0700
Subject: [PATCH] Correct the trip related test dives

They still had the old "date only" format, but the code now relies on date
and time being both set.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 dives/test21.xml | 2 +-
 dives/test22.xml | 2 +-
 dives/test23.xml | 9 +++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/dives/test21.xml b/dives/test21.xml
index 5f5f6c981..ce6b82f35 100644
--- a/dives/test21.xml
+++ b/dives/test21.xml
@@ -1,6 +1,6 @@
 <dives>
 <program name='subsurface' version='1'></program>
-<trip date='2011-12-02' />
+<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>
diff --git a/dives/test22.xml b/dives/test22.xml
index a61032327..e8112287d 100644
--- a/dives/test22.xml
+++ b/dives/test22.xml
@@ -1,6 +1,6 @@
 <dives>
 <program name='subsurface' version='1'></program>
-<trip date='2011-12-02' location='trip location' />
+<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>
diff --git a/dives/test23.xml b/dives/test23.xml
index c61ad2db9..defdfdd90 100644
--- a/dives/test23.xml
+++ b/dives/test23.xml
@@ -1,7 +1,12 @@
 <dives>
 <program name='subsurface' version='1'></program>
-<trip date='2011-12-02' location='trip location' />
-<dive number='22' tripflag='NOTRIP' date='2011-12-09' time='6:00:00' duration='30:00 min'>
+<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>
+<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>
   <notes>We are testing that the NOTRIP flag works</notes>