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/src/tests | |
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/src/tests')
-rw-r--r-- | messagebus/src/tests/advancedrouting/advancedrouting.cpp | 12 | ||||
-rw-r--r-- | messagebus/src/tests/bucketsequence/bucketsequence.cpp | 1 | ||||
-rw-r--r-- | messagebus/src/tests/choke/choke.cpp | 1 | ||||
-rw-r--r-- | messagebus/src/tests/error/error.cpp | 4 | ||||
-rw-r--r-- | messagebus/src/tests/routing/routing.cpp | 1 | ||||
-rw-r--r-- | messagebus/src/tests/sendadapter/sendadapter.cpp | 1 | ||||
-rw-r--r-- | messagebus/src/tests/serviceaddress/serviceaddress.cpp | 13 | ||||
-rw-r--r-- | messagebus/src/tests/servicepool/servicepool.cpp | 2 | ||||
-rw-r--r-- | messagebus/src/tests/shutdown/shutdown.cpp | 3 | ||||
-rw-r--r-- | messagebus/src/tests/slobrok/slobrok.cpp | 4 |
10 files changed, 11 insertions, 31 deletions
diff --git a/messagebus/src/tests/advancedrouting/advancedrouting.cpp b/messagebus/src/tests/advancedrouting/advancedrouting.cpp index e847fdf3222..8d6b8cd3875 100644 --- a/messagebus/src/tests/advancedrouting/advancedrouting.cpp +++ b/messagebus/src/tests/advancedrouting/advancedrouting.cpp @@ -1,17 +1,15 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/messagebus/emptyreply.h> -#include <vespa/messagebus/errorcode.h> -#include <vespa/messagebus/messagebus.h> -#include <vespa/messagebus/routing/errordirective.h> -#include <vespa/messagebus/routing/retrytransienterrorspolicy.h> + #include <vespa/messagebus/testlib/custompolicy.h> #include <vespa/messagebus/testlib/receptor.h> #include <vespa/messagebus/testlib/simplemessage.h> -#include <vespa/messagebus/testlib/simpleprotocol.h> #include <vespa/messagebus/testlib/slobrok.h> #include <vespa/messagebus/testlib/testserver.h> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/util/stringfmt.h> +#include <vespa/messagebus/emptyreply.h> +#include <vespa/messagebus/errorcode.h> +#include <vespa/messagebus/routing/retrytransienterrorspolicy.h> using namespace mbus; @@ -117,7 +115,7 @@ Test::Main() void Test::testAdvanced(TestData &data) { - const double TIMEOUT=60; + const double TIMEOUT = 60; IProtocol::SP protocol(new SimpleProtocol()); SimpleProtocol &simple = static_cast<SimpleProtocol&>(*protocol); simple.addPolicyFactory("Custom", SimpleProtocol::IPolicyFactory::SP(new CustomPolicyFactory(false, ErrorCode::NO_ADDRESS_FOR_SERVICE))); diff --git a/messagebus/src/tests/bucketsequence/bucketsequence.cpp b/messagebus/src/tests/bucketsequence/bucketsequence.cpp index 4073469c253..d98acc4f191 100644 --- a/messagebus/src/tests/bucketsequence/bucketsequence.cpp +++ b/messagebus/src/tests/bucketsequence/bucketsequence.cpp @@ -5,7 +5,6 @@ #include <vespa/messagebus/testlib/receptor.h> #include <vespa/messagebus/testlib/simplemessage.h> #include <vespa/messagebus/testlib/simpleprotocol.h> -#include <vespa/messagebus/testlib/simplereply.h> #include <vespa/messagebus/testlib/slobrok.h> #include <vespa/messagebus/testlib/testserver.h> #include <vespa/vespalib/testkit/testapp.h> diff --git a/messagebus/src/tests/choke/choke.cpp b/messagebus/src/tests/choke/choke.cpp index b8e20eb9074..91f91c84f45 100644 --- a/messagebus/src/tests/choke/choke.cpp +++ b/messagebus/src/tests/choke/choke.cpp @@ -2,7 +2,6 @@ #include <vespa/messagebus/emptyreply.h> #include <vespa/messagebus/errorcode.h> -#include <vespa/messagebus/reply.h> #include <vespa/messagebus/testlib/receptor.h> #include <vespa/messagebus/testlib/simplemessage.h> #include <vespa/messagebus/testlib/simpleprotocol.h> diff --git a/messagebus/src/tests/error/error.cpp b/messagebus/src/tests/error/error.cpp index dbaa869507b..1d8a489a5ed 100644 --- a/messagebus/src/tests/error/error.cpp +++ b/messagebus/src/tests/error/error.cpp @@ -65,14 +65,14 @@ Test::Main() reply = pxy.getReply(); ASSERT_TRUE(reply.get() != 0); - EXPECT_EQUAL(reply->getNumErrors(), 1u); + ASSERT_EQUAL(reply->getNumErrors(), 1u); EXPECT_EQUAL(reply->getError(0).getService(), "test/dst/session"); reply->addError(Error(ErrorCode::APP_FATAL_ERROR, "fatality")); is->forward(std::move(reply)); reply = src.getReply(); ASSERT_TRUE(reply.get() != 0); - EXPECT_EQUAL(reply->getNumErrors(), 2u); + ASSERT_EQUAL(reply->getNumErrors(), 2u); EXPECT_EQUAL(reply->getError(0).getService(), "test/dst/session"); EXPECT_EQUAL(reply->getError(1).getService(), "test/pxy/session"); } diff --git a/messagebus/src/tests/routing/routing.cpp b/messagebus/src/tests/routing/routing.cpp index e907e0d1163..515cbd99fde 100644 --- a/messagebus/src/tests/routing/routing.cpp +++ b/messagebus/src/tests/routing/routing.cpp @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/messagebus/emptyreply.h> #include <vespa/messagebus/errorcode.h> -#include <vespa/messagebus/messagebus.h> #include <vespa/messagebus/routing/errordirective.h> #include <vespa/messagebus/routing/retrytransienterrorspolicy.h> #include <vespa/messagebus/routing/routingcontext.h> diff --git a/messagebus/src/tests/sendadapter/sendadapter.cpp b/messagebus/src/tests/sendadapter/sendadapter.cpp index 8ae1d0993cb..e3fa3278300 100644 --- a/messagebus/src/tests/sendadapter/sendadapter.cpp +++ b/messagebus/src/tests/sendadapter/sendadapter.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/messagebus/messagebus.h> #include <vespa/messagebus/testlib/receptor.h> #include <vespa/messagebus/testlib/simplemessage.h> #include <vespa/messagebus/testlib/simpleprotocol.h> diff --git a/messagebus/src/tests/serviceaddress/serviceaddress.cpp b/messagebus/src/tests/serviceaddress/serviceaddress.cpp index 15a2e9fdac8..89edb981716 100644 --- a/messagebus/src/tests/serviceaddress/serviceaddress.cpp +++ b/messagebus/src/tests/serviceaddress/serviceaddress.cpp @@ -3,20 +3,7 @@ #include <vespa/vespalib/testkit/testapp.h> #include <vespa/messagebus/testlib/slobrok.h> #include <vespa/messagebus/testlib/testserver.h> -#include <vespa/messagebus/testlib/receptor.h> -#include <vespa/messagebus/testlib/simplemessage.h> -#include <vespa/messagebus/testlib/simplereply.h> -#include <vespa/messagebus/testlib/simpleprotocol.h> -#include <vespa/messagebus/messagebus.h> -#include <vespa/messagebus/sourcesession.h> -#include <vespa/messagebus/intermediatesession.h> -#include <vespa/messagebus/destinationsession.h> -#include <vespa/messagebus/emptyreply.h> -#include <vespa/messagebus/error.h> -#include <vespa/messagebus/errorcode.h> -#include <vespa/messagebus/routing/routingspec.h> #include <vespa/messagebus/network/rpcservice.h> -#include <vespa/messagebus/sourcesessionparams.h> using namespace mbus; diff --git a/messagebus/src/tests/servicepool/servicepool.cpp b/messagebus/src/tests/servicepool/servicepool.cpp index c98b342b2f3..86a800b600a 100644 --- a/messagebus/src/tests/servicepool/servicepool.cpp +++ b/messagebus/src/tests/servicepool/servicepool.cpp @@ -1,6 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/messagebus/network/rpcnetwork.h> +#include <vespa/messagebus/network/rpcnetworkparams.h> +#include <vespa/messagebus/network/rpcservicepool.h> #include <vespa/messagebus/testlib/slobrok.h> #include <vespa/vespalib/testkit/testapp.h> diff --git a/messagebus/src/tests/shutdown/shutdown.cpp b/messagebus/src/tests/shutdown/shutdown.cpp index b5e6cac970e..070b51bbbc2 100644 --- a/messagebus/src/tests/shutdown/shutdown.cpp +++ b/messagebus/src/tests/shutdown/shutdown.cpp @@ -1,9 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/messagebus/emptyreply.h> -#include <vespa/messagebus/errorcode.h> -#include <vespa/messagebus/messagebus.h> -#include <vespa/messagebus/routing/errordirective.h> #include <vespa/messagebus/routing/retrytransienterrorspolicy.h> #include <vespa/messagebus/testlib/receptor.h> #include <vespa/messagebus/testlib/simplemessage.h> diff --git a/messagebus/src/tests/slobrok/slobrok.cpp b/messagebus/src/tests/slobrok/slobrok.cpp index 360705e7eae..6c389c25e70 100644 --- a/messagebus/src/tests/slobrok/slobrok.cpp +++ b/messagebus/src/tests/slobrok/slobrok.cpp @@ -2,10 +2,10 @@ #include <vespa/vespalib/testkit/testapp.h> #include <vespa/messagebus/testlib/slobrok.h> -#include <string> -#include <sstream> #include <vespa/slobrok/sbmirror.h> #include <vespa/messagebus/network/rpcnetwork.h> +#include <vespa/messagebus/network/rpcnetworkparams.h> + #include <vespa/vespalib/util/host_name.h> using slobrok::api::IMirrorAPI; |