GothenburgBitFactory/timewarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/timewarrior.git synced 2025-06-26 10:54:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Extract join function

Browse source 
- use join function for std::vector<std::string> from libshared
- add join function for std::set<std::string>
- add joinQuotedIfNeeded for std::set<std::string> and std::vector<std::string>
- add unit tests
- These functions could be replaced with templates and moved to libshared.
This commit is contained in:
Thomas Lauf 2018-01-05 14:25:57 +01:00
parent 95380bbe96
commit 35e5098b51
7 changed files with 125 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

55
test/util.t.cpp
View file

@ -31,7 +31,7 @@
////////////////////////////////////////////////////////////////////////////////
int main (int, char**)
{
UnitTest t (7);
UnitTest t (7 + 6 + 6 + 6);
// std::string escape (const std::string& input, int c)
t.is (escape ("", 'x'), "", "escape '','x' --> ''");
@ -44,6 +44,59 @@ int main (int, char**)
t.is (quoteIfNeeded ("foo"), "foo", "quoteIfNeeded 'foo' --> 'foo'");
t.is (quoteIfNeeded ("f o o"), "\"f o o\"", "quoteIfNeeded 'f o o' --> '\"f o o\"'");
{
std::set<std::string> unjoined;
std::string joined;
joined = join("", unjoined);
t.is(joined.length(), (size_t) 0, "join -> length 0");
t.is(joined, "", "join -> ''");
unjoined = {"", "a", "bc", "def"};
joined = join("", unjoined);
t.is(joined.length(), (size_t) 6, "join '' 'a' 'bc' 'def' -> length 6");
t.is(joined, "abcdef", "join '' 'a' 'bc' 'def' -> 'abcdef'");
joined = join("-", unjoined);
t.is(joined.length(), (size_t) 9, "join '' - 'a' - 'bc' - 'def' -> length 9");
t.is(joined, "-a-bc-def", "join '' - 'a' - 'bc' - 'def' -> '-a-bc-def'");
}
{
std::set <std::string> unjoined;
std::string joined;
joined = joinQuotedIfNeeded ("", unjoined);
t.is (joined.length (), (size_t) 0, "join -> length 0");
t.is (joined, "", "join -> ''");
unjoined = {"", "a", "bc", "d e f"};
joined = joinQuotedIfNeeded ("", unjoined);
t.is (joined.length (), (size_t) 10, "join '' 'a' 'bc' 'd e f' -> length 6");
t.is (joined, "abc\"d e f\"", "join '' 'a' 'bc' 'def' -> 'abc\"d e f\"'");
joined = joinQuotedIfNeeded ("-", unjoined);
t.is (joined.length (), (size_t) 13, "join '' - 'a' - 'bc' - 'def' -> length 9");
t.is (joined, "-a-bc-\"d e f\"", "join '' - 'a' - 'bc' - 'def' -> '-a-bc-\"d e f\"'");
}
{
std::vector <std::string> unjoined;
std::string joined;
joined = joinQuotedIfNeeded ("", unjoined);
t.is (joined.length (), (size_t) 0, "join -> length 0");
t.is (joined, "", "join -> ''");
unjoined = {"", "a", "bc", "d e f"};
joined = joinQuotedIfNeeded ("", unjoined);
t.is (joined.length (), (size_t) 10, "join '' 'a' 'bc' 'def' -> length 6");
t.is (joined, "abc\"d e f\"", "join '' 'a' 'bc' 'def' -> 'abc\"d e f\"'");
joined = joinQuotedIfNeeded ("-", unjoined);
t.is (joined.length (), (size_t) 13, "join '' - 'a' - 'bc' - 'def' -> length 9");
t.is (joined, "-a-bc-\"d e f\"", "join '' - 'a' - 'bc' - 'def' -> '-a-bc-\"d e f\"'");
}
return 0;
}