diff options
Diffstat (limited to 'messagebus_test/src/tests/error/error.cpp')
| -rw-r--r-- | messagebus_test/src/tests/error/error.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/messagebus_test/src/tests/error/error.cpp b/messagebus_test/src/tests/error/error.cpp index 57f9c82389d..87eb391fc86 100644 --- a/messagebus_test/src/tests/error/error.cpp +++ b/messagebus_test/src/tests/error/error.cpp @@ -18,29 +18,29 @@ TEST("error_test") { const std::string ctl_script = TEST_PATH("ctl.sh"); { // Make slobrok config - EXPECT_TRUE(system("echo slobrok[1] > slobrok.cfg") == 0); - EXPECT_TRUE(system(make_string("echo 'slobrok[0].connectionspec tcp/localhost:%d' " - ">> slobrok.cfg", slobrok.port()).c_str()) == 0); + EXPECT_EQUAL(0, system("echo slobrok[1] > slobrok.cfg")); + EXPECT_EQUAL(0, system(make_string("echo 'slobrok[0].connectionspec tcp/localhost:%d' " + ">> slobrok.cfg", slobrok.port()).c_str())); } { // CPP SERVER { // Make routing config - EXPECT_TRUE(system(("cat " + routing_template + " | sed 's#session#cpp/session#' > routing.cfg").c_str()) == 0); + EXPECT_EQUAL(0, system(("cat " + routing_template + " | sed 's#session#cpp/session#' > routing.cfg").c_str())); } fprintf(stderr, "STARTING CPP-SERVER\n"); - EXPECT_TRUE(system((ctl_script + " start server cpp").c_str()) == 0); - EXPECT_TRUE(system("./messagebus_test_cpp-client-error_app") == 0); - EXPECT_TRUE(system("../../binref/runjava JavaClient") == 0); - EXPECT_TRUE(system((ctl_script + " stop server cpp").c_str()) == 0); + EXPECT_EQUAL(0, system((ctl_script + " start server cpp").c_str())); + EXPECT_EQUAL(0, system("./messagebus_test_cpp-client-error_app")); + EXPECT_EQUAL(0, system("../../binref/runjava JavaClient")); + EXPECT_EQUAL(0, system((ctl_script + " stop server cpp").c_str())); } { // JAVA SERVER { // Make routing config - EXPECT_TRUE(system(("cat " + routing_template + " | sed 's#session#java/session#' > routing.cfg").c_str()) == 0); + EXPECT_EQUAL(0, system(("cat " + routing_template + " | sed 's#session#java/session#' > routing.cfg").c_str())); } fprintf(stderr, "STARTING JAVA-SERVER\n"); - EXPECT_TRUE(system((ctl_script + " start server java").c_str()) == 0); - EXPECT_TRUE(system("./messagebus_test_cpp-client-error_app") == 0); - EXPECT_TRUE(system("../../binref/runjava JavaClient") == 0); - EXPECT_TRUE(system((ctl_script + " stop server java").c_str()) == 0); + EXPECT_EQUAL(0, system((ctl_script + " start server java").c_str())); + EXPECT_EQUAL(0, system("./messagebus_test_cpp-client-error_app")); + EXPECT_EQUAL(0, system("../../binref/runjava JavaClient")); + EXPECT_EQUAL(0, system((ctl_script + " stop server java").c_str())); } } |