ado/ssp
1
1
Fork 0
mirror of https://github.com/red0124/ssp.git synced 2025-12-14 21:59:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make throw_on_error and string_error separate options, update parser to have line reading a separate function with respect to splitting

Browse Source
This commit is contained in:
ado
2023-07-10 02:39:24 +02:00
parent 41b89d1d3d
commit a7a97b3ba8
8 changed files with 285 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
test/test_converter.cpp
View File

@@ -42,7 +42,7 @@ TEST_CASE("converter test split with exceptions") {
}
}
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
}
@@ -148,7 +148,7 @@ TEST_CASE("converter test valid conversions with exceptions") {
REQUIRE(c.valid());
CHECK_EQ(tup, 5);
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -156,7 +156,7 @@ TEST_CASE("converter test valid conversions with exceptions") {
REQUIRE(c.valid());
CHECK_EQ(tup, 5);
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -164,7 +164,7 @@ TEST_CASE("converter test valid conversions with exceptions") {
REQUIRE(c.valid());
CHECK_EQ(tup, 5);
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -172,7 +172,7 @@ TEST_CASE("converter test valid conversions with exceptions") {
REQUIRE(c.valid());
CHECK_EQ(tup, 5);
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -180,7 +180,7 @@ TEST_CASE("converter test valid conversions with exceptions") {
REQUIRE(c.valid());
CHECK_EQ(tup, 5);
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -188,7 +188,7 @@ TEST_CASE("converter test valid conversions with exceptions") {
REQUIRE(c.valid());
CHECK_EQ(tup, 5);
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -198,7 +198,7 @@ TEST_CASE("converter test valid conversions with exceptions") {
REQUIRE(tup.has_value());
CHECK_EQ(tup, 5);
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -206,7 +206,7 @@ TEST_CASE("converter test valid conversions with exceptions") {
REQUIRE(c.valid());
CHECK_EQ(tup, std::make_tuple(5, 6.6));
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -214,7 +214,7 @@ TEST_CASE("converter test valid conversions with exceptions") {
REQUIRE(c.valid());
CHECK_EQ(tup, std::make_tuple(5, 6.6));
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -222,7 +222,7 @@ TEST_CASE("converter test valid conversions with exceptions") {
REQUIRE(c.valid());
CHECK_EQ(tup, std::make_tuple(5, 6.6));
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -232,7 +232,7 @@ TEST_CASE("converter test valid conversions with exceptions") {
REQUIRE(std::get<0>(tup).has_value());
CHECK_EQ(tup, std::make_tuple(5, 6.6));
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -242,7 +242,7 @@ TEST_CASE("converter test valid conversions with exceptions") {
REQUIRE_FALSE(std::get<0>(tup).has_value());
CHECK_EQ(tup, std::make_tuple(std::optional<int>{}, 6.6));
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -253,7 +253,7 @@ TEST_CASE("converter test valid conversions with exceptions") {
REQUIRE(std::holds_alternative<int>(std::get<0>(tup)));
CHECK_EQ(tup, std::make_tuple(std::variant<int, double>{5}, 6.6));
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -264,7 +264,7 @@ TEST_CASE("converter test valid conversions with exceptions") {
REQUIRE(std::holds_alternative<double>(std::get<0>(tup)));
CHECK_EQ(tup, std::make_tuple(std::variant<int, double>{5.5}, 6.6));
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -274,7 +274,7 @@ TEST_CASE("converter test valid conversions with exceptions") {
CHECK_EQ(tup, std::make_tuple(std::string_view{"s1"}, 6.6,
std::string_view{"s2"}));
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
}
@@ -316,8 +316,7 @@ TEST_CASE("converter test invalid conversions") {
}
TEST_CASE("converter test invalid conversions with exceptions") {
// TODO remove ss::string_error
ss::converter<ss::string_error, ss::throw_on_error> c;
ss::converter<ss::throw_on_error> c;
REQUIRE_EXCEPTION(c.convert<int>(""));
REQUIRE_EXCEPTION(c.convert<int>("1", ""));
@@ -366,7 +365,7 @@ TEST_CASE("converter test ss:ax restriction (all except)") {
TEST_CASE("converter test ss:ax restriction (all except) with exceptions") {
// TODO remove ss::string_error
ss::converter<ss::string_error, ss::throw_on_error> c;
ss::converter<ss::throw_on_error> c;
REQUIRE_EXCEPTION(c.convert<ss::ax<int, 0>>("0"));
REQUIRE_EXCEPTION(c.convert<ss::ax<int, 0, 1, 2>>("1"));
@@ -387,7 +386,7 @@ TEST_CASE("converter test ss:ax restriction (all except) with exceptions") {
CHECK_EQ(tup, std::make_tuple(3, 'c'));
}
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
}
@@ -427,7 +426,7 @@ TEST_CASE("converter test ss:nx restriction (none except)") {
TEST_CASE("converter test ss:nx restriction (none except) with exceptions") {
// TODO remove ss::string_error
ss::converter<ss::string_error, ss::throw_on_error> c;
ss::converter<ss::throw_on_error> c;
REQUIRE_EXCEPTION(c.convert<ss::nx<int, 1>>("3"));
REQUIRE_EXCEPTION(c.convert<char, ss::nx<int, 1, 2, 69>>("c,3"));
@@ -455,7 +454,7 @@ TEST_CASE("converter test ss:nx restriction (none except) with exceptions") {
CHECK_EQ(tup, std::make_tuple(1, 'c'));
}
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
}
@@ -495,7 +494,7 @@ TEST_CASE("converter test ss:ir restriction (in range)") {
TEST_CASE("converter test ss:ir restriction (in range) with exceptions") {
// TODO remove ss::string_error
ss::converter<ss::string_error, ss::throw_on_error> c;
ss::converter<ss::throw_on_error> c;
REQUIRE_EXCEPTION(c.convert<ss::ir<int, 0, 2>>("3"));
REQUIRE_EXCEPTION(c.convert<char, ss::ir<int, 4, 69>>("c,3"));
@@ -523,7 +522,7 @@ TEST_CASE("converter test ss:ir restriction (in range) with exceptions") {
CHECK_EQ(tup, std::make_tuple(1, 'c'));
}
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
}
@@ -563,7 +562,7 @@ TEST_CASE("converter test ss:oor restriction (out of range)") {
TEST_CASE("converter test ss:oor restriction (out of range) with exceptions") {
// TODO remove ss::string_error
ss::converter<ss::string_error, ss::throw_on_error> c;
ss::converter<ss::throw_on_error> c;
REQUIRE_EXCEPTION(c.convert<ss::oor<int, 1, 5>>("3"));
REQUIRE_EXCEPTION(c.convert<ss::oor<int, 0, 2>>("2"));
@@ -589,7 +588,7 @@ TEST_CASE("converter test ss:oor restriction (out of range) with exceptions") {
CHECK_EQ(tup, std::make_tuple(3, 'c'));
}
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
}
@@ -643,7 +642,7 @@ TEST_CASE("converter test ss:ne restriction (not empty)") {
TEST_CASE("converter test ss:ne restriction (not empty) with exceptions") {
// TODO remove ss::string_error
ss::converter<ss::string_error, ss::throw_on_error> c;
ss::converter<ss::throw_on_error> c;
REQUIRE_EXCEPTION(c.convert<ss::ne<std::string>>(""));
REQUIRE_EXCEPTION(c.convert<int, ss::ne<std::string>>("3,"));
@@ -669,7 +668,7 @@ TEST_CASE("converter test ss:ne restriction (not empty) with exceptions") {
CHECK_EQ(tup, extracted_vector);
}
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
}
@@ -735,7 +734,7 @@ TEST_CASE(
TEST_CASE("converter test ss:lt ss::lte ss::gt ss::gte restriction (in range) "
"with exception") {
// TODO remove ss::string_error
ss::converter<ss::string_error, ss::throw_on_error> c;
ss::converter<ss::throw_on_error> c;
REQUIRE_EXCEPTION(c.convert<ss::lt<int, 3>>("3"));
REQUIRE_EXCEPTION(c.convert<ss::lt<int, 2>>("3"));
@@ -781,7 +780,7 @@ TEST_CASE("converter test ss:lt ss::lte ss::gt ss::gte restriction (in range) "
CHECK_EQ(tup, 3);
}
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
}
@@ -794,7 +793,7 @@ TEST_CASE("converter test error mode") {
TEST_CASE("converter test throw on error mode") {
// TODO remove ss::string_error
ss::converter<ss::string_error, ss::throw_on_error> c;
ss::converter<ss::throw_on_error> c;
REQUIRE_EXCEPTION(c.convert<int>("junk"));
}
@@ -849,14 +848,14 @@ TEST_CASE("converter test converter with quotes spacing and escaping with "
"exceptions") {
// TODO remove ss::string_error on all below
try {
ss::converter<ss::string_error, ss::throw_on_error> c;
ss::converter<ss::throw_on_error> c;
auto tup = c.convert<std::string, std::string, std::string>(
R"("just","some","strings")");
REQUIRE(c.valid());
CHECK_EQ(tup, std::make_tuple("\"just\"", "\"some\"", "\"strings\""));
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -867,34 +866,34 @@ TEST_CASE("converter test converter with quotes spacing and escaping with "
REQUIRE(c.valid());
CHECK_EQ(tup, std::make_tuple("just", "some", 12.3, 'a'));
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
ss::converter<ss::string_error, ss::throw_on_error, ss::trim<' '>> c;
ss::converter<ss::throw_on_error, ss::trim<' '>> c;
auto tup = c.convert<std::string, std::string, double, char>(
buff(R"( just , some , 12.3 ,a )"));
REQUIRE(c.valid());
CHECK_EQ(tup, std::make_tuple("just", "some", 12.3, 'a'));
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
ss::converter<ss::string_error, ss::throw_on_error, ss::escape<'\\'>> c;
ss::converter<ss::throw_on_error, ss::escape<'\\'>> c;
auto tup =
c.convert<std::string, std::string>(buff(R"(ju\,st,strings)"));
REQUIRE(c.valid());
CHECK_EQ(tup, std::make_tuple("ju,st", "strings"));
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
ss::converter<ss::string_error, ss::throw_on_error, ss::escape<'\\'>,
ss::trim<' '>, ss::quote<'"'>>
ss::converter<ss::throw_on_error, ss::escape<'\\'>, ss::trim<' '>,
ss::quote<'"'>>
c;
auto tup = c.convert<std::string, std::string, double, std::string>(
@@ -902,7 +901,7 @@ TEST_CASE("converter test converter with quotes spacing and escaping with "
REQUIRE(c.valid());
CHECK_EQ(tup, std::make_tuple("ju,st", "so,me", 12.34, "str\"ings"));
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
}
@@ -959,8 +958,8 @@ TEST_CASE("converter test invalid split conversions") {
TEST_CASE("converter test invalid split conversions with exceptions") {
// TODO remove ss::string_error
ss::converter<ss::string_error, ss::escape<'\\'>, ss::trim<' '>,
ss::quote<'"'>, ss::throw_on_error>
ss::converter<ss::escape<'\\'>, ss::trim<' '>, ss::quote<'"'>,
ss::throw_on_error>
c;
// mismatched quote

1
test/test_parser.cpp
View File

@@ -856,6 +856,7 @@ TEST_CASE("parser test multiline restricted") {
for (auto& [_, __, s] : i) {
update_if_crlf(s);
}
CHECK_EQ(i, data);
}

40
test/test_splitter.cpp
View File

@@ -201,7 +201,7 @@ void test_combinations(matches_type& matches, std::vector<std::string> delims) {
auto vec = st.split(buff(lines[i].c_str()), delim);
CHECK_EQ(words(vec), expectations[i]);
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
}
}
@@ -520,8 +520,7 @@ TEST_CASE("splitter test error mode") {
CHECK_FALSE(s.error_msg().empty());
try {
// TODO remove ss::string_error
ss::splitter<ss::string_error, ss::throw_on_error> s;
ss::splitter<ss::throw_on_error> s;
s.split(buff("just,some,strings"), "");
FAIL("expected exception");
} catch (ss::exception& e) {
@@ -544,12 +543,12 @@ template <typename Splitter>
auto expect_unterminated_quote(Splitter& s, const std::string& line) {
try {
auto vec = s.split(buff(line.c_str()));
CHECK_FALSE(s.valid());
CHECK(s.valid());
CHECK(s.unterminated_quote());
return vec;
} catch (ss::exception& e) {
// TODO check if this is ok
FAIL(e.what());
FAIL(std::string{e.what()});
return decltype(s.split(buff(line.c_str()))){};
}
}
@@ -658,7 +657,7 @@ TEST_CASE("splitter test resplit unterminated quote") {
{
auto new_line = buff.append(R"(,dom)");
vec = c.resplit(new_line, strlen(new_line));
CHECK_FALSE(s.valid());
CHECK(s.valid());
CHECK(s.unterminated_quote());
CHECK_EQ(words(vec), expected);
}
@@ -808,7 +807,6 @@ TEST_CASE("splitter test resplit unterminated quote with exceptions") {
auto vec = expect_unterminated_quote(s, R"("x)");
CHECK_EQ(vec.size(), 1);
REQUIRE(s.unterminated_quote());
{
@@ -832,7 +830,7 @@ TEST_CASE("splitter test resplit unterminated quote with exceptions") {
CHECK_EQ(words(vec)[0], "xax");
}
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -848,7 +846,7 @@ TEST_CASE("splitter test resplit unterminated quote with exceptions") {
std::vector<std::string> expected{"just", "strings"};
CHECK_EQ(words(vec), expected);
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -865,7 +863,7 @@ TEST_CASE("splitter test resplit unterminated quote with exceptions") {
expected = {"just", "some", "random", "strings"};
CHECK_EQ(words(vec), expected);
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -883,7 +881,7 @@ TEST_CASE("splitter test resplit unterminated quote with exceptions") {
expected = {"just", "some", "ran\",dom", "strings"};
CHECK_EQ(words(vec), expected);
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -897,7 +895,7 @@ TEST_CASE("splitter test resplit unterminated quote with exceptions") {
{
auto new_line = buff.append(R"(,dom)");
vec = c.resplit(new_line, strlen(new_line));
CHECK_FALSE(s.valid());
CHECK(s.valid());
CHECK(s.unterminated_quote());
CHECK_EQ(words(vec), expected);
}
@@ -911,7 +909,7 @@ TEST_CASE("splitter test resplit unterminated quote with exceptions") {
CHECK_EQ(words(vec), expected);
}
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -934,7 +932,7 @@ TEST_CASE("splitter test resplit unterminated quote with exceptions") {
CHECK_EQ(words(vec), expected);
}
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -961,7 +959,7 @@ TEST_CASE("splitter test resplit unterminated quote with exceptions") {
CHECK_EQ(words(vec), expected);
}
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -985,7 +983,7 @@ TEST_CASE("splitter test resplit unterminated quote with exceptions") {
CHECK_EQ(words(vec), expected);
}
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -1009,7 +1007,7 @@ TEST_CASE("splitter test resplit unterminated quote with exceptions") {
CHECK_EQ(words(vec), expected);
}
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -1032,7 +1030,7 @@ TEST_CASE("splitter test resplit unterminated quote with exceptions") {
CHECK_EQ(words(vec), expected);
}
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
try {
@@ -1057,7 +1055,7 @@ TEST_CASE("splitter test resplit unterminated quote with exceptions") {
CHECK_EQ(words(vec), expected);
}
} catch (ss::exception& e) {
FAIL(e.what());
FAIL(std::string{e.what()});
}
}
@@ -1106,8 +1104,8 @@ TEST_CASE("splitter test invalid splits") {
}
TEST_CASE("splitter test invalid splits with exceptions") {
ss::converter<ss::string_error, ss::quote<'"'>, ss::trim<' '>,
ss::escape<'\\'>, ss::throw_on_error>
ss::converter<ss::throw_on_error, ss::quote<'"'>, ss::trim<' '>,
ss::escape<'\\'>>
c;
auto& s = c.splitter;