Mercurial > irccd
diff tests/src/irccdctl/cli-rule-move/main.cpp @ 736:49b7c7660a00
Tests: use structured bindings in irccdctl
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Tue, 24 Jul 2018 22:14:00 +0200 |
| parents | e8c4ba5ed1c6 |
| children | 46a1877749ff |
line wrap: on
line diff
--- a/tests/src/irccdctl/cli-rule-move/main.cpp Tue Jul 24 22:00:00 2018 +0200 +++ b/tests/src/irccdctl/cli-rule-move/main.cpp Tue Jul 24 22:14:00 2018 +0200 @@ -63,38 +63,38 @@ start(); { - const auto result = exec({ "rule-move", "0", "1" }); + const auto [out, err] = exec({ "rule-move", "0", "1" }); - BOOST_TEST(result.first.size() == 0U); - BOOST_TEST(result.second.size() == 0U); + BOOST_TEST(out.size() == 0U); + BOOST_TEST(err.size() == 0U); } { - const auto result = exec({ "rule-list" }); + const auto [out, err] = exec({ "rule-list" }); - BOOST_TEST(result.first.size() == 21U); - BOOST_TEST(result.second.size() == 0U); - BOOST_TEST(result.first[0] == "rule: 0"); - BOOST_TEST(result.first[1] == "servers: s2 "); - BOOST_TEST(result.first[2] == "channels: c2 "); - BOOST_TEST(result.first[3] == "plugins: p2 "); - BOOST_TEST(result.first[4] == "events: onCommand "); - BOOST_TEST(result.first[5] == "action: drop"); - BOOST_TEST(result.first[6] == ""); - BOOST_TEST(result.first[7] == "rule: 1"); - BOOST_TEST(result.first[8] == "servers: s1 "); - BOOST_TEST(result.first[9] == "channels: c1 "); - BOOST_TEST(result.first[10] == "plugins: p1 "); - BOOST_TEST(result.first[11] == "events: onTopic "); - BOOST_TEST(result.first[12] == "action: accept"); - BOOST_TEST(result.first[13] == ""); - BOOST_TEST(result.first[14] == "rule: 2"); - BOOST_TEST(result.first[15] == "servers: s3 "); - BOOST_TEST(result.first[16] == "channels: c3 "); - BOOST_TEST(result.first[17] == "plugins: p3 "); - BOOST_TEST(result.first[18] == "events: onMessage "); - BOOST_TEST(result.first[19] == "action: accept"); - BOOST_TEST(result.first[20] == ""); + BOOST_TEST(out.size() == 21U); + BOOST_TEST(err.size() == 0U); + BOOST_TEST(out[0] == "rule: 0"); + BOOST_TEST(out[1] == "servers: s2 "); + BOOST_TEST(out[2] == "channels: c2 "); + BOOST_TEST(out[3] == "plugins: p2 "); + BOOST_TEST(out[4] == "events: onCommand "); + BOOST_TEST(out[5] == "action: drop"); + BOOST_TEST(out[6] == ""); + BOOST_TEST(out[7] == "rule: 1"); + BOOST_TEST(out[8] == "servers: s1 "); + BOOST_TEST(out[9] == "channels: c1 "); + BOOST_TEST(out[10] == "plugins: p1 "); + BOOST_TEST(out[11] == "events: onTopic "); + BOOST_TEST(out[12] == "action: accept"); + BOOST_TEST(out[13] == ""); + BOOST_TEST(out[14] == "rule: 2"); + BOOST_TEST(out[15] == "servers: s3 "); + BOOST_TEST(out[16] == "channels: c3 "); + BOOST_TEST(out[17] == "plugins: p3 "); + BOOST_TEST(out[18] == "events: onMessage "); + BOOST_TEST(out[19] == "action: accept"); + BOOST_TEST(out[20] == ""); } } @@ -103,38 +103,38 @@ start(); { - const auto result = exec({ "rule-move", "2", "0" }); + const auto [out, err] = exec({ "rule-move", "2", "0" }); - BOOST_TEST(result.first.size() == 0U); - BOOST_TEST(result.second.size() == 0U); + BOOST_TEST(out.size() == 0U); + BOOST_TEST(err.size() == 0U); } { - const auto result = exec({ "rule-list" }); + const auto [out, err] = exec({ "rule-list" }); - BOOST_TEST(result.first.size() == 21U); - BOOST_TEST(result.second.size() == 0U); - BOOST_TEST(result.first[0] == "rule: 0"); - BOOST_TEST(result.first[1] == "servers: s3 "); - BOOST_TEST(result.first[2] == "channels: c3 "); - BOOST_TEST(result.first[3] == "plugins: p3 "); - BOOST_TEST(result.first[4] == "events: onMessage "); - BOOST_TEST(result.first[5] == "action: accept"); - BOOST_TEST(result.first[6] == ""); - BOOST_TEST(result.first[7] == "rule: 1"); - BOOST_TEST(result.first[8] == "servers: s1 "); - BOOST_TEST(result.first[9] == "channels: c1 "); - BOOST_TEST(result.first[10] == "plugins: p1 "); - BOOST_TEST(result.first[11] == "events: onTopic "); - BOOST_TEST(result.first[12] == "action: accept"); - BOOST_TEST(result.first[13] == ""); - BOOST_TEST(result.first[14] == "rule: 2"); - BOOST_TEST(result.first[15] == "servers: s2 "); - BOOST_TEST(result.first[16] == "channels: c2 "); - BOOST_TEST(result.first[17] == "plugins: p2 "); - BOOST_TEST(result.first[18] == "events: onCommand "); - BOOST_TEST(result.first[19] == "action: drop"); - BOOST_TEST(result.first[20] == ""); + BOOST_TEST(out.size() == 21U); + BOOST_TEST(err.size() == 0U); + BOOST_TEST(out[0] == "rule: 0"); + BOOST_TEST(out[1] == "servers: s3 "); + BOOST_TEST(out[2] == "channels: c3 "); + BOOST_TEST(out[3] == "plugins: p3 "); + BOOST_TEST(out[4] == "events: onMessage "); + BOOST_TEST(out[5] == "action: accept"); + BOOST_TEST(out[6] == ""); + BOOST_TEST(out[7] == "rule: 1"); + BOOST_TEST(out[8] == "servers: s1 "); + BOOST_TEST(out[9] == "channels: c1 "); + BOOST_TEST(out[10] == "plugins: p1 "); + BOOST_TEST(out[11] == "events: onTopic "); + BOOST_TEST(out[12] == "action: accept"); + BOOST_TEST(out[13] == ""); + BOOST_TEST(out[14] == "rule: 2"); + BOOST_TEST(out[15] == "servers: s2 "); + BOOST_TEST(out[16] == "channels: c2 "); + BOOST_TEST(out[17] == "plugins: p2 "); + BOOST_TEST(out[18] == "events: onCommand "); + BOOST_TEST(out[19] == "action: drop"); + BOOST_TEST(out[20] == ""); } } @@ -143,38 +143,38 @@ start(); { - const auto result = exec({ "rule-move", "2", "2" }); + const auto [out, err] = exec({ "rule-move", "2", "2" }); - BOOST_TEST(result.first.size() == 0U); - BOOST_TEST(result.second.size() == 0U); + BOOST_TEST(out.size() == 0U); + BOOST_TEST(err.size() == 0U); } { - const auto result = exec({ "rule-list" }); + const auto [out, err] = exec({ "rule-list" }); - BOOST_TEST(result.first.size() == 21U); - BOOST_TEST(result.second.size() == 0U); - BOOST_TEST(result.first[0] == "rule: 0"); - BOOST_TEST(result.first[1] == "servers: s1 "); - BOOST_TEST(result.first[2] == "channels: c1 "); - BOOST_TEST(result.first[3] == "plugins: p1 "); - BOOST_TEST(result.first[4] == "events: onTopic "); - BOOST_TEST(result.first[5] == "action: accept"); - BOOST_TEST(result.first[6] == ""); - BOOST_TEST(result.first[7] == "rule: 1"); - BOOST_TEST(result.first[8] == "servers: s2 "); - BOOST_TEST(result.first[9] == "channels: c2 "); - BOOST_TEST(result.first[10] == "plugins: p2 "); - BOOST_TEST(result.first[11] == "events: onCommand "); - BOOST_TEST(result.first[12] == "action: drop"); - BOOST_TEST(result.first[13] == ""); - BOOST_TEST(result.first[14] == "rule: 2"); - BOOST_TEST(result.first[15] == "servers: s3 "); - BOOST_TEST(result.first[16] == "channels: c3 "); - BOOST_TEST(result.first[17] == "plugins: p3 "); - BOOST_TEST(result.first[18] == "events: onMessage "); - BOOST_TEST(result.first[19] == "action: accept"); - BOOST_TEST(result.first[20] == ""); + BOOST_TEST(out.size() == 21U); + BOOST_TEST(err.size() == 0U); + BOOST_TEST(out[0] == "rule: 0"); + BOOST_TEST(out[1] == "servers: s1 "); + BOOST_TEST(out[2] == "channels: c1 "); + BOOST_TEST(out[3] == "plugins: p1 "); + BOOST_TEST(out[4] == "events: onTopic "); + BOOST_TEST(out[5] == "action: accept"); + BOOST_TEST(out[6] == ""); + BOOST_TEST(out[7] == "rule: 1"); + BOOST_TEST(out[8] == "servers: s2 "); + BOOST_TEST(out[9] == "channels: c2 "); + BOOST_TEST(out[10] == "plugins: p2 "); + BOOST_TEST(out[11] == "events: onCommand "); + BOOST_TEST(out[12] == "action: drop"); + BOOST_TEST(out[13] == ""); + BOOST_TEST(out[14] == "rule: 2"); + BOOST_TEST(out[15] == "servers: s3 "); + BOOST_TEST(out[16] == "channels: c3 "); + BOOST_TEST(out[17] == "plugins: p3 "); + BOOST_TEST(out[18] == "events: onMessage "); + BOOST_TEST(out[19] == "action: accept"); + BOOST_TEST(out[20] == ""); } }