From 32a4ce61694bfe8364227440ea5716df7cc61fd1 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Fri, 28 Sep 2018 13:59:01 +0200 Subject: Parser: parse text-based files into arbitrary table In d815e0c9476ef62e6b84fb28ce48ab7cddefe77e a dive_table pointer was added to the parsing functions to allow parsing into tables other than the global dive table. This will be necessary for undo of import and implementation a cleaner interface. A few cases, notably CSV and proprietary formats were forgotten. Implement parsing into arbitrary tables also for these cases. Signed-off-by: Berthold Stoeger --- tests/testparse.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/testparse.cpp') diff --git a/tests/testparse.cpp b/tests/testparse.cpp index 9f88a19aa..ffda8f9ac 100644 --- a/tests/testparse.cpp +++ b/tests/testparse.cpp @@ -107,7 +107,7 @@ int TestParse::parseCSV(int units, std::string file) params[pnr++] = intdup(-1); params[pnr++] = NULL; - return parse_manual_file(file.c_str(), params, pnr - 1); + return parse_manual_file(file.c_str(), params, pnr - 1, &dive_table); } int TestParse::parseDivingLog() @@ -216,7 +216,7 @@ void TestParse::testParseHUDC() params[pnr++] = NULL; QCOMPARE(parse_csv_file(SUBSURFACE_TEST_DATA "/dives/TestDiveSeabearHUDC.csv", - params, pnr - 1, "csv"), + params, pnr - 1, "csv", &dive_table), 0); QCOMPARE(dive_table.nr, 1); @@ -261,7 +261,7 @@ void TestParse::testParseNewFormat() "/dives/") .append(files.at(i)) .toLatin1() - .data()), + .data(), &dive_table), 0); QCOMPARE(dive_table.nr, i + 1); } @@ -367,7 +367,7 @@ int TestParse::parseCSVmanual(int units, std::string file) params[pnr++] = intdup(units); params[pnr++] = NULL; - return parse_manual_file(file.c_str(), params, pnr - 1); + return parse_manual_file(file.c_str(), params, pnr - 1, &dive_table); } void TestParse::exportCSVDiveDetails() @@ -416,7 +416,7 @@ int TestParse::parseCSVprofile(int units, std::string file) params[pnr++] = intdup(units); params[pnr++] = NULL; - return parse_csv_file(file.c_str(), params, pnr - 1, "csv"); + return parse_csv_file(file.c_str(), params, pnr - 1, "csv", &dive_table); } void TestParse::exportCSVDiveProfile() @@ -510,7 +510,7 @@ void TestParse::parseDL7() clear_dive_file_data(); QCOMPARE(parse_csv_file(SUBSURFACE_TEST_DATA "/dives/DL7.zxu", - params, pnr - 1, "DL7"), + params, pnr - 1, "DL7", &dive_table), 0); QCOMPARE(dive_table.nr, 3); -- cgit v1.2.3-70-g09d2