diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-04-02 10:52:34 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-04-02 10:52:34 +0000 |
commit | 9c3b09bbdd2d3819ae2edb35b867d996daa4a744 (patch) | |
tree | 4f181b5ad0dffb7a802ecf78ee669ead37f6df69 /messagebus_test | |
parent | 676dc64e73f418be10ef4cee68b102068bbc5530 (diff) |
Unify tests.
Diffstat (limited to 'messagebus_test')
-rw-r--r-- | messagebus_test/src/tests/error/error.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/messagebus_test/src/tests/error/error.cpp b/messagebus_test/src/tests/error/error.cpp index e5749db452b..57f9c82389d 100644 --- a/messagebus_test/src/tests/error/error.cpp +++ b/messagebus_test/src/tests/error/error.cpp @@ -1,20 +1,18 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP("error_test"); + #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/messagebus/testlib/slobrok.h> #include <vespa/vespalib/util/stringfmt.h> +#include <vespa/log/log.h> +LOG_SETUP("error_test"); + using namespace mbus; using vespalib::make_string; -TEST_SETUP(Test); -int -Test::Main() -{ - TEST_INIT("error_test"); +TEST("error_test") { Slobrok slobrok; const std::string routing_template = TEST_PATH("routing-template.cfg"); const std::string ctl_script = TEST_PATH("ctl.sh"); @@ -44,5 +42,6 @@ Test::Main() EXPECT_TRUE(system("../../binref/runjava JavaClient") == 0); EXPECT_TRUE(system((ctl_script + " stop server java").c_str()) == 0); } - TEST_DONE(); } + +TEST_MAIN() { TEST_RUN_ALL(); } |