haraldwolff
/
aasdk
mirror of https://github.com/opencardev/aasdk
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/development'

master v2.1
michal.szwaj 2018-04-07 13:48:40 +02:00
parent b2af4614e3 2223f8e0f1
commit 9ee5283245
6 changed files with 62 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/f1x/aasdk/Channel/Control/ControlServiceChannel.hpp
View File

@ -47,6 +47,7 @@ public:
void sendShutdownRequest(const proto::messages::ShutdownRequest& request, SendPromise::Pointer promise) override;
void sendShutdownResponse(const proto::messages::ShutdownResponse& response, SendPromise::Pointer promise) override;
void sendNavigationFocusResponse(const proto::messages::NavigationFocusResponse& respons, SendPromise::Pointer promisee) override;
void sendPingRequest(const proto::messages::PingRequest& request, SendPromise::Pointer promise) override;
private:
using std::enable_shared_from_this<ControlServiceChannel>::shared_from_this;
@ -58,6 +59,7 @@ private:
void handleShutdownRequest(const common::DataConstBuffer& payload, IControlServiceChannelEventHandler::Pointer eventHandler);
void handleShutdownResponse(const common::DataConstBuffer& payload, IControlServiceChannelEventHandler::Pointer eventHandler);
void handleNavigationFocusRequest(const common::DataConstBuffer& payload, IControlServiceChannelEventHandler::Pointer eventHandler);
void handlePingResponse(const common::DataConstBuffer& payload, IControlServiceChannelEventHandler::Pointer eventHandler);
};
}

2
include/f1x/aasdk/Channel/Control/IControlServiceChannel.hpp
View File

@ -25,6 +25,7 @@
#include <aasdk_proto/AudioFocusResponseMessage.pb.h>
#include <aasdk_proto/NavigationFocusResponseMessage.pb.h>
#include <aasdk_proto/StatusEnum.pb.h>
#include <aasdk_proto/PingRequestMessage.pb.h>
#include <f1x/aasdk/Common/Data.hpp>
#include <f1x/aasdk/Channel/Promise.hpp>
#include <f1x/aasdk/Channel/Control/IControlServiceChannelEventHandler.hpp>
@ -56,6 +57,7 @@ public:
virtual void sendShutdownRequest(const proto::messages::ShutdownRequest& request, SendPromise::Pointer promise) = 0;
virtual void sendShutdownResponse(const proto::messages::ShutdownResponse& response, SendPromise::Pointer promise) = 0;
virtual void sendNavigationFocusResponse(const proto::messages::NavigationFocusResponse& response, SendPromise::Pointer promise) = 0;
virtual void sendPingRequest(const proto::messages::PingRequest& request, SendPromise::Pointer promise) = 0;
};
}

2
include/f1x/aasdk/Channel/Control/IControlServiceChannelEventHandler.hpp
View File

@ -26,6 +26,7 @@
#include <aasdk_proto/ServiceDiscoveryRequestMessage.pb.h>
#include <aasdk_proto/AudioFocusRequestMessage.pb.h>
#include <aasdk_proto/NavigationFocusRequestMessage.pb.h>
#include <aasdk_proto/PingResponseMessage.pb.h>
namespace f1x
{
@ -51,6 +52,7 @@ public:
virtual void onShutdownRequest(const proto::messages::ShutdownRequest& request) = 0;
virtual void onShutdownResponse(const proto::messages::ShutdownResponse& response) = 0;
virtual void onNavigationFocusRequest(const proto::messages::NavigationFocusRequest& request) = 0;
virtual void onPingResponse(const proto::messages::PingResponse& response) = 0;
virtual void onChannelError(const error::Error& e) = 0;
};

25
src/Channel/Control/ControlServiceChannel.cpp
View File

@ -115,6 +115,15 @@ void ControlServiceChannel::sendNavigationFocusResponse(const proto::messages::N
this->send(std::move(message), std::move(promise));
}
void ControlServiceChannel::sendPingRequest(const proto::messages::PingRequest& request, SendPromise::Pointer promise)
{
auto message(std::make_shared<messenger::Message>(channelId_, messenger::EncryptionType::PLAIN, messenger::MessageType::SPECIFIC));
message->insertPayload(messenger::MessageId(proto::ids::ControlMessage::PING_REQUEST).getData());
message->insertPayload(request);
this->send(std::move(message), std::move(promise));
}
void ControlServiceChannel::receive(IControlServiceChannelEventHandler::Pointer eventHandler)
{
auto receivePromise = messenger::ReceivePromise::defer(strand_);
@ -152,6 +161,9 @@ void ControlServiceChannel::messageHandler(messenger::Message::Pointer message,
case proto::ids::ControlMessage::NAVIGATION_FOCUS_REQUEST:
this->handleNavigationFocusRequest(payload, std::move(eventHandler));
break;
case proto::ids::ControlMessage::PING_RESPONSE:
this->handlePingResponse(payload, std::move(eventHandler));
break;
default:
AASDK_LOG(error) << "[ControlServiceChannel] message not handled: " << messageId.getId();
this->receive(std::move(eventHandler));
@ -236,6 +248,19 @@ void ControlServiceChannel::handleNavigationFocusRequest(const common::DataConst
}
}
void ControlServiceChannel::handlePingResponse(const common::DataConstBuffer& payload, IControlServiceChannelEventHandler::Pointer eventHandler)
{
proto::messages::PingResponse response;
if(response.ParseFromArray(payload.cdata, payload.size))
{
eventHandler->onPingResponse(response);
}
else
{
eventHandler->onChannelError(error::Error(error::ErrorCode::PARSE_PAYLOAD));
}
}
}
}
}

6
src/USB/ConnectedAccessoriesEnumerator.cpp
View File

@ -69,7 +69,6 @@ void ConnectedAccessoriesEnumerator::cancel()
if(queryChain_ != nullptr)
{
queryChain_->cancel();
queryChain_.reset();
}
});
}
@ -92,6 +91,11 @@ void ConnectedAccessoriesEnumerator::queryNextDevice()
{
this->queryNextDevice();
}
else
{
promise_->reject(e);
this->reset();
}
});
queryChain_->start(std::move(deviceHandle), std::move(queryChainPromise));

26
src/USB/ConnectedAccessoriesEnumerator.ut.cpp
View File

@ -205,6 +205,32 @@ BOOST_FIXTURE_TEST_CASE(ConnectedAccessoriesEnumerator_OpenDeviceFailed, Connect
ioService_.run();
}
BOOST_FIXTURE_TEST_CASE(ConnectedAccessoriesEnumerator_CancelEnumeration, ConnectedAccessoriesEnumeratorUnitTest)
{
deviceList_.push_back(reinterpret_cast<libusb_device*>(1));
EXPECT_CALL(queryChainFactoryMock_, create()).WillOnce(Return(queryChain_));
auto connectedAccessoriesEnumerator(std::make_shared<ConnectedAccessoriesEnumerator>(usbWrapperMock_, ioService_, queryChainFactoryMock_));
EXPECT_CALL(usbWrapperMock_, getDeviceList(_)).WillOnce(DoAll(SetArgReferee<0>(deviceListHandle_), Return(0)));
connectedAccessoriesEnumerator->enumerate(std::move(promise_));
EXPECT_CALL(usbWrapperMock_, open(*deviceList_.begin(), _)).WillOnce(DoAll(SetArgReferee<1>(deviceHandle_), Return(0)));
IAccessoryModeQueryChain::Promise::Pointer queryChainPromise;
EXPECT_CALL(queryChainMock_, start(deviceHandle_, _)).WillOnce(SaveArg<1>(&queryChainPromise));
ioService_.run();
ioService_.reset();
EXPECT_CALL(queryChainMock_, cancel());
connectedAccessoriesEnumerator->cancel();
error::Error e(error::ErrorCode::OPERATION_ABORTED);
EXPECT_CALL(promiseHandlerMock_, onResolve(_)).Times(0);
EXPECT_CALL(promiseHandlerMock_, onReject(e));
queryChainPromise->reject(e);
ioService_.run();
}
}
}
}