summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Miika Turkia <miika.turkia@gmail.com>2018-01-07 09:42:04 +0200
committerGravatar mturkia <miika.turkia@gmail.com>2018-01-08 06:06:12 +0200
commit4a5b40c14401b8f7d1a25b7538d6abd99f7895b7 (patch)
tree2bad525124559401c89d16a654e7f5d148c70ef0
parentf91f16a4b6ab1eaed58cae638324953c8006cfbf (diff)
downloadsubsurface-4a5b40c14401b8f7d1a25b7538d6abd99f7895b7.tar.gz
Update DL7 tests to current import
As we now parse dives without profile, we get 2 more dives from the sample log import (3 in total). And naturally also the resulting XML to compare against needs to be updated. Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
-rw-r--r--dives/DL7.xml8
-rw-r--r--tests/testparse.cpp2
2 files changed, 9 insertions, 1 deletions
diff --git a/dives/DL7.xml b/dives/DL7.xml
index e0b94b43d..4541307bc 100644
--- a/dives/DL7.xml
+++ b/dives/DL7.xml
@@ -9,6 +9,10 @@
<divesites>
</divesites>
<dives>
+<dive number='1' date='2018-01-01'>
+ <divecomputer model='csv' deviceid='ffffffff'>
+ </divecomputer>
+</dive>
<dive number='2' date='2018-01-02' time='10:10:00' duration='60:00 min'>
<divecomputer model='Imported from CSV' deviceid='ffffffff'>
<depth max='10.0 m' mean='9.508 m' />
@@ -18,5 +22,9 @@
<sample time='60:00 min' depth='0.0 m' />
</divecomputer>
</dive>
+<dive date='2018-01-03'>
+ <divecomputer model='csv' deviceid='ffffffff'>
+ </divecomputer>
+</dive>
</dives>
</divelog>
diff --git a/tests/testparse.cpp b/tests/testparse.cpp
index ae45bacf0..cc60052f8 100644
--- a/tests/testparse.cpp
+++ b/tests/testparse.cpp
@@ -500,7 +500,7 @@ void TestParse::parseDL7()
clear_dive_file_data();
QCOMPARE(parse_csv_file(SUBSURFACE_TEST_DATA "/dives/DL7.zxu",
params, pnr - 1 , "DL7"), 0);
- QCOMPARE(dive_table.nr, 1);
+ QCOMPARE(dive_table.nr, 3);
QCOMPARE(save_dives("./testdl7out.ssrf"), 0);
FILE_COMPARE("./testdl7out.ssrf",