summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorGravatar Miika Turkia <miika.turkia@gmail.com>2015-08-27 17:36:24 +0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-08-27 08:59:50 -0700
commit14999341e01eb9b494368d0c9431097853e1141f (patch)
treeb29f8da6189aeb26886c1e6f3587db94c67c2639 /tests
parent8e08fdcc85a95fa31f47478f20cb6fa9579162fb (diff)
downloadsubsurface-14999341e01eb9b494368d0c9431097853e1141f.tar.gz
Update tests to use cleaner CSV parsing "API"
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/testparse.cpp55
1 files changed, 38 insertions, 17 deletions
diff --git a/tests/testparse.cpp b/tests/testparse.cpp
index 76b3912da..7d892fab4 100644
--- a/tests/testparse.cpp
+++ b/tests/testparse.cpp
@@ -146,24 +146,45 @@ void TestParse::testParseCompareDM4Output()
void TestParse::testParseHUDC()
{
+ char *params[37];
+ int pnr = 0;
+
+ params[pnr++] = strdup("timeField");
+ params[pnr++] = intdup(0);
+ params[pnr++] = strdup("depthField");
+ params[pnr++] = intdup(1);
+ params[pnr++] = strdup("tempField");
+ params[pnr++] = intdup(5);
+ params[pnr++] = strdup("po2Field");
+ params[pnr++] = intdup(-1);
+ params[pnr++] = strdup("o2sensor1Field");
+ params[pnr++] = intdup(-1);
+ params[pnr++] = strdup("o2sensor2Field");
+ params[pnr++] = intdup(-1);
+ params[pnr++] = strdup("o2sensor3Field");
+ params[pnr++] = intdup(-1);
+ params[pnr++] = strdup("cnsField");
+ params[pnr++] = intdup(-1);
+ params[pnr++] = strdup("ndlField");
+ params[pnr++] = intdup(2);
+ params[pnr++] = strdup("ttsField");
+ params[pnr++] = intdup(-1);
+ params[pnr++] = strdup("stopdepthField");
+ params[pnr++] = intdup(-1);
+ params[pnr++] = strdup("pressureField");
+ params[pnr++] = intdup(-1);
+ params[pnr++] = strdup("setpointFiend");
+ params[pnr++] = intdup(-1);
+ params[pnr++] = strdup("separatorIndex");
+ params[pnr++] = intdup(2);
+ params[pnr++] = strdup("units");
+ params[pnr++] = intdup(0);
+ params[pnr++] = strdup("hw");
+ params[pnr++] = strdup("\"DC text\"");
+ params[pnr++] = NULL;
+
QCOMPARE(parse_csv_file(SUBSURFACE_SOURCE "/dives/TestDiveSeabearHUDC.csv",
- 0, // sample time
- 1, // sample depth
- 5, // sample temperature
- -1, // sample pO₂
- -1, // sample sensor1 pO₂
- -1, // sample sensor2 pO₂
- -1, // sample sensor3 pO₂
- -1, // sample cns
- 2, // sample ndl
- -1, // sample tts
- -1, // sample stopdepth
- -1, // sample pressure
- -1, // smaple setpoint
- 2, // separator index
- "csv", // XSLT template
- 0, // units
- "\"DC text\""), 0);
+ params, pnr - 1, "csv"), 0);
/*
* CSV import uses time and date stamps relative to current