From 2e05ab96d6ed74b4868e0fbae2b8dd4b20c3228a Mon Sep 17 00:00:00 2001
From: Martin Killenberg <martin.killenberg@desy.de>
Date: Wed, 9 Aug 2017 17:25:58 +0200
Subject: [PATCH] implemented tests are now checking for the correct expected
values (and still failing due to missing implementation
---
tests/src/testVariableMapper.cpp | 28 +++++++++++++++++++++++++---
1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/tests/src/testVariableMapper.cpp b/tests/src/testVariableMapper.cpp
index 8d0e063..0227d89 100644
--- a/tests/src/testVariableMapper.cpp
+++ b/tests/src/testVariableMapper.cpp
@@ -64,6 +64,7 @@ std::set< std::string > generateInputVariables(){
template <typename Map>
bool mapCompare (Map const &lhs, Map const &rhs) {
// No predicate needed because there is operator== for pairs already.
+ std::cout << "lhs.size() " << lhs.size() << ", rhs.size() " << rhs.size() << std::endl;
return lhs.size() == rhs.size()
&& std::equal(lhs.begin(), lhs.end(), rhs.begin());
}
@@ -81,13 +82,34 @@ BOOST_AUTO_TEST_CASE( testRename ){
}
BOOST_AUTO_TEST_CASE( testImportLocation ){
- testXmlParsing("variableTreeXml/importLocation.xml", {});
+ testXmlParsing("variableTreeXml/importLocation.xml", { {"/A/a/di", {"B","a_di"}},
+ {"/A/a/do", {"B","a_do"}},
+ {"/A/b", {"B","b"}}
+ });
}
BOOST_AUTO_TEST_CASE( testImportAll ){
- testXmlParsing("variableTreeXml/importAll.xml", {});
+ testXmlParsing("variableTreeXml/importAll.xml", { {"/A/a/di", {"A","a_di"}},
+ {"/A/a/do", {"A","a_do"}},
+ {"/A/b", {"A","b"}},
+ {"/B/a/dr", {"B","a_dr"}},
+ {"/B/c/de", {"B","c_de"}},
+ {"/B/c/gne", {"B","c_gne"}},
+ {"/C/a/da", {"C","a_da"}},
+ {"/C/b/ge", {"C","b_ge"}},
+ {"/C/c/be", {"C","c_be"}},
+ {"/C/c/de", {"C","c_de"}},
+ {"/DIRECT/DOUBLE", {"DIRECT","DOUBLE"}},
+ {"/DIRECT/DOUBLE", {"DIRECT","DOUBLE_ARRAY"}},
+ {"/DIRECT/INT", {"DIRECT","INT"}},
+ {"/DIRECT/INT", {"DIRECT","INT_ARRAY"}}
+ });
}
BOOST_AUTO_TEST_CASE( testImportAndRename ){
- testXmlParsing("variableTreeXml/importAndRename.xml", {});
+ testXmlParsing("variableTreeXml/importAndRename.xml", { {"/DIRECT/DOUBLE", {"DIRECT","BAR"}},
+ {"/DIRECT/DOUBLE_ARRAY", {"DIRECT","DOUBLE_ARRAY"}},
+ {"/DIRECT/INT", {"DIRECT","FOO"}},
+ {"/DIRECT/INT_ARRAY", {"DIRECT","INT_ARRAY"}}
+ });
}
--
GitLab