diff --git a/src/inja.hpp b/src/inja.hpp index 7e049ca..cf46c9e 100644 --- a/src/inja.hpp +++ b/src/inja.hpp @@ -335,9 +335,12 @@ public: } json eval_function(const Parsed::ElementExpression& element, json data) { + std::cout << "eval_function" << std::endl; switch (element.function) { case Parsed::Function::Upper: { + std::cout << "eval_function - upper" << std::endl; std::string str = eval_expression(element.args[0], data); + std::cout << "eval_function - upper - " << str << std::endl; std::transform(str.begin(), str.end(), str.begin(), toupper); return str; } @@ -547,11 +550,13 @@ public: MatchType match_function = match(input, regex_map_functions); switch ( match_function.type() ) { case Parsed::Function::ReadJson: { + std::cout << "parse read json" << std::endl; Parsed::ElementExpression result = Parsed::ElementExpression(Parsed::Function::ReadJson); result.command = match_function.str(1); return result; } default: { + std::cout << "prase other function" << std::endl; std::vector args = {}; for (unsigned int i = 1; i < match_function.size(); i++) { // str(0) is whole group args.push_back( parse_expression(match_function.str(i)) ); diff --git a/test/src/unit-renderer.cpp b/test/src/unit-renderer.cpp index d31b718..e3c856f 100644 --- a/test/src/unit-renderer.cpp +++ b/test/src/unit-renderer.cpp @@ -7,7 +7,7 @@ using json = nlohmann::json; -TEST_CASE("types") { +/* TEST_CASE("types") { inja::Environment env = inja::Environment(); json data; data["name"] = "Peter"; @@ -62,9 +62,9 @@ TEST_CASE("types") { CHECK( env.render("{% if age == 28 %}28{% else if age == 29 %}29{% endif %}", data) == "29" ); CHECK( env.render("{% if age == 26 %}26{% else if age == 27 %}27{% else if age == 28 %}28{% else %}29{% endif %}", data) == "29" ); } -} +} */ -/* TEST_CASE("functions") { +TEST_CASE("functions") { inja::Environment env = inja::Environment(); json data; @@ -75,14 +75,14 @@ TEST_CASE("types") { SECTION("upper") { CHECK( env.render("{{ upper(name) }}", data) == "PETER" ); - CHECK( env.render("{{ upper( name ) }}", data) == "PETER" ); + /* CHECK( env.render("{{ upper( name ) }}", data) == "PETER" ); CHECK( env.render("{{ upper(city) }}", data) == "NEW YORK" ); CHECK( env.render("{{ upper(upper(name)) }}", data) == "PETER" ); CHECK_THROWS_WITH( env.render("{{ upper(5) }}", data), "[json.exception.type_error.302] type must be string, but is number" ); - CHECK_THROWS_WITH( env.render("{{ upper(true) }}", data), "[json.exception.type_error.302] type must be string, but is boolean" ); + CHECK_THROWS_WITH( env.render("{{ upper(true) }}", data), "[json.exception.type_error.302] type must be string, but is boolean" ); */ } - SECTION("lower") { + /* SECTION("lower") { CHECK( env.render("{{ lower(name) }}", data) == "peter" ); CHECK( env.render("{{ lower(city) }}", data) == "new york" ); CHECK_THROWS_WITH( env.render("{{ lower(5.45) }}", data), "[json.exception.type_error.302] type must be string, but is number" ); @@ -122,10 +122,10 @@ TEST_CASE("types") { CHECK( env.render("{{ even(11) }}", data) == "false" ); CHECK( env.render("{{ even(12) }}", data) == "true" ); CHECK_THROWS_WITH( env.render("{{ even(name) }}", data), "[json.exception.type_error.302] type must be number, but is string" ); - } + } */ } -TEST_CASE("combinations") { +/* TEST_CASE("combinations") { inja::Environment env = inja::Environment(); json data; data["name"] = "Peter"; diff --git a/test/src/unit-string-helper.cpp b/test/src/unit-string-helper.cpp index e4ef24d..d63d6b9 100644 --- a/test/src/unit-string-helper.cpp +++ b/test/src/unit-string-helper.cpp @@ -4,7 +4,7 @@ -TEST_CASE("dot to pointer") { +/* TEST_CASE("dot to pointer") { CHECK( inja::dot_to_json_pointer_notation("person.names.surname") == "/person/names/surname" ); CHECK( inja::dot_to_json_pointer_notation("guests.2") == "/guests/2" ); } @@ -158,4 +158,4 @@ TEST_CASE("match-functions") { CHECK_THROWS_WITH( inja::match("test(var)", map_regex), "Could not match input: test(var)" ); CHECK_THROWS_WITH( inja::match("round(var)", map_regex), "Could not match input: round(var)" ); -} +} */