From f030333766e52bda33871d3b6b0cdff929af0b68 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 5 Mar 2017 09:35:13 -0500 Subject: [PATCH] Tests: Corrected lexer data type for newly-supported date types --- test/lexer.t.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/test/lexer.t.cpp b/test/lexer.t.cpp index ef22e8b6c..55b2eea0f 100644 --- a/test/lexer.t.cpp +++ b/test/lexer.t.cpp @@ -174,21 +174,21 @@ int main (int, char**) tokens.push_back (std::pair (token, type)); } - t.is ((int)tokens.size (), 7, "7 tokens"); - t.is (tokens[0].first, "1", "tokens[0] == '1'"); - t.is ((int) tokens[0].second, (int) Lexer::Type::number, "tokens[0] == Type::number"); - t.is (tokens[1].first, "12", "tokens[1] == '12'"); - t.is ((int) tokens[1].second, (int) Lexer::Type::number, "tokens[1] == Type::date"); - t.is (tokens[2].first, "123", "tokens[2] == '123'"); - t.is ((int) tokens[2].second, (int) Lexer::Type::number, "tokens[2] == Type::number"); // 70 - t.is (tokens[3].first, "1234", "tokens[3] == '1234'"); - t.is ((int) tokens[3].second, (int) Lexer::Type::number, "tokens[3] == Type::date"); - t.is (tokens[4].first, "12345", "tokens[4] == '12345'"); - t.is ((int) tokens[4].second, (int) Lexer::Type::number, "tokens[4] == Type::number"); - t.is (tokens[5].first, "123456", "tokens[5] == '123456'"); - t.is ((int) tokens[5].second, (int) Lexer::Type::number, "tokens[5] == Type::date"); - t.is (tokens[6].first, "1234567", "tokens[6] == '1234567'"); - t.is ((int) tokens[6].second, (int) Lexer::Type::number, "tokens[6] == Type::number"); + t.is ((int)tokens.size (), 7, "7 tokens"); + t.is (tokens[0].first, "1", "tokens[0] == '1'"); + t.is ((int) tokens[0].second, (int) Lexer::Type::number, "tokens[0] == Type::number"); + t.is (tokens[1].first, "12", "tokens[1] == '12'"); + t.is ((int) tokens[1].second, (int) Lexer::Type::number, "tokens[1] == Type::date"); + t.is (tokens[2].first, "123", "tokens[2] == '123'"); + t.is ((int) tokens[2].second, (int) Lexer::Type::number, "tokens[2] == Type::number"); // 70 + t.is (tokens[3].first, "1234", "tokens[3] == '1234'"); + t.is ((int) tokens[3].second, (int) Lexer::Type::date, "tokens[3] == Type::date"); + t.is (tokens[4].first, "12345", "tokens[4] == '12345'"); + t.is ((int) tokens[4].second, (int) Lexer::Type::number, "tokens[4] == Type::number"); + t.is (tokens[5].first, "123456", "tokens[5] == '123456'"); + t.is ((int) tokens[5].second, (int) Lexer::Type::date, "tokens[5] == Type::date"); + t.is (tokens[6].first, "1234567", "tokens[6] == '1234567'"); + t.is ((int) tokens[6].second, (int) Lexer::Type::duration, "tokens[6] == Type::number"); // void split (std::vector&, const std::string&); std::string unsplit = " ( A or B ) ";