You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bb...@apache.org on 2018/10/31 15:13:03 UTC
[mesos] 01/02: Used an alias for reoccuring complicated type.
This is an automated email from the ASF dual-hosted git repository.
bbannier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 758037f9c68d0f05817a2d78d534f640d9a0abc3
Author: Benjamin Bannier <be...@mesosphere.io>
AuthorDate: Wed Oct 31 15:43:00 2018 +0100
Used an alias for reoccuring complicated type.
Review: https://reviews.apache.org/r/69159/
---
src/tests/mesos.hpp | 131 +++++++++-------------------------------------------
1 file changed, 23 insertions(+), 108 deletions(-)
diff --git a/src/tests/mesos.hpp b/src/tests/mesos.hpp
index 40c63b0..576f4bd 100644
--- a/src/tests/mesos.hpp
+++ b/src/tests/mesos.hpp
@@ -2907,6 +2907,18 @@ template <
typename Source>
class MockResourceProvider
{
+ using MockResourceProviderT = MockResourceProvider<
+ Event,
+ Call,
+ Driver,
+ ResourceProviderInfo,
+ Resource,
+ Resources,
+ ResourceProviderID,
+ OperationState,
+ Operation,
+ Source>;
+
public:
MockResourceProvider(
const ResourceProviderInfo& _info,
@@ -2915,83 +2927,23 @@ public:
resources(_resources)
{
ON_CALL(*this, connected())
- .WillByDefault(Invoke(
- this,
- &MockResourceProvider<
- Event,
- Call,
- Driver,
- ResourceProviderInfo,
- Resource,
- Resources,
- ResourceProviderID,
- OperationState,
- Operation,
- Source>::connectedDefault));
+ .WillByDefault(Invoke(this, &MockResourceProviderT::connectedDefault));
EXPECT_CALL(*this, connected()).WillRepeatedly(DoDefault());
ON_CALL(*this, subscribed(_))
- .WillByDefault(Invoke(
- this,
- &MockResourceProvider<
- Event,
- Call,
- Driver,
- ResourceProviderInfo,
- Resource,
- Resources,
- ResourceProviderID,
- OperationState,
- Operation,
- Source>::subscribedDefault));
+ .WillByDefault(Invoke(this, &MockResourceProviderT::subscribedDefault));
EXPECT_CALL(*this, subscribed(_)).WillRepeatedly(DoDefault());
ON_CALL(*this, applyOperation(_))
- .WillByDefault(Invoke(
- this,
- &MockResourceProvider<
- Event,
- Call,
- Driver,
- ResourceProviderInfo,
- Resource,
- Resources,
- ResourceProviderID,
- OperationState,
- Operation,
- Source>::operationDefault));
+ .WillByDefault(Invoke(this, &MockResourceProviderT::operationDefault));
EXPECT_CALL(*this, applyOperation(_)).WillRepeatedly(DoDefault());
ON_CALL(*this, publishResources(_))
- .WillByDefault(Invoke(
- this,
- &MockResourceProvider<
- Event,
- Call,
- Driver,
- ResourceProviderInfo,
- Resource,
- Resources,
- ResourceProviderID,
- OperationState,
- Operation,
- Source>::publishDefault));
+ .WillByDefault(Invoke(this, &MockResourceProviderT::publishDefault));
EXPECT_CALL(*this, publishResources(_)).WillRepeatedly(DoDefault());
ON_CALL(*this, teardown())
- .WillByDefault(Invoke(
- this,
- &MockResourceProvider<
- Event,
- Call,
- Driver,
- ResourceProviderInfo,
- Resource,
- Resources,
- ResourceProviderID,
- OperationState,
- Operation,
- Source>::teardownDefault));
+ .WillByDefault(Invoke(this, &MockResourceProviderT::teardownDefault));
EXPECT_CALL(*this, teardown()).WillRepeatedly(DoDefault());
}
@@ -3074,49 +3026,12 @@ public:
#endif // USE_SSL_SOCKET
driver.reset(new Driver(
- std::move(detector),
- contentType,
- lambda::bind(
- &MockResourceProvider<
- Event,
- Call,
- Driver,
- ResourceProviderInfo,
- Resource,
- Resources,
- ResourceProviderID,
- OperationState,
- Operation,
- Source>::connected,
- this),
- lambda::bind(
- &MockResourceProvider<
- Event,
- Call,
- Driver,
- ResourceProviderInfo,
- Resource,
- Resources,
- ResourceProviderID,
- OperationState,
- Operation,
- Source>::disconnected,
- this),
- lambda::bind(
- &MockResourceProvider<
- Event,
- Call,
- Driver,
- ResourceProviderInfo,
- Resource,
- Resources,
- ResourceProviderID,
- OperationState,
- Operation,
- Source>::events,
- this,
- lambda::_1),
- token));
+ std::move(detector),
+ contentType,
+ lambda::bind(&MockResourceProviderT::connected, this),
+ lambda::bind(&MockResourceProviderT::disconnected, this),
+ lambda::bind(&MockResourceProviderT::events, this, lambda::_1),
+ token));
driver->start();
}