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

f1xpl · Apr 7, 2018 · 9ee5283 · 9ee5283
2 parents b2af461 + 2223f8e
commit 9ee5283
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 1 deletion.
diff --git a/include/f1x/aasdk/Channel/Control/ControlServiceChannel.hpp b/include/f1x/aasdk/Channel/Control/ControlServiceChannel.hpp
@@ -47,6 +47,7 @@ class ControlServiceChannel: public IControlServiceChannel, public ServiceChanne
     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 @@ class ControlServiceChannel: public IControlServiceChannel, public ServiceChanne
     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);
 };
 
 }

diff --git a/include/f1x/aasdk/Channel/Control/IControlServiceChannel.hpp b/include/f1x/aasdk/Channel/Control/IControlServiceChannel.hpp
@@ -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 @@ class IControlServiceChannel
     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;
 };
 
 }

diff --git a/include/f1x/aasdk/Channel/Control/IControlServiceChannelEventHandler.hpp b/include/f1x/aasdk/Channel/Control/IControlServiceChannelEventHandler.hpp
@@ -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 @@ class IControlServiceChannelEventHandler
     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;
 };
 

diff --git a/src/Channel/Control/ControlServiceChannel.cpp b/src/Channel/Control/ControlServiceChannel.cpp
@@ -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));
+    }
+}
+
 }
 }
 }

diff --git a/src/USB/ConnectedAccessoriesEnumerator.cpp b/src/USB/ConnectedAccessoriesEnumerator.cpp
@@ -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));

diff --git a/src/USB/ConnectedAccessoriesEnumerator.ut.cpp b/src/USB/ConnectedAccessoriesEnumerator.ut.cpp
@@ -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();
+}
+
 }
 }
 }