diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-08-24 14:58:49 +0200 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-08-28 15:04:29 +0200 |
| commit | 237865038f13701e47199c6474ce82a90ffb0706 (patch) | |
| tree | b6f79da45f25f6a519ce39cbf59da45785e54f72 /messagebus_test | |
| parent | 10751c1edd819792d499131cd549fd972accc2de (diff) | |
- Use C++11 for loops.
- Detangle some includes and include what you need.
- Refactor to subclass to avoid code duplication.
- Add config for compression too.
- V1 up to 142, V2 above.
Diffstat (limited to 'messagebus_test')
| -rw-r--r-- | messagebus_test/src/tests/error/cpp-client.cpp | 4 | ||||
| -rw-r--r-- | messagebus_test/src/tests/error/cpp-server.cpp | 1 | ||||
| -rw-r--r-- | messagebus_test/src/tests/speed/cpp-client.cpp | 1 | ||||
| -rw-r--r-- | messagebus_test/src/tests/speed/cpp-server.cpp | 1 | ||||
| -rw-r--r-- | messagebus_test/src/tests/trace/cpp-server.cpp | 1 | ||||
| -rw-r--r-- | messagebus_test/src/tests/trace/trace.cpp | 6 |
6 files changed, 9 insertions, 5 deletions
diff --git a/messagebus_test/src/tests/error/cpp-client.cpp b/messagebus_test/src/tests/error/cpp-client.cpp index 001b0b14674..44580400e26 100644 --- a/messagebus_test/src/tests/error/cpp-client.cpp +++ b/messagebus_test/src/tests/error/cpp-client.cpp @@ -1,13 +1,11 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/messagebus/messagebus.h> -#include <vespa/messagebus/sourcesession.h> #include <vespa/messagebus/errorcode.h> #include <vespa/messagebus/testlib/simplemessage.h> -#include <vespa/messagebus/testlib/simplereply.h> #include <vespa/messagebus/testlib/simpleprotocol.h> #include <vespa/messagebus/rpcmessagebus.h> -#include <vespa/messagebus/sourcesessionparams.h> +#include <vespa/messagebus/network/rpcnetworkparams.h> #include <vespa/messagebus/testlib/receptor.h> #include <vespa/fastos/app.h> diff --git a/messagebus_test/src/tests/error/cpp-server.cpp b/messagebus_test/src/tests/error/cpp-server.cpp index 68a1d0afc27..af0d6e30132 100644 --- a/messagebus_test/src/tests/error/cpp-server.cpp +++ b/messagebus_test/src/tests/error/cpp-server.cpp @@ -3,6 +3,7 @@ #include <vespa/messagebus/messagebus.h> #include <vespa/messagebus/testlib/simpleprotocol.h> #include <vespa/messagebus/rpcmessagebus.h> +#include <vespa/messagebus/network/rpcnetworkparams.h> #include <vespa/messagebus/emptyreply.h> #include <vespa/messagebus/errorcode.h> #include <vespa/fastos/app.h> diff --git a/messagebus_test/src/tests/speed/cpp-client.cpp b/messagebus_test/src/tests/speed/cpp-client.cpp index d510054c0ab..437cc3ce354 100644 --- a/messagebus_test/src/tests/speed/cpp-client.cpp +++ b/messagebus_test/src/tests/speed/cpp-client.cpp @@ -3,6 +3,7 @@ #include <vespa/messagebus/messagebus.h> #include <vespa/messagebus/routing/retrytransienterrorspolicy.h> #include <vespa/messagebus/rpcmessagebus.h> +#include <vespa/messagebus/network/rpcnetworkparams.h> #include <vespa/messagebus/testlib/simplemessage.h> #include <vespa/messagebus/testlib/simpleprotocol.h> #include <vespa/messagebus/testlib/simplereply.h> diff --git a/messagebus_test/src/tests/speed/cpp-server.cpp b/messagebus_test/src/tests/speed/cpp-server.cpp index ba821f19b02..ddbeac62ce2 100644 --- a/messagebus_test/src/tests/speed/cpp-server.cpp +++ b/messagebus_test/src/tests/speed/cpp-server.cpp @@ -5,6 +5,7 @@ #include <vespa/messagebus/testlib/simplereply.h> #include <vespa/messagebus/testlib/simpleprotocol.h> #include <vespa/messagebus/rpcmessagebus.h> +#include <vespa/messagebus/network/rpcnetworkparams.h> #include <vespa/fastos/app.h> using namespace mbus; diff --git a/messagebus_test/src/tests/trace/cpp-server.cpp b/messagebus_test/src/tests/trace/cpp-server.cpp index 60bd55270a7..c9086ff1758 100644 --- a/messagebus_test/src/tests/trace/cpp-server.cpp +++ b/messagebus_test/src/tests/trace/cpp-server.cpp @@ -3,6 +3,7 @@ #include <vespa/messagebus/messagebus.h> #include <vespa/messagebus/testlib/simpleprotocol.h> #include <vespa/messagebus/rpcmessagebus.h> +#include <vespa/messagebus/network/rpcnetworkparams.h> #include <vespa/messagebus/emptyreply.h> #include <vespa/fastos/app.h> diff --git a/messagebus_test/src/tests/trace/trace.cpp b/messagebus_test/src/tests/trace/trace.cpp index 96759f286b8..a653c4934b3 100644 --- a/messagebus_test/src/tests/trace/trace.cpp +++ b/messagebus_test/src/tests/trace/trace.cpp @@ -1,6 +1,5 @@ // 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("trace_test"); + #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/messagebus/testlib/slobrok.h> @@ -21,6 +20,9 @@ LOG_SETUP("trace_test"); #include <vespa/messagebus/testlib/simpleprotocol.h> #include <iostream> +#include <vespa/log/log.h> +LOG_SETUP("trace_test"); + using namespace mbus; using vespalib::make_string; |