Mercurial > irccd
changeset 799:f362994133ca
windows: fix unit tests
author | David Demelier <markand@malikania.fr> |
---|---|
date | Mon, 12 Nov 2018 21:10:00 +0100 |
parents | 952021a03ace |
children | e4662edab00a |
files | libirccd-test/irccd/test/cli_fixture.cpp tests/src/plugins/ask/main.cpp tests/src/plugins/auth/main.cpp tests/src/plugins/hangman/main.cpp tests/src/plugins/history/main.cpp tests/src/plugins/joke/main.cpp tests/src/plugins/logger/main.cpp tests/src/plugins/plugin/main.cpp tests/src/plugins/tictactoe/main.cpp |
diffstat | 9 files changed, 31 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/libirccd-test/irccd/test/cli_fixture.cpp Mon Nov 12 13:19:28 2018 +0100 +++ b/libirccd-test/irccd/test/cli_fixture.cpp Mon Nov 12 21:10:00 2018 +0100 @@ -34,6 +34,18 @@ namespace irccd::test { +namespace { + +auto clear(std::string input) -> std::string +{ + while (input.size() > 0U && (input.back() == '\r' || input.back() == '\n')) + input.pop_back(); + + return input; +} + +} // !namespace + cli_fixture::cli_fixture() : server_(new mock_server(irccd_.get_service(), "test", "localhost")) { @@ -69,6 +81,7 @@ std::this_thread::sleep_for(std::chrono::milliseconds(250)); } + auto cli_fixture::exec(const std::vector<std::string>& args) -> result { std::ostringstream oss; @@ -88,9 +101,9 @@ outputs out, err; for (std::string line; stream_out && std::getline(stream_out, line); ) - out.push_back(line); + out.push_back(clear(line)); for (std::string line; stream_err && std::getline(stream_err, line); ) - err.push_back(line); + err.push_back(clear(line)); return { ret, out, err }; }
--- a/tests/src/plugins/ask/main.cpp Mon Nov 12 13:19:28 2018 +0100 +++ b/tests/src/plugins/ask/main.cpp Mon Nov 12 21:10:00 2018 +0100 @@ -24,7 +24,7 @@ #include <irccd/test/js_plugin_fixture.hpp> -namespace irccd { +namespace irccd::test { namespace { @@ -76,4 +76,4 @@ } // !namespace -} // !irccd +} // !irccd::test
--- a/tests/src/plugins/auth/main.cpp Mon Nov 12 13:19:28 2018 +0100 +++ b/tests/src/plugins/auth/main.cpp Mon Nov 12 21:10:00 2018 +0100 @@ -24,7 +24,7 @@ #include <irccd/test/js_plugin_fixture.hpp> -namespace irccd { +namespace irccd::test { namespace { @@ -91,4 +91,4 @@ } // !namespace -} // !irccd +} // !irccd::test
--- a/tests/src/plugins/hangman/main.cpp Mon Nov 12 13:19:28 2018 +0100 +++ b/tests/src/plugins/hangman/main.cpp Mon Nov 12 21:10:00 2018 +0100 @@ -27,7 +27,7 @@ #include <irccd/test/js_plugin_fixture.hpp> -namespace irccd { +namespace irccd::test { namespace { @@ -358,4 +358,4 @@ } // !namespace -} // !irccd +} // !irccd::test
--- a/tests/src/plugins/history/main.cpp Mon Nov 12 13:19:28 2018 +0100 +++ b/tests/src/plugins/history/main.cpp Mon Nov 12 21:10:00 2018 +0100 @@ -26,7 +26,7 @@ #include <irccd/test/js_plugin_fixture.hpp> -namespace irccd { +namespace irccd::test { namespace { @@ -143,4 +143,4 @@ } // !namespace -} // !irccd +} // !irccd::test
--- a/tests/src/plugins/joke/main.cpp Mon Nov 12 13:19:28 2018 +0100 +++ b/tests/src/plugins/joke/main.cpp Mon Nov 12 21:10:00 2018 +0100 @@ -21,7 +21,7 @@ #include <irccd/test/js_plugin_fixture.hpp> -namespace irccd { +namespace irccd::test { namespace { @@ -199,4 +199,4 @@ } // !namespace -} // !irccd +} // !irccd::test
--- a/tests/src/plugins/logger/main.cpp Mon Nov 12 13:19:28 2018 +0100 +++ b/tests/src/plugins/logger/main.cpp Mon Nov 12 21:10:00 2018 +0100 @@ -27,7 +27,7 @@ #include <irccd/test/js_plugin_fixture.hpp> -namespace irccd { +namespace irccd::test { namespace { @@ -156,4 +156,4 @@ } // !namespace -} // !irccd +} // !irccd::test
--- a/tests/src/plugins/plugin/main.cpp Mon Nov 12 13:19:28 2018 +0100 +++ b/tests/src/plugins/plugin/main.cpp Mon Nov 12 21:10:00 2018 +0100 @@ -31,7 +31,7 @@ using boost::format; using boost::str; -namespace irccd { +namespace irccd::test { namespace { @@ -143,4 +143,4 @@ } // !namespace -} // !irccd +} // !irccd::test
--- a/tests/src/plugins/tictactoe/main.cpp Mon Nov 12 13:19:28 2018 +0100 +++ b/tests/src/plugins/tictactoe/main.cpp Mon Nov 12 21:10:00 2018 +0100 @@ -27,7 +27,7 @@ #include <irccd/test/js_plugin_fixture.hpp> -namespace irccd { +namespace irccd::test { namespace { @@ -260,4 +260,4 @@ } // !namespace -} // !irccd +} // !irccd::test