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

Fix hanging resources when accessories enumeration is cancelled

pull/1/head
michal.szwaj 2018-04-07 13:28:42 +02:00
parent 07c1e83f9f
commit f32998d871
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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();
}
}
}
}