mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adapt CSV test to include suit

Browse source 
Also fixed it to correctly parse the mean depth (duh, a test that had a
bug) and added a buddy field for good measure.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-04-24 07:07:31 -07:00
parent c80d1879b7
commit 79bb61dba1
3 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
dives/test40-42.xml
View file

@ -5,23 +5,31 @@
</divesites> </divesites>
<dives> <dives>
<dive number='1' date='2013-10-01' time='10:34:00' duration='45:00 min'> <dive number='1' date='2013-10-01' time='10:34:00' duration='45:00 min'>
<buddy>Dirk</buddy>
<suit>wet, 5mm</suit>
<divecomputer> <divecomputer>
<depth max='18.0 m' /> <depth max='18.0 m' mean='16.0 m' />
</divecomputer> </divecomputer>
</dive> </dive>
<dive number='2' date='2013-10-01' time='12:13:00' duration='41:00 min'> <dive number='2' date='2013-10-01' time='12:13:00' duration='41:00 min'>
<buddy>Linus</buddy>
<suit>wet, shorty, 3mm</suit>
<divecomputer> <divecomputer>
<depth max='16.2 m' /> <depth max='16.2 m' mean='13.5 m' />
</divecomputer> </divecomputer>
</dive> </dive>
<dive number='3' date='2014-10-01' time='10:02:00' duration='48:00 min'> <dive number='3' date='2014-10-01' time='10:02:00' duration='48:00 min'>
<buddy>Tomaz</buddy>
<suit>none</suit>
<divecomputer> <divecomputer>
<depth max='13.3 m' /> <depth max='13.3 m' mean='11.5 m' />
</divecomputer> </divecomputer>
</dive> </dive>
<dive number='4' date='2014-10-01' time='14:19:00' duration='34:00 min'> <dive number='4' date='2014-10-01' time='14:19:00' duration='34:00 min'>
<buddy>Don</buddy>
<suit>dry, Whites Fusion</suit>
<divecomputer> <divecomputer>
<depth max='24.9 m' /> <depth max='24.9 m' mean='20.1 m' />
</divecomputer> </divecomputer>
</dive> </dive>
<dive number='1' date='2014-04-01' time='10:00:00' duration='77:54 min'> <dive number='1' date='2014-04-01' time='10:00:00' duration='77:54 min'>

10
dives/test41.csv
View file

@ -1,6 +1,6 @@
#Nr date time duration maxdepth avgdepth #Nr date time duration maxdepth avgdepth buddy suit
1 10/1/13 10:34 45:00 18 9 1 10/1/13 10:34 45:00 18 16 Dirk wet, 5mm
2 10/1/13 12:13 41:00 16.2 8.2 2 10/1/13 12:13 41:00 16.2 13.5 Linus wet, shorty, 3mm
3 10/1/14 10:02 48:00 13.3 9.1 3 10/1/14 10:02 48:00 13.3 11.5 Tomaz none
4 10/1/14 14:19 34:00 24.9 12.1 4 10/1/14 14:19 34:00 24.9 20.1 Don dry, Whites Fusion

1 #Nr date time duration maxdepth avgdepth buddy suit
2 1 10/1/13 10:34 45:00 18 9 16 Dirk wet, 5mm
3 2 10/1/13 12:13 41:00 16.2 8.2 13.5 Linus wet, shorty, 3mm
4 3 10/1/14 10:02 48:00 13.3 9.1 11.5 Tomaz none
5 4 10/1/14 14:19 34:00 24.9 12.1 20.1 Don dry, Whites Fusion
6

4
tests/testparse.cpp
View file

@ -14,8 +14,8 @@ void TestParse::testParseCSV()
0, // metric units 0, // metric units
1, // mm/dd/yyyy 1, // mm/dd/yyyy
2, // min:sec 2, // min:sec
0, 1, 2, 3, -1, -1, 4, -1, // Dive #, date, time, duration, maxdepth, avgdepth 0, 1, 2, 3, -1, -1, 4, 5, // Dive #, date, time, duration, maxdepth, avgdepth
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), 0); -1, 6, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), 0); // buddy, suit
fprintf(stderr, "number of dives %d \n", dive_table.nr); fprintf(stderr, "number of dives %d \n", dive_table.nr);
} }