2017-10-30 22:14:38 +00:00
|
|
|
/*
|
2019-05-22 23:06:18 +00:00
|
|
|
* Copyright 2017-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
2017-10-30 22:14:38 +00:00
|
|
|
*
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License").
|
|
|
|
* You may not use this file except in compliance with the License.
|
|
|
|
* A copy of the License is located at
|
|
|
|
*
|
|
|
|
* http://aws.amazon.com/apache2.0/
|
|
|
|
*
|
|
|
|
* or in the "license" file accompanying this file. This file is distributed
|
|
|
|
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
|
|
|
|
* express or implied. See the License for the specific language governing
|
|
|
|
* permissions and limitations under the License.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <algorithm>
|
|
|
|
#include <memory>
|
|
|
|
#include <set>
|
|
|
|
|
|
|
|
#include <AVSCommon/AVS/Attachment/MockAttachmentManager.h>
|
|
|
|
#include <AVSCommon/AVS/SpeakerConstants/SpeakerConstants.h>
|
|
|
|
#include <AVSCommon/SDKInterfaces/MockContextManager.h>
|
|
|
|
#include <AVSCommon/SDKInterfaces/MockDirectiveHandlerResult.h>
|
|
|
|
#include <AVSCommon/SDKInterfaces/MockExceptionEncounteredSender.h>
|
|
|
|
#include <AVSCommon/SDKInterfaces/MockMessageSender.h>
|
Version 1.8 alexa-client-sdk
Changes in this update:
Enhancements
Added local stop functionality. This allows a user to stop an active function, such as an alert or timer, by uttering "Alexa, stop" when an Alexa-enabled product is offline.
Alerts in the background now stream in 10 sec intervals, rather than continuously.
Added support for France to the sample app.
friendlyName can now be updated for BlueZ implementations of BlueZBluetoothDevice and BlueZHostController.
Bug Fixes
Fixed an issue where the Bluetooth agent didn't clear user data upon reset, including paired devices and the uuidMapping table.
Fixed MediaPlayer threading issues. Now each instance has it's own glib main loop thread, rather than utilizing the default main context worker thread.
Fixed segmentation fault issues that occurred when certain static initializers needed to be initialized in a certain order, but the order wasn't defined.
Known Issues
The ACL may encounter issues if audio attachments are received but not consumed.
SpeechSynthesizerState currently uses GAINING_FOCUS and LOSING_FOCUS as a workaround for handling intermediate state. These states may be removed in a future release.
The Alexa app doesn't always indicate when a device is successfully connected via Bluetooth.
Connecting a product to streaming media via Bluetooth will sometimes stop media playback within the source application. Resuming playback through the source application or toggling next/previous will correct playback.
When a source device is streaming silence via Bluetooth, the Alexa companion app indicates that audio content is streaming.
The Bluetooth agent assumes that the Bluetooth adapter is always connected to a power source. Disconnecting from a power source during operation is not yet supported.
On some products, interrupted Bluetooth playback may not resume if other content is locally streamed.
On Raspberry Pi, when streaming audio via Bluetooth, sometimes the audio stream stutters.
On Raspberry Pi, BlueALSA must be terminated each time the device boots. See Raspberry Pi Quick Start Guide for more information.
2018-06-27 21:41:15 +00:00
|
|
|
#include <AVSCommon/SDKInterfaces/MockSpeakerInterface.h>
|
2017-10-30 22:14:38 +00:00
|
|
|
#include <AVSCommon/SDKInterfaces/SpeakerInterface.h>
|
|
|
|
#include <AVSCommon/SDKInterfaces/SpeakerManagerObserverInterface.h>
|
|
|
|
#include <AVSCommon/Utils/Memory/Memory.h>
|
Version 1.8 alexa-client-sdk
Changes in this update:
Enhancements
Added local stop functionality. This allows a user to stop an active function, such as an alert or timer, by uttering "Alexa, stop" when an Alexa-enabled product is offline.
Alerts in the background now stream in 10 sec intervals, rather than continuously.
Added support for France to the sample app.
friendlyName can now be updated for BlueZ implementations of BlueZBluetoothDevice and BlueZHostController.
Bug Fixes
Fixed an issue where the Bluetooth agent didn't clear user data upon reset, including paired devices and the uuidMapping table.
Fixed MediaPlayer threading issues. Now each instance has it's own glib main loop thread, rather than utilizing the default main context worker thread.
Fixed segmentation fault issues that occurred when certain static initializers needed to be initialized in a certain order, but the order wasn't defined.
Known Issues
The ACL may encounter issues if audio attachments are received but not consumed.
SpeechSynthesizerState currently uses GAINING_FOCUS and LOSING_FOCUS as a workaround for handling intermediate state. These states may be removed in a future release.
The Alexa app doesn't always indicate when a device is successfully connected via Bluetooth.
Connecting a product to streaming media via Bluetooth will sometimes stop media playback within the source application. Resuming playback through the source application or toggling next/previous will correct playback.
When a source device is streaming silence via Bluetooth, the Alexa companion app indicates that audio content is streaming.
The Bluetooth agent assumes that the Bluetooth adapter is always connected to a power source. Disconnecting from a power source during operation is not yet supported.
On some products, interrupted Bluetooth playback may not resume if other content is locally streamed.
On Raspberry Pi, when streaming audio via Bluetooth, sometimes the audio stream stutters.
On Raspberry Pi, BlueALSA must be terminated each time the device boots. See Raspberry Pi Quick Start Guide for more information.
2018-06-27 21:41:15 +00:00
|
|
|
#include <SpeakerManager/SpeakerManagerConstants.h>
|
2017-10-30 22:14:38 +00:00
|
|
|
#include <gmock/gmock.h>
|
|
|
|
#include <gtest/gtest.h>
|
|
|
|
#include <rapidjson/document.h>
|
|
|
|
#include <rapidjson/error/en.h>
|
|
|
|
#include <rapidjson/stringbuffer.h>
|
|
|
|
#include <rapidjson/writer.h>
|
|
|
|
|
|
|
|
#include "SpeakerManager/SpeakerManager.h"
|
|
|
|
|
|
|
|
namespace alexaClientSDK {
|
|
|
|
namespace capabilityAgents {
|
|
|
|
namespace speakerManager {
|
|
|
|
namespace test {
|
|
|
|
|
|
|
|
using namespace avsCommon::avs;
|
|
|
|
using namespace avsCommon::avs::attachment::test;
|
|
|
|
using namespace avsCommon::avs::speakerConstants;
|
|
|
|
using namespace avsCommon::sdkInterfaces;
|
|
|
|
using namespace avsCommon::sdkInterfaces::test;
|
|
|
|
using namespace avsCommon::utils::memory;
|
|
|
|
using namespace rapidjson;
|
|
|
|
using namespace ::testing;
|
|
|
|
|
|
|
|
/// Timeout when waiting for futures to be set.
|
|
|
|
static std::chrono::milliseconds TIMEOUT(1000);
|
|
|
|
|
|
|
|
/// The @c MessageId identifer.
|
|
|
|
static const std::string MESSAGE_ID("messageId");
|
|
|
|
|
|
|
|
/// A @c SetVolume/AdjustVolume payload.
|
|
|
|
static const std::string VOLUME_PAYLOAD =
|
|
|
|
"{"
|
|
|
|
"\"volume\":" +
|
|
|
|
std::to_string(AVS_SET_VOLUME_MAX) +
|
|
|
|
""
|
|
|
|
"}";
|
|
|
|
|
|
|
|
/// A @c SetMute payload.
|
|
|
|
static const std::string MUTE_PAYLOAD =
|
|
|
|
"{"
|
|
|
|
"\"mute\":" +
|
|
|
|
MUTE_STRING +
|
|
|
|
""
|
|
|
|
"}";
|
|
|
|
|
2019-05-22 23:06:18 +00:00
|
|
|
/// A @c SetMute payload to unmute.
|
|
|
|
static const std::string UNMUTE_PAYLOAD =
|
|
|
|
"{"
|
|
|
|
"\"mute\":" +
|
|
|
|
UNMUTE_STRING +
|
|
|
|
""
|
|
|
|
"}";
|
|
|
|
|
2017-10-30 22:14:38 +00:00
|
|
|
/**
|
|
|
|
* A mock object to test that the observer is being correctly notified.
|
|
|
|
*/
|
|
|
|
class MockObserver : public SpeakerManagerObserverInterface {
|
|
|
|
public:
|
|
|
|
MOCK_METHOD3(
|
|
|
|
onSpeakerSettingsChanged,
|
|
|
|
void(const Source&, const SpeakerInterface::Type&, const SpeakerInterface::SpeakerSettings&));
|
|
|
|
};
|
|
|
|
|
|
|
|
class SpeakerManagerTest : public ::testing::TestWithParam<std::vector<SpeakerInterface::Type>> {
|
|
|
|
public:
|
|
|
|
/// SetUp before each test.
|
|
|
|
void SetUp();
|
|
|
|
|
|
|
|
/// TearDown after each test.
|
|
|
|
void TearDown();
|
|
|
|
|
|
|
|
/// CleanUp and reset the SpeakerManager.
|
|
|
|
void cleanUp();
|
|
|
|
|
|
|
|
/// Function to wait for @c m_wakeSetCompleteFuture to be set.
|
|
|
|
void wakeOnSetCompleted();
|
|
|
|
|
|
|
|
/// Helper function to get unique @c Type.
|
|
|
|
std::set<SpeakerInterface::Type> getUniqueTypes(std::vector<std::shared_ptr<SpeakerInterface>>& speakers);
|
|
|
|
|
|
|
|
/// A constructor which initializes the promises and futures needed for the test class.
|
|
|
|
SpeakerManagerTest() :
|
|
|
|
m_wakeSetCompletedPromise{},
|
|
|
|
m_wakeSetCompletedFuture{m_wakeSetCompletedPromise.get_future()} {
|
|
|
|
}
|
|
|
|
|
|
|
|
protected:
|
|
|
|
/// Promise to synchronize directive handling through setCompleted.
|
|
|
|
std::promise<void> m_wakeSetCompletedPromise;
|
|
|
|
|
|
|
|
/// Future to synchronize directive handling through setCompleted.
|
|
|
|
std::future<void> m_wakeSetCompletedFuture;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set this to a nice mock. The only instance of the mock being called is the setStateProvider member, which we
|
|
|
|
* explicitly test.
|
|
|
|
*/
|
|
|
|
std::shared_ptr<NiceMock<MockContextManager>> m_mockContextManager;
|
|
|
|
|
|
|
|
/// A strict mock that allows the test to strictly monitor the messages sent.
|
|
|
|
std::shared_ptr<StrictMock<MockMessageSender>> m_mockMessageSender;
|
|
|
|
|
|
|
|
/// A strict mock that allows the test to strictly monitor the exceptions being sent.
|
|
|
|
std::shared_ptr<StrictMock<MockExceptionEncounteredSender>> m_mockExceptionSender;
|
|
|
|
|
|
|
|
/// A strict mock that allows the test to strictly monitor the handling of directives.
|
|
|
|
std::unique_ptr<StrictMock<MockDirectiveHandlerResult>> m_mockDirectiveHandlerResult;
|
|
|
|
|
|
|
|
/// A mock to allow testing of the observer callback behavior.
|
|
|
|
std::shared_ptr<NiceMock<MockObserver>> m_observer;
|
|
|
|
|
|
|
|
/// A pointer to an instance of the SpeakerManager that will be instantiated per test.
|
|
|
|
std::shared_ptr<SpeakerManager> m_speakerManager;
|
|
|
|
};
|
|
|
|
|
|
|
|
void SpeakerManagerTest::SetUp() {
|
|
|
|
m_mockContextManager = std::make_shared<NiceMock<MockContextManager>>();
|
|
|
|
m_mockMessageSender = std::make_shared<StrictMock<MockMessageSender>>();
|
|
|
|
m_mockExceptionSender = std::make_shared<StrictMock<MockExceptionEncounteredSender>>();
|
|
|
|
m_mockDirectiveHandlerResult = make_unique<StrictMock<MockDirectiveHandlerResult>>();
|
|
|
|
m_observer = std::make_shared<NiceMock<MockObserver>>();
|
|
|
|
}
|
|
|
|
|
|
|
|
void SpeakerManagerTest::TearDown() {
|
|
|
|
if (m_speakerManager) {
|
|
|
|
m_speakerManager->shutdown();
|
|
|
|
m_speakerManager.reset();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void SpeakerManagerTest::wakeOnSetCompleted() {
|
|
|
|
m_wakeSetCompletedPromise.set_value();
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Helper function to get unique @c Type from a vector of speakers.
|
|
|
|
*/
|
|
|
|
std::set<SpeakerInterface::Type> SpeakerManagerTest::getUniqueTypes(
|
|
|
|
std::vector<std::shared_ptr<SpeakerInterface>>& speakers) {
|
|
|
|
std::set<SpeakerInterface::Type> types;
|
|
|
|
for (auto speaker : speakers) {
|
|
|
|
types.insert(speaker->getSpeakerType());
|
|
|
|
}
|
|
|
|
return types;
|
|
|
|
}
|
|
|
|
|
2017-12-09 00:07:37 +00:00
|
|
|
/// Helper function to generate the VolumeState in JSON for the ContextManager.
|
|
|
|
std::string generateVolumeStateJson(SpeakerInterface::SpeakerSettings settings) {
|
|
|
|
rapidjson::Document state(rapidjson::kObjectType);
|
|
|
|
state.AddMember(VOLUME_KEY, settings.volume, state.GetAllocator());
|
|
|
|
state.AddMember(MUTED_KEY, settings.mute, state.GetAllocator());
|
|
|
|
|
|
|
|
rapidjson::StringBuffer buffer;
|
|
|
|
rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
|
|
|
|
if (!state.Accept(writer)) {
|
|
|
|
return "";
|
|
|
|
}
|
|
|
|
|
|
|
|
return buffer.GetString();
|
|
|
|
}
|
|
|
|
|
2017-10-30 22:14:38 +00:00
|
|
|
/**
|
|
|
|
* Tests creating the SpeakerManager with a null contextManager.
|
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_F(SpeakerManagerTest, test_nullContextManager) {
|
2017-10-30 22:14:38 +00:00
|
|
|
std::vector<std::shared_ptr<SpeakerInterface>> speakers{
|
2018-07-09 21:07:31 +00:00
|
|
|
std::make_shared<MockSpeakerInterface>(SpeakerInterface::Type::AVS_SPEAKER_VOLUME)};
|
2017-10-30 22:14:38 +00:00
|
|
|
|
|
|
|
m_speakerManager = SpeakerManager::create(speakers, nullptr, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
|
|
|
|
ASSERT_EQ(m_speakerManager, nullptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Tests creating the SpeakerManager with a null messageSender.
|
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_F(SpeakerManagerTest, test_nullMessageSender) {
|
2017-10-30 22:14:38 +00:00
|
|
|
std::vector<std::shared_ptr<SpeakerInterface>> speakers{
|
2018-07-09 21:07:31 +00:00
|
|
|
std::make_shared<MockSpeakerInterface>(SpeakerInterface::Type::AVS_SPEAKER_VOLUME)};
|
2017-10-30 22:14:38 +00:00
|
|
|
|
|
|
|
m_speakerManager = SpeakerManager::create(speakers, m_mockContextManager, nullptr, m_mockExceptionSender);
|
|
|
|
|
|
|
|
ASSERT_EQ(m_speakerManager, nullptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Tests creating the SpeakerManager with a null exceptionSender.
|
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_F(SpeakerManagerTest, test_nullExceptionSender) {
|
2017-10-30 22:14:38 +00:00
|
|
|
std::vector<std::shared_ptr<SpeakerInterface>> speakers{
|
2018-07-09 21:07:31 +00:00
|
|
|
std::make_shared<MockSpeakerInterface>(SpeakerInterface::Type::AVS_SPEAKER_VOLUME)};
|
2017-10-30 22:14:38 +00:00
|
|
|
|
|
|
|
m_speakerManager = SpeakerManager::create(speakers, m_mockContextManager, m_mockMessageSender, nullptr);
|
|
|
|
|
|
|
|
ASSERT_EQ(m_speakerManager, nullptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Tests creating the SpeakerManager with no speakers.
|
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_F(SpeakerManagerTest, test_noSpeakers) {
|
2017-10-30 22:14:38 +00:00
|
|
|
m_speakerManager = SpeakerManager::create({}, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
|
Version 1.9.0 alexa-client-sdk
Changes in this update:
Enhancements
Added Android SDK support, which includes new implementations of the MediaPlayer, audio recorder, and logger.
Added the InteractionModel interface, which enables Alexa Routines.
Optional configuration changes have been introduced. Now a network interface can be specified to connect to the SDK via curl.
Build options can be configured to support Android.
Added GUI 1.1 support. The PlaybackController has been extended to support new control functionality, and the System interface has been updated to support SoftwareInfo.
Bug Fixes
Installation script execution time has been reduced. Now a single branch clone is used, such as the master branch.
Issue 846 - Fixed a bug where audio stuttered on slow network connections.
Removed the SpeakerManager constructor check for non-zero speakers.
Issue 891 - Resolved incorrect offset in the PlaybackFinished event.
Issue 727 - Fixed an issue where the sample app behaved erratically upon network disconnection/reconnection.
Issue 910 - Fixed a GCC 8+ compilation issue. Note: issues related to -Wclass-memaccess will still trigger warnings, but won't fail compilation.
Issue 871 Issue 880 - Fixed compiler warnings.
Fixed a bug where Ted Talks would not stream via TuneIn.
Fixed an issue where the PryonLiteKeywordDetector would not restart.
Fixed an issue where PlaybackStutterStarted and PlaybackStutterFinished events were not being sent due to a missing Gstreamer queue element.
Fixed a bug where the CapabilitiesDelegate database was not being cleared upon logout.
Fixed in issue that caused the following compiler warning “class has virtual functions but non-virtual destructor”.
Fixed a bug where BlueZDeviceManager was not properly destroyed.
Fixed a bug that occurred when the initializer list was converted to std::unordered_set.
Fixed a build error that occurred when building with BUILD_TESTING=Off.
Known Issues
* The ACL may encounter issues if audio attachments are received but not consumed.
* SpeechSynthesizerState currently uses GAINING_FOCUS and LOSING_FOCUS as a workaround for handling intermediate state. These states may be removed in a future release.
* The Alexa app doesn't always indicate when a device is successfully connected via Bluetooth.
* Connecting a product to streaming media via Bluetooth will sometimes stop media playback within the source application. Resuming playback through the source application or toggling next/previous will correct playback.
* When a source device is streaming silence via Bluetooth, the Alexa companion app indicates that audio content is streaming.
* The Bluetooth agent assumes that the Bluetooth adapter is always connected to a power source. Disconnecting from a power source during operation is not yet supported.
* On some products, interrupted Bluetooth playback may not resume if other content is locally streamed.
* On Raspberry Pi, when streaming audio via Bluetooth, sometimes the audio stream stutters.
* These CapabilitiesDelegateTest tests have been temporarily disabled to prevent build errors for the Android build: CapabilitiesDelegateTest.withCapabilitiesHappyCase, CapabilitiesDelegateTest.republish, CapabilitiesDelegateTest.testClearData.
* make integration is currently not available for Android. In order to run integration tests on Android, you'll need to manually upload the test binary file along with the any input file. At that point, the adb can be used to run the integration tests.
* On Raspberry Pi running Android Things with HDMI output audio, beginning of speech is truncated when Alexa responds to user TTS.
* Spotify does not completely shut down when the sample app quits.
2018-08-28 21:10:18 +00:00
|
|
|
ASSERT_NE(m_speakerManager, nullptr);
|
2017-10-30 22:14:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2017-12-09 00:07:37 +00:00
|
|
|
* Tests that the SpeakerManager initially provides the state at constructor time.
|
2017-10-30 22:14:38 +00:00
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_F(SpeakerManagerTest, test_contextManagerSetStateConstructor) {
|
2017-12-09 00:07:37 +00:00
|
|
|
EXPECT_CALL(
|
|
|
|
*m_mockContextManager,
|
|
|
|
setState(VOLUME_STATE, generateVolumeStateJson(DEFAULT_SETTINGS), StateRefreshPolicy::NEVER, _))
|
|
|
|
.Times(Exactly(1));
|
2018-07-09 21:07:31 +00:00
|
|
|
auto speaker = std::make_shared<NiceMock<MockSpeakerInterface>>(SpeakerInterface::Type::AVS_SPEAKER_VOLUME);
|
2017-10-30 22:14:38 +00:00
|
|
|
speaker->DelegateToReal();
|
|
|
|
|
|
|
|
std::vector<std::shared_ptr<SpeakerInterface>> speakers{speaker};
|
|
|
|
m_speakerManager =
|
|
|
|
SpeakerManager::create(speakers, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Test setVolume with a value that's under the bounds. The operation should fail.
|
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_F(SpeakerManagerTest, test_setVolumeUnderBounds) {
|
2018-07-09 21:07:31 +00:00
|
|
|
auto speaker = std::make_shared<NiceMock<MockSpeakerInterface>>(SpeakerInterface::Type::AVS_SPEAKER_VOLUME);
|
2017-10-30 22:14:38 +00:00
|
|
|
speaker->DelegateToReal();
|
|
|
|
EXPECT_CALL(*speaker, setVolume(_)).Times(Exactly(0));
|
|
|
|
|
|
|
|
std::vector<std::shared_ptr<SpeakerInterface>> speakers = {speaker};
|
|
|
|
|
|
|
|
m_speakerManager =
|
|
|
|
SpeakerManager::create(speakers, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
|
|
|
|
EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
|
|
|
|
m_speakerManager->addSpeakerManagerObserver(m_observer);
|
|
|
|
|
2018-07-09 21:07:31 +00:00
|
|
|
std::future<bool> future =
|
|
|
|
m_speakerManager->setVolume(SpeakerInterface::Type::AVS_SPEAKER_VOLUME, AVS_SET_VOLUME_MIN - 1);
|
2017-10-30 22:14:38 +00:00
|
|
|
ASSERT_FALSE(future.get());
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Test setVolume with a value that's over the bounds. The operation should fail.
|
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_F(SpeakerManagerTest, test_setVolumeOverBounds) {
|
2018-07-09 21:07:31 +00:00
|
|
|
auto speaker = std::make_shared<NiceMock<MockSpeakerInterface>>(SpeakerInterface::Type::AVS_SPEAKER_VOLUME);
|
2017-10-30 22:14:38 +00:00
|
|
|
speaker->DelegateToReal();
|
|
|
|
EXPECT_CALL(*speaker, setVolume(_)).Times(Exactly(0));
|
|
|
|
std::vector<std::shared_ptr<SpeakerInterface>> speakers = {speaker};
|
|
|
|
|
|
|
|
m_speakerManager =
|
|
|
|
SpeakerManager::create(speakers, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
|
|
|
|
EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
|
|
|
|
m_speakerManager->addSpeakerManagerObserver(m_observer);
|
|
|
|
|
2018-07-09 21:07:31 +00:00
|
|
|
std::future<bool> future =
|
|
|
|
m_speakerManager->setVolume(SpeakerInterface::Type::AVS_SPEAKER_VOLUME, AVS_SET_VOLUME_MAX + 1);
|
2017-10-30 22:14:38 +00:00
|
|
|
ASSERT_FALSE(future.get());
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Test adjustVolume with a value that's under the bounds. The operation should fail.
|
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_F(SpeakerManagerTest, test_adjustVolumeUnderBounds) {
|
2018-07-09 21:07:31 +00:00
|
|
|
auto speaker = std::make_shared<NiceMock<MockSpeakerInterface>>(SpeakerInterface::Type::AVS_SPEAKER_VOLUME);
|
2017-10-30 22:14:38 +00:00
|
|
|
speaker->DelegateToReal();
|
|
|
|
EXPECT_CALL(*speaker, adjustVolume(_)).Times(Exactly(0));
|
|
|
|
std::vector<std::shared_ptr<SpeakerInterface>> speakers = {speaker};
|
|
|
|
|
|
|
|
m_speakerManager =
|
|
|
|
SpeakerManager::create(speakers, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
|
|
|
|
EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
|
|
|
|
m_speakerManager->addSpeakerManagerObserver(m_observer);
|
|
|
|
|
|
|
|
std::future<bool> future =
|
2018-07-09 21:07:31 +00:00
|
|
|
m_speakerManager->adjustVolume(SpeakerInterface::Type::AVS_SPEAKER_VOLUME, AVS_ADJUST_VOLUME_MIN - 1);
|
2017-10-30 22:14:38 +00:00
|
|
|
ASSERT_FALSE(future.get());
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Test adjustVolume with a value that's over the bounds. The operation should fail.
|
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_F(SpeakerManagerTest, test_adjustVolumeOverBounds) {
|
2018-07-09 21:07:31 +00:00
|
|
|
auto speaker = std::make_shared<NiceMock<MockSpeakerInterface>>(SpeakerInterface::Type::AVS_SPEAKER_VOLUME);
|
2017-10-30 22:14:38 +00:00
|
|
|
speaker->DelegateToReal();
|
|
|
|
EXPECT_CALL(*speaker, adjustVolume(_)).Times(Exactly(0));
|
|
|
|
std::vector<std::shared_ptr<SpeakerInterface>> speakers = {speaker};
|
|
|
|
|
|
|
|
m_speakerManager =
|
|
|
|
SpeakerManager::create(speakers, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
|
|
|
|
EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
|
|
|
|
m_speakerManager->addSpeakerManagerObserver(m_observer);
|
|
|
|
|
|
|
|
std::future<bool> future =
|
2018-07-09 21:07:31 +00:00
|
|
|
m_speakerManager->adjustVolume(SpeakerInterface::Type::AVS_SPEAKER_VOLUME, AVS_ADJUST_VOLUME_MAX + 1);
|
2017-10-30 22:14:38 +00:00
|
|
|
ASSERT_FALSE(future.get());
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Test setVolume when the speaker interfaces are out of sync. The operation should fail.
|
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_F(SpeakerManagerTest, test_setVolumeOutOfSync) {
|
2018-07-09 21:07:31 +00:00
|
|
|
auto speaker = std::make_shared<NiceMock<MockSpeakerInterface>>(SpeakerInterface::Type::AVS_SPEAKER_VOLUME);
|
2017-10-30 22:14:38 +00:00
|
|
|
speaker->DelegateToReal();
|
|
|
|
|
2018-07-09 21:07:31 +00:00
|
|
|
auto speaker2 = std::make_shared<NiceMock<MockSpeakerInterface>>(SpeakerInterface::Type::AVS_SPEAKER_VOLUME);
|
|
|
|
EXPECT_CALL(*speaker2, getSpeakerType()).WillRepeatedly(Return(SpeakerInterface::Type::AVS_SPEAKER_VOLUME));
|
2017-10-30 22:14:38 +00:00
|
|
|
EXPECT_CALL(*speaker2, setVolume(_)).WillRepeatedly(Return(true));
|
|
|
|
// Set speaker to be out of sync.
|
|
|
|
EXPECT_CALL(*speaker2, getSpeakerSettings(_)).WillRepeatedly(Return(false));
|
|
|
|
|
|
|
|
std::vector<std::shared_ptr<SpeakerInterface>> speakers = {speaker, speaker2};
|
|
|
|
|
|
|
|
m_speakerManager =
|
|
|
|
SpeakerManager::create(speakers, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
|
|
|
|
EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
|
|
|
|
m_speakerManager->addSpeakerManagerObserver(m_observer);
|
|
|
|
|
2018-07-09 21:07:31 +00:00
|
|
|
std::future<bool> future =
|
|
|
|
m_speakerManager->setVolume(SpeakerInterface::Type::AVS_SPEAKER_VOLUME, AVS_SET_VOLUME_MAX);
|
2017-10-30 22:14:38 +00:00
|
|
|
ASSERT_FALSE(future.get());
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Test adjustVolume when the speaker interfaces are out of sync. The operation should fail.
|
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_F(SpeakerManagerTest, test_adjustVolumeOutOfSync) {
|
2018-07-09 21:07:31 +00:00
|
|
|
auto speaker = std::make_shared<NiceMock<MockSpeakerInterface>>(SpeakerInterface::Type::AVS_SPEAKER_VOLUME);
|
2017-10-30 22:14:38 +00:00
|
|
|
speaker->DelegateToReal();
|
|
|
|
|
2018-07-09 21:07:31 +00:00
|
|
|
auto speaker2 = std::make_shared<NiceMock<MockSpeakerInterface>>(SpeakerInterface::Type::AVS_SPEAKER_VOLUME);
|
|
|
|
EXPECT_CALL(*speaker2, getSpeakerType()).WillRepeatedly(Return(SpeakerInterface::Type::AVS_SPEAKER_VOLUME));
|
2017-10-30 22:14:38 +00:00
|
|
|
EXPECT_CALL(*speaker2, adjustVolume(_)).WillRepeatedly(Return(true));
|
|
|
|
// Set speaker to be out of sync.
|
|
|
|
EXPECT_CALL(*speaker2, getSpeakerSettings(_)).WillRepeatedly(Return(false));
|
|
|
|
|
|
|
|
std::vector<std::shared_ptr<SpeakerInterface>> speakers = {speaker, speaker2};
|
|
|
|
|
|
|
|
m_speakerManager =
|
|
|
|
SpeakerManager::create(speakers, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
|
|
|
|
EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
|
|
|
|
m_speakerManager->addSpeakerManagerObserver(m_observer);
|
|
|
|
|
|
|
|
std::future<bool> future =
|
2018-07-09 21:07:31 +00:00
|
|
|
m_speakerManager->adjustVolume(SpeakerInterface::Type::AVS_SPEAKER_VOLUME, AVS_ADJUST_VOLUME_MAX);
|
2017-10-30 22:14:38 +00:00
|
|
|
ASSERT_FALSE(future.get());
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Test setMute when the speaker interfaces are out of sync. The operation should fail.
|
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_F(SpeakerManagerTest, test_setMuteOutOfSync) {
|
2018-07-09 21:07:31 +00:00
|
|
|
auto speaker = std::make_shared<NiceMock<MockSpeakerInterface>>(SpeakerInterface::Type::AVS_SPEAKER_VOLUME);
|
2017-10-30 22:14:38 +00:00
|
|
|
speaker->DelegateToReal();
|
|
|
|
|
2018-07-09 21:07:31 +00:00
|
|
|
auto speaker2 = std::make_shared<NiceMock<MockSpeakerInterface>>(SpeakerInterface::Type::AVS_SPEAKER_VOLUME);
|
|
|
|
EXPECT_CALL(*speaker2, getSpeakerType()).WillRepeatedly(Return(SpeakerInterface::Type::AVS_SPEAKER_VOLUME));
|
2017-10-30 22:14:38 +00:00
|
|
|
EXPECT_CALL(*speaker2, setMute(_)).WillRepeatedly(Return(true));
|
|
|
|
// Set speaker to be out of sync.
|
|
|
|
EXPECT_CALL(*speaker2, getSpeakerSettings(_)).WillRepeatedly(Return(false));
|
|
|
|
|
|
|
|
std::vector<std::shared_ptr<SpeakerInterface>> speakers = {speaker, speaker2};
|
|
|
|
|
|
|
|
m_speakerManager =
|
|
|
|
SpeakerManager::create(speakers, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
|
|
|
|
EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
|
|
|
|
m_speakerManager->addSpeakerManagerObserver(m_observer);
|
|
|
|
|
2018-07-09 21:07:31 +00:00
|
|
|
std::future<bool> future = m_speakerManager->setMute(SpeakerInterface::Type::AVS_SPEAKER_VOLUME, MUTE);
|
2017-10-30 22:14:38 +00:00
|
|
|
ASSERT_FALSE(future.get());
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Test getSpeakerSettings when speakers are out of sync. The operation should fail.
|
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_F(SpeakerManagerTest, test_getSpeakerSettingsSpeakersOutOfSync) {
|
2018-07-09 21:07:31 +00:00
|
|
|
auto speaker = std::make_shared<NiceMock<MockSpeakerInterface>>(SpeakerInterface::Type::AVS_SPEAKER_VOLUME);
|
2017-10-30 22:14:38 +00:00
|
|
|
speaker->DelegateToReal();
|
|
|
|
|
2018-07-09 21:07:31 +00:00
|
|
|
auto speaker2 = std::make_shared<NiceMock<MockSpeakerInterface>>(SpeakerInterface::Type::AVS_SPEAKER_VOLUME);
|
|
|
|
EXPECT_CALL(*speaker2, getSpeakerType()).WillRepeatedly(Return(SpeakerInterface::Type::AVS_SPEAKER_VOLUME));
|
2017-10-30 22:14:38 +00:00
|
|
|
// Set speaker to be out of sync.
|
|
|
|
EXPECT_CALL(*speaker2, getSpeakerSettings(_)).WillRepeatedly(Return(false));
|
|
|
|
|
|
|
|
std::vector<std::shared_ptr<SpeakerInterface>> speakers = {speaker, speaker2};
|
|
|
|
|
|
|
|
m_speakerManager =
|
|
|
|
SpeakerManager::create(speakers, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
|
|
|
|
EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
|
|
|
|
m_speakerManager->addSpeakerManagerObserver(m_observer);
|
|
|
|
|
|
|
|
SpeakerInterface::SpeakerSettings settings;
|
2018-07-09 21:07:31 +00:00
|
|
|
std::future<bool> future =
|
|
|
|
m_speakerManager->getSpeakerSettings(SpeakerInterface::Type::AVS_SPEAKER_VOLUME, &settings);
|
2017-10-30 22:14:38 +00:00
|
|
|
ASSERT_FALSE(future.get());
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Test getConfiguration and ensure that all directives are handled.
|
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_F(SpeakerManagerTest, test_getConfiguration) {
|
2017-10-30 22:14:38 +00:00
|
|
|
std::shared_ptr<SpeakerInterface> speaker =
|
2018-07-09 21:07:31 +00:00
|
|
|
std::make_shared<NiceMock<MockSpeakerInterface>>(SpeakerInterface::Type::AVS_SPEAKER_VOLUME);
|
2017-10-30 22:14:38 +00:00
|
|
|
|
|
|
|
m_speakerManager =
|
|
|
|
SpeakerManager::create({speaker}, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
|
|
|
|
auto configuration = m_speakerManager->getConfiguration();
|
Version 1.11 alexa-client-sdk
Changes in this update:
**Enhancements**
* Added support for the new Alexa [DoNotDisturb](https://developer.amazon.com/docs/alexa-voice-service/donotdisturb.html) interface, which enables users to toggle the do not disturb (DND) function on their Alexa built-in products.
* The SDK now supports [Opus](https://opus-codec.org/license/) encoding, which is optional. To enable Opus, you must [set the CMake flag to `-DOPUS=ON`](https://github.com/alexa/avs-device-sdk/wiki/Build-Options#Opus-encoding), and include the [libopus library](https://github.com/alexa/avs-device-sdk/wiki/Dependencies#core-dependencies) dependency in your build.
* The MediaPlayer reference implementation has been expanded to support the SAMPLE-AES and AES-128 encryption methods for HLS streaming.
* AES-128 encryption is dependent on libcrypto, which is part of the required openSSL library, and is enabled by default.
* To enable [SAMPLE-AES](https://github.com/alexa/avs-device-sdk/wiki/Dependencies#core-dependencies/Enable-SAMPLE-AES-decryption) encryption, you must set the `-DSAMPLE_AES=ON` in your CMake command, and include the [FFMPEG](https://github.com/alexa/avs-device-sdk/wiki/Dependencies#core-dependencies/Enable-SAMPLE-AES-decryption) library dependency in your build.
* A new configuration for [deviceSettings](https://github.com/alexa/avs-device-sdk/blob/v1.11.0/Integration/AlexaClientSDKConfig.json#L59) has been added.This configuration allows you to specify the location of the device settings database.
* Added locale support for es-MX.
**Bug Fixes**
* Fixed an issue where music wouldn't resume playback in the Android app.
* Now all equalizer capabilities are fully disabled when equalizer is turned off in configuration file. Previously, devices were unconditionally required to provide support for equalizer in order to run the SDK.
* [Issue 1106](https://github.com/alexa/avs-device-sdk/issues/1106) - Fixed an issue in which the `CBLAuthDelegate` wasn't using the correct timeout during request refresh.
* [Issue 1128](https://github.com/alexa/avs-device-sdk/issues/1128) - Fixed an issue in which the `AudioPlayer` instance persisted at shutdown, due to a shared dependency with the `ProgressTimer`.
* Fixed in issue that occurred when a connection to streaming content was interrupted, the SDK did not attempt to resume the connection, and appeared to assume that the content had been fully downloaded. This triggered the next track to be played, assuming it was a playlist.
* [Issue 1040](https://github.com/alexa/avs-device-sdk/issues/1040) - Fixed an issue where alarms would continue to play after user barge-in.
**Known Issues**
* `PlaylistParser` and `IterativePlaylistParser` generate two HTTP requests (one to fetch the content type, and one to fetch the audio data) for each audio stream played.
* Music playback history isn't being displayed in the Alexa app for certain account and device types.
* On GCC 8+, issues related to `-Wclass-memaccess` will trigger warnings. However, this won't cause the build to fail, and these warnings can be ignored.
* In order to use Bluetooth source and sink PulseAudio, you must manually load and unload PulseAudio modules after the SDK starts.
* The `ACL` may encounter issues if audio attachments are received but not consumed.
* `SpeechSynthesizerState` currently uses `GAINING_FOCUS` and `LOSING_FOCUS` as a workaround for handling intermediate state. These states may be removed in a future release.
* The Alexa app doesn't always indicate when a device is successfully connected via Bluetooth.
* Connecting a product to streaming media via Bluetooth will sometimes stop media playback within the source application. Resuming playback through the source application or toggling next/previous will correct playback.
* When a source device is streaming silence via Bluetooth, the Alexa app indicates that audio content is streaming.
* The Bluetooth agent assumes that the Bluetooth adapter is always connected to a power source. Disconnecting from a power source during operation is not yet supported.
* On some products, interrupted Bluetooth playback may not resume if other content is locally streamed.
* `make integration` is currently not available for Android. In order to run integration tests on Android, you'll need to manually upload the test binary file along with any input file. At that point, the adb can be used to run the integration tests.
* On Raspberry Pi running Android Things with HDMI output audio, beginning of speech is truncated when Alexa responds to user TTS.
* When the sample app is restarted and network connection is lost, alerts don't play.
* When network connection is lost, lost connection status is not returned via local Text-to Speech (TTS).
2018-12-19 19:13:36 +00:00
|
|
|
auto audioNonBlockingPolicy = BlockingPolicy(BlockingPolicy::MEDIUM_AUDIO, false);
|
|
|
|
ASSERT_EQ(configuration[SET_VOLUME], audioNonBlockingPolicy);
|
|
|
|
ASSERT_EQ(configuration[ADJUST_VOLUME], audioNonBlockingPolicy);
|
|
|
|
ASSERT_EQ(configuration[SET_MUTE], audioNonBlockingPolicy);
|
2017-10-30 22:14:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Test that adding a null observer does not cause any errors in the SpeakerManager.
|
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_F(SpeakerManagerTest, test_addNullObserver) {
|
2018-07-09 21:07:31 +00:00
|
|
|
auto speaker = std::make_shared<NiceMock<MockSpeakerInterface>>(SpeakerInterface::Type::AVS_SPEAKER_VOLUME);
|
2017-10-30 22:14:38 +00:00
|
|
|
speaker->DelegateToReal();
|
|
|
|
|
|
|
|
m_speakerManager =
|
|
|
|
SpeakerManager::create({speaker}, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
m_speakerManager->addSpeakerManagerObserver(nullptr);
|
|
|
|
EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(3));
|
|
|
|
|
2018-07-09 21:07:31 +00:00
|
|
|
m_speakerManager->setVolume(SpeakerInterface::Type::AVS_SPEAKER_VOLUME, AVS_SET_VOLUME_MAX).wait();
|
|
|
|
m_speakerManager->adjustVolume(SpeakerInterface::Type::AVS_SPEAKER_VOLUME, AVS_ADJUST_VOLUME_MAX).wait();
|
|
|
|
m_speakerManager->setMute(SpeakerInterface::Type::AVS_SPEAKER_VOLUME, MUTE).wait();
|
2017-10-30 22:14:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Test that removing an observer works correctly.
|
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_F(SpeakerManagerTest, test_removeSpeakerManagerObserver) {
|
2018-07-09 21:07:31 +00:00
|
|
|
auto speaker = std::make_shared<NiceMock<MockSpeakerInterface>>(SpeakerInterface::Type::AVS_SPEAKER_VOLUME);
|
2017-10-30 22:14:38 +00:00
|
|
|
speaker->DelegateToReal();
|
|
|
|
|
|
|
|
EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
|
|
|
|
EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(3));
|
|
|
|
|
|
|
|
m_speakerManager =
|
|
|
|
SpeakerManager::create({speaker}, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
m_speakerManager->addSpeakerManagerObserver(m_observer);
|
|
|
|
m_speakerManager->removeSpeakerManagerObserver(m_observer);
|
|
|
|
|
2018-07-09 21:07:31 +00:00
|
|
|
m_speakerManager->setVolume(SpeakerInterface::Type::AVS_SPEAKER_VOLUME, AVS_SET_VOLUME_MAX).wait();
|
|
|
|
m_speakerManager->adjustVolume(SpeakerInterface::Type::AVS_SPEAKER_VOLUME, AVS_ADJUST_VOLUME_MAX).wait();
|
|
|
|
m_speakerManager->setMute(SpeakerInterface::Type::AVS_SPEAKER_VOLUME, MUTE).wait();
|
2017-10-30 22:14:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Test that removing a null observer does not cause any errors in the SpeakerManager.
|
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_F(SpeakerManagerTest, test_removeNullObserver) {
|
2018-07-09 21:07:31 +00:00
|
|
|
auto speaker = std::make_shared<NiceMock<MockSpeakerInterface>>(SpeakerInterface::Type::AVS_SPEAKER_VOLUME);
|
2017-10-30 22:14:38 +00:00
|
|
|
speaker->DelegateToReal();
|
|
|
|
|
|
|
|
EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(3));
|
|
|
|
|
|
|
|
m_speakerManager =
|
|
|
|
SpeakerManager::create({speaker}, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
m_speakerManager->removeSpeakerManagerObserver(nullptr);
|
|
|
|
|
2018-07-09 21:07:31 +00:00
|
|
|
m_speakerManager->setVolume(SpeakerInterface::Type::AVS_SPEAKER_VOLUME, AVS_SET_VOLUME_MAX).wait();
|
|
|
|
m_speakerManager->adjustVolume(SpeakerInterface::Type::AVS_SPEAKER_VOLUME, AVS_ADJUST_VOLUME_MAX).wait();
|
|
|
|
m_speakerManager->setMute(SpeakerInterface::Type::AVS_SPEAKER_VOLUME, MUTE).wait();
|
2017-10-30 22:14:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Create different combinations of @c Type for parameterized tests (TEST_P).
|
|
|
|
*/
|
|
|
|
INSTANTIATE_TEST_CASE_P(
|
|
|
|
Parameterized,
|
|
|
|
SpeakerManagerTest,
|
|
|
|
// clang-format off
|
|
|
|
::testing::Values(
|
|
|
|
std::vector<SpeakerInterface::Type>{
|
2018-07-09 21:07:31 +00:00
|
|
|
SpeakerInterface::Type::AVS_SPEAKER_VOLUME
|
2017-10-30 22:14:38 +00:00
|
|
|
},
|
|
|
|
std::vector<SpeakerInterface::Type>{
|
2018-07-09 21:07:31 +00:00
|
|
|
SpeakerInterface::Type::AVS_ALERTS_VOLUME
|
2017-10-30 22:14:38 +00:00
|
|
|
},
|
|
|
|
std::vector<SpeakerInterface::Type>{
|
2018-07-09 21:07:31 +00:00
|
|
|
SpeakerInterface::Type::AVS_SPEAKER_VOLUME,
|
|
|
|
SpeakerInterface::Type::AVS_SPEAKER_VOLUME
|
2017-10-30 22:14:38 +00:00
|
|
|
},
|
|
|
|
std::vector<SpeakerInterface::Type>{
|
2018-07-09 21:07:31 +00:00
|
|
|
SpeakerInterface::Type::AVS_ALERTS_VOLUME,
|
|
|
|
SpeakerInterface::Type::AVS_ALERTS_VOLUME,
|
2017-10-30 22:14:38 +00:00
|
|
|
},
|
|
|
|
std::vector<SpeakerInterface::Type>{
|
2018-07-09 21:07:31 +00:00
|
|
|
SpeakerInterface::Type::AVS_SPEAKER_VOLUME,
|
|
|
|
SpeakerInterface::Type::AVS_ALERTS_VOLUME,
|
|
|
|
SpeakerInterface::Type::AVS_SPEAKER_VOLUME,
|
|
|
|
SpeakerInterface::Type::AVS_ALERTS_VOLUME
|
2017-10-30 22:14:38 +00:00
|
|
|
}));
|
|
|
|
// clang-format off
|
2017-12-09 00:07:37 +00:00
|
|
|
|
2017-10-30 22:14:38 +00:00
|
|
|
/**
|
2018-07-09 21:07:31 +00:00
|
|
|
* Parameterized test for setVolume. One event should be sent if an AVS_SPEAKER_VOLUME typed speaker is modified.
|
2017-10-30 22:14:38 +00:00
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_P(SpeakerManagerTest, test_setVolume) {
|
2017-10-30 22:14:38 +00:00
|
|
|
std::vector<std::shared_ptr<SpeakerInterface>> speakers;
|
|
|
|
|
|
|
|
for (auto& typeOfSpeaker : GetParam()) {
|
|
|
|
auto speaker = std::make_shared<NiceMock<MockSpeakerInterface>>(typeOfSpeaker);
|
|
|
|
speaker->DelegateToReal();
|
|
|
|
EXPECT_CALL(*speaker, setVolume(AVS_SET_VOLUME_MAX)).Times(Exactly(1));
|
|
|
|
speakers.push_back(speaker);
|
|
|
|
}
|
|
|
|
|
|
|
|
m_speakerManager =
|
|
|
|
SpeakerManager::create(speakers, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
|
|
|
|
SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MAX, UNMUTE};
|
|
|
|
m_speakerManager->addSpeakerManagerObserver(m_observer);
|
|
|
|
|
2017-12-09 00:07:37 +00:00
|
|
|
for (auto type : getUniqueTypes(speakers)) {
|
2017-10-30 22:14:38 +00:00
|
|
|
EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::LOCAL_API, type, expectedSettings)).Times(Exactly(1));
|
2018-07-09 21:07:31 +00:00
|
|
|
if (SpeakerInterface::Type::AVS_SPEAKER_VOLUME == type) {
|
2017-12-09 00:07:37 +00:00
|
|
|
EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
|
|
|
|
EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(AnyNumber());
|
|
|
|
EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _)).Times(Exactly(1));
|
|
|
|
}
|
|
|
|
|
2017-10-30 22:14:38 +00:00
|
|
|
std::future<bool> future = m_speakerManager->setVolume(type, AVS_SET_VOLUME_MAX);
|
|
|
|
ASSERT_TRUE(future.get());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2018-07-09 21:07:31 +00:00
|
|
|
* Parameterized test for adjustVolume. One event should be sent if an AVS_SPEAKER_VOLUME typed speaker is modified.
|
2017-10-30 22:14:38 +00:00
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_P(SpeakerManagerTest, test_adjustVolume) {
|
2017-10-30 22:14:38 +00:00
|
|
|
std::vector<std::shared_ptr<SpeakerInterface>> speakers;
|
|
|
|
|
|
|
|
for (auto& typeOfSpeaker : GetParam()) {
|
|
|
|
auto speaker = std::make_shared<NiceMock<MockSpeakerInterface>>(typeOfSpeaker);
|
|
|
|
speaker->DelegateToReal();
|
|
|
|
EXPECT_CALL(*speaker, adjustVolume(AVS_ADJUST_VOLUME_MIN)).Times(Exactly(1));
|
|
|
|
speakers.push_back(speaker);
|
|
|
|
}
|
|
|
|
|
|
|
|
m_speakerManager =
|
|
|
|
SpeakerManager::create(speakers, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
|
|
|
|
// The test adjusts the volume by AVS_ADJUST_VOLUME_MIN, which results in the lowest volume possible.
|
|
|
|
SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MIN, UNMUTE};
|
|
|
|
m_speakerManager->addSpeakerManagerObserver(m_observer);
|
|
|
|
|
2017-12-09 00:07:37 +00:00
|
|
|
for (auto type : getUniqueTypes(speakers)) {
|
2017-10-30 22:14:38 +00:00
|
|
|
EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::LOCAL_API, type, expectedSettings)).Times(Exactly(1));
|
2018-07-09 21:07:31 +00:00
|
|
|
if (SpeakerInterface::Type::AVS_SPEAKER_VOLUME == type) {
|
2017-12-09 00:07:37 +00:00
|
|
|
EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
|
|
|
|
EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(AnyNumber());
|
|
|
|
EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _)).Times(Exactly(1));
|
|
|
|
}
|
|
|
|
|
2017-10-30 22:14:38 +00:00
|
|
|
std::future<bool> future = m_speakerManager->adjustVolume(type, AVS_ADJUST_VOLUME_MIN);
|
|
|
|
ASSERT_TRUE(future.get());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2018-07-09 21:07:31 +00:00
|
|
|
* Parameterized test for setMute. One event should be sent if an AVS_SPEAKER_VOLUME typed speaker is modified.
|
2017-10-30 22:14:38 +00:00
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_P(SpeakerManagerTest, test_setMute) {
|
2017-10-30 22:14:38 +00:00
|
|
|
std::vector<std::shared_ptr<SpeakerInterface>> speakers;
|
|
|
|
|
|
|
|
for (auto& typeOfSpeaker : GetParam()) {
|
|
|
|
auto speaker = std::make_shared<NiceMock<MockSpeakerInterface>>(typeOfSpeaker);
|
|
|
|
speaker->DelegateToReal();
|
|
|
|
EXPECT_CALL(*speaker, setMute(MUTE)).Times(Exactly(1));
|
|
|
|
speakers.push_back(speaker);
|
|
|
|
}
|
|
|
|
|
|
|
|
m_speakerManager =
|
|
|
|
SpeakerManager::create(speakers, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
|
|
|
|
SpeakerInterface::SpeakerSettings expectedSettings{DEFAULT_SETTINGS.volume, MUTE};
|
|
|
|
m_speakerManager->addSpeakerManagerObserver(m_observer);
|
|
|
|
|
2017-12-09 00:07:37 +00:00
|
|
|
for (auto type : getUniqueTypes(speakers)) {
|
2017-10-30 22:14:38 +00:00
|
|
|
EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::LOCAL_API, type, expectedSettings)).Times(Exactly(1));
|
2018-07-09 21:07:31 +00:00
|
|
|
if (SpeakerInterface::Type::AVS_SPEAKER_VOLUME == type) {
|
2017-12-09 00:07:37 +00:00
|
|
|
EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(1));
|
|
|
|
EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(AnyNumber());
|
|
|
|
EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _)).Times(Exactly(1));
|
|
|
|
}
|
|
|
|
|
2017-10-30 22:14:38 +00:00
|
|
|
std::future<bool> future = m_speakerManager->setMute(type, MUTE);
|
|
|
|
ASSERT_TRUE(future.get());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Parameterized test for getSpeakerSettings. Operation should succeed with default speaker settings.
|
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_P(SpeakerManagerTest, test_getSpeakerSettings) {
|
2017-10-30 22:14:38 +00:00
|
|
|
std::vector<std::shared_ptr<SpeakerInterface>> speakers;
|
|
|
|
|
|
|
|
for (auto& typeOfSpeaker : GetParam()) {
|
|
|
|
auto speaker = std::make_shared<NiceMock<MockSpeakerInterface>>(typeOfSpeaker);
|
|
|
|
speaker->DelegateToReal();
|
2017-12-09 00:07:37 +00:00
|
|
|
// There are other calls to getSpeakerSettings(), such as when we initially provide the Context.
|
|
|
|
EXPECT_CALL(*speaker, getSpeakerSettings(_)).Times(AtLeast(1));
|
2017-10-30 22:14:38 +00:00
|
|
|
speakers.push_back(speaker);
|
|
|
|
}
|
|
|
|
|
|
|
|
auto uniqueTypes = getUniqueTypes(speakers);
|
|
|
|
|
|
|
|
m_speakerManager =
|
|
|
|
SpeakerManager::create(speakers, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
|
|
|
|
EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
|
|
|
|
m_speakerManager->addSpeakerManagerObserver(m_observer);
|
|
|
|
|
|
|
|
for (auto type : uniqueTypes) {
|
|
|
|
SpeakerInterface::SpeakerSettings settings;
|
|
|
|
std::future<bool> future = m_speakerManager->getSpeakerSettings(type, &settings);
|
|
|
|
ASSERT_TRUE(future.get());
|
|
|
|
ASSERT_EQ(settings.volume, DEFAULT_SETTINGS.volume);
|
|
|
|
ASSERT_EQ(settings.mute, DEFAULT_SETTINGS.mute);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Tests SetVolume Directive. Expect that the volume is unmuted and set, as well at most one
|
2018-07-09 21:07:31 +00:00
|
|
|
* event is sent. In the event there are no AVS_SPEAKER_VOLUME speakers registered, no event will be sent.
|
|
|
|
* In addition, only AVS_SPEAKER_VOLUME speakers should be affected.
|
2017-10-30 22:14:38 +00:00
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_P(SpeakerManagerTest, test_setVolumeDirective) {
|
2017-10-30 22:14:38 +00:00
|
|
|
std::vector<std::shared_ptr<SpeakerInterface>> speakers;
|
|
|
|
int eventsSent = 0;
|
2017-12-09 00:07:37 +00:00
|
|
|
SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MAX, UNMUTE};
|
2017-10-30 22:14:38 +00:00
|
|
|
|
|
|
|
// Create Speaker objects.
|
|
|
|
for (auto& typeOfSpeaker : GetParam()) {
|
|
|
|
auto speaker = std::make_shared<NiceMock<MockSpeakerInterface>>(typeOfSpeaker);
|
|
|
|
speaker->DelegateToReal();
|
|
|
|
int timesCalled = 0;
|
2018-07-09 21:07:31 +00:00
|
|
|
if (typeOfSpeaker == SpeakerInterface::Type::AVS_SPEAKER_VOLUME) {
|
2017-10-30 22:14:38 +00:00
|
|
|
timesCalled = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPECT_CALL(*speaker, setMute(UNMUTE)).Times(Exactly(timesCalled));
|
|
|
|
EXPECT_CALL(*speaker, setVolume(AVS_SET_VOLUME_MAX)).Times(Exactly(timesCalled));
|
|
|
|
|
|
|
|
speakers.push_back(speaker);
|
|
|
|
}
|
|
|
|
|
|
|
|
auto uniqueTypes = getUniqueTypes(speakers);
|
|
|
|
|
|
|
|
// Creation expectations based on type.
|
2018-07-09 21:07:31 +00:00
|
|
|
if (uniqueTypes.count(SpeakerInterface::Type::AVS_SPEAKER_VOLUME)) {
|
2017-10-30 22:14:38 +00:00
|
|
|
eventsSent = 1;
|
|
|
|
|
2018-07-09 21:07:31 +00:00
|
|
|
EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::DIRECTIVE, SpeakerInterface::Type::AVS_SPEAKER_VOLUME, expectedSettings)).Times(Exactly(1));
|
2017-12-09 00:07:37 +00:00
|
|
|
EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(AnyNumber());
|
|
|
|
EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _)).Times(Exactly(1));
|
2017-10-30 22:14:38 +00:00
|
|
|
} else {
|
|
|
|
EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
|
2017-12-09 00:07:37 +00:00
|
|
|
EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(Exactly(0));
|
2017-10-30 22:14:38 +00:00
|
|
|
}
|
|
|
|
EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(eventsSent));
|
|
|
|
EXPECT_CALL(*(m_mockDirectiveHandlerResult.get()), setCompleted())
|
|
|
|
.Times(1)
|
|
|
|
.WillOnce(InvokeWithoutArgs(this, &SpeakerManagerTest::wakeOnSetCompleted));
|
|
|
|
|
|
|
|
m_speakerManager =
|
|
|
|
SpeakerManager::create(speakers, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
m_speakerManager->addSpeakerManagerObserver(m_observer);
|
|
|
|
|
|
|
|
// Create Directive.
|
|
|
|
auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
|
|
|
|
auto avsMessageHeader = std::make_shared<AVSMessageHeader>(SET_VOLUME.nameSpace, SET_VOLUME.name, MESSAGE_ID);
|
|
|
|
std::shared_ptr<AVSDirective> directive =
|
|
|
|
AVSDirective::create("", avsMessageHeader, VOLUME_PAYLOAD, attachmentManager, "");
|
|
|
|
|
|
|
|
m_speakerManager->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
|
|
|
|
m_speakerManager->CapabilityAgent::handleDirective(MESSAGE_ID);
|
|
|
|
m_wakeSetCompletedFuture.wait_for(TIMEOUT);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Tests AdjustVolume Directive. Expect that the volume is unmuted and adjusted, as well at most one
|
2018-07-09 21:07:31 +00:00
|
|
|
* event is sent. In the event there are no AVS_SPEAKER_VOLUME speakers registered, no event will be sent.
|
|
|
|
* In addition, only AVS_SPEAKER_VOLUME speakers should be affected.
|
2017-10-30 22:14:38 +00:00
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_P(SpeakerManagerTest, test_adjustVolumeDirective) {
|
2017-10-30 22:14:38 +00:00
|
|
|
std::vector<std::shared_ptr<SpeakerInterface>> speakers;
|
|
|
|
int eventsSent = 0;
|
2017-12-09 00:07:37 +00:00
|
|
|
SpeakerInterface::SpeakerSettings expectedSettings{AVS_SET_VOLUME_MAX, UNMUTE};
|
2017-10-30 22:14:38 +00:00
|
|
|
|
|
|
|
// Create Speaker objects.
|
|
|
|
for (auto& typeOfSpeaker : GetParam()) {
|
|
|
|
auto speaker = std::make_shared<NiceMock<MockSpeakerInterface>>(typeOfSpeaker);
|
|
|
|
speaker->DelegateToReal();
|
|
|
|
int timesCalled = 0;
|
2018-07-09 21:07:31 +00:00
|
|
|
if (typeOfSpeaker == SpeakerInterface::Type::AVS_SPEAKER_VOLUME) {
|
2017-10-30 22:14:38 +00:00
|
|
|
timesCalled = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPECT_CALL(*speaker, setMute(UNMUTE)).Times(Exactly(timesCalled));
|
|
|
|
EXPECT_CALL(*speaker, adjustVolume(AVS_ADJUST_VOLUME_MAX)).Times(Exactly(timesCalled));
|
|
|
|
|
|
|
|
speakers.push_back(speaker);
|
|
|
|
}
|
|
|
|
|
|
|
|
auto uniqueTypes = getUniqueTypes(speakers);
|
|
|
|
|
|
|
|
// Creation expectations based on type.
|
2018-07-09 21:07:31 +00:00
|
|
|
if (uniqueTypes.count(SpeakerInterface::Type::AVS_SPEAKER_VOLUME)) {
|
2017-10-30 22:14:38 +00:00
|
|
|
eventsSent = 1;
|
|
|
|
|
2018-07-09 21:07:31 +00:00
|
|
|
EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::DIRECTIVE, SpeakerInterface::Type::AVS_SPEAKER_VOLUME, expectedSettings)).Times(Exactly(1));
|
2017-12-09 00:07:37 +00:00
|
|
|
EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(AnyNumber());
|
|
|
|
EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _)).Times(Exactly(1));
|
2017-10-30 22:14:38 +00:00
|
|
|
} else {
|
|
|
|
EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
|
2017-12-09 00:07:37 +00:00
|
|
|
EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(Exactly(0));
|
2017-10-30 22:14:38 +00:00
|
|
|
}
|
|
|
|
EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(eventsSent));
|
|
|
|
EXPECT_CALL(*(m_mockDirectiveHandlerResult.get()), setCompleted())
|
|
|
|
.Times(1)
|
|
|
|
.WillOnce(InvokeWithoutArgs(this, &SpeakerManagerTest::wakeOnSetCompleted));
|
|
|
|
|
|
|
|
m_speakerManager =
|
|
|
|
SpeakerManager::create(speakers, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
m_speakerManager->addSpeakerManagerObserver(m_observer);
|
|
|
|
|
|
|
|
// Create Directive.
|
|
|
|
auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
|
|
|
|
auto avsMessageHeader = std::make_shared<AVSMessageHeader>(ADJUST_VOLUME.nameSpace, ADJUST_VOLUME.name, MESSAGE_ID);
|
|
|
|
std::shared_ptr<AVSDirective> directive =
|
|
|
|
AVSDirective::create("", avsMessageHeader, VOLUME_PAYLOAD, attachmentManager, "");
|
|
|
|
|
|
|
|
m_speakerManager->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
|
|
|
|
m_speakerManager->CapabilityAgent::handleDirective(MESSAGE_ID);
|
|
|
|
m_wakeSetCompletedFuture.wait_for(TIMEOUT);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Tests SetMute Directive. Expect that the volume is muted, as well at most one
|
2018-07-09 21:07:31 +00:00
|
|
|
* event is sent. In the event there are no AVS_SPEAKER_VOLUME speakers registered, no event will be sent.
|
|
|
|
* In addition, only AVS_SPEAKER_VOLUME speakers should be affected.
|
2017-10-30 22:14:38 +00:00
|
|
|
*/
|
2019-05-22 23:06:18 +00:00
|
|
|
TEST_P(SpeakerManagerTest, test_setMuteDirective) {
|
2017-10-30 22:14:38 +00:00
|
|
|
std::vector<std::shared_ptr<SpeakerInterface>> speakers;
|
|
|
|
int eventsSent = 0;
|
2017-12-09 00:07:37 +00:00
|
|
|
SpeakerInterface::SpeakerSettings expectedSettings{DEFAULT_SETTINGS.volume, MUTE};
|
2017-10-30 22:14:38 +00:00
|
|
|
|
|
|
|
// Create Speaker objects.
|
|
|
|
for (auto& typeOfSpeaker : GetParam()) {
|
|
|
|
auto speaker = std::make_shared<NiceMock<MockSpeakerInterface>>(typeOfSpeaker);
|
|
|
|
speaker->DelegateToReal();
|
|
|
|
int timesCalled = 0;
|
2018-07-09 21:07:31 +00:00
|
|
|
if (typeOfSpeaker == SpeakerInterface::Type::AVS_SPEAKER_VOLUME) {
|
2017-10-30 22:14:38 +00:00
|
|
|
timesCalled = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPECT_CALL(*speaker, setMute(MUTE)).Times(Exactly(timesCalled));
|
|
|
|
|
|
|
|
speakers.push_back(speaker);
|
|
|
|
}
|
|
|
|
|
|
|
|
auto uniqueTypes = getUniqueTypes(speakers);
|
|
|
|
|
|
|
|
// Creation expectations based on type.
|
2018-07-09 21:07:31 +00:00
|
|
|
if (uniqueTypes.count(SpeakerInterface::Type::AVS_SPEAKER_VOLUME)) {
|
2017-10-30 22:14:38 +00:00
|
|
|
eventsSent = 1;
|
|
|
|
|
2018-07-09 21:07:31 +00:00
|
|
|
EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::DIRECTIVE, SpeakerInterface::Type::AVS_SPEAKER_VOLUME, expectedSettings)).Times(Exactly(1));
|
2017-12-09 00:07:37 +00:00
|
|
|
EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(AnyNumber());
|
|
|
|
EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, generateVolumeStateJson(expectedSettings), StateRefreshPolicy::NEVER, _)).Times(Exactly(1));
|
2017-10-30 22:14:38 +00:00
|
|
|
} else {
|
|
|
|
EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(Exactly(0));
|
2017-12-09 00:07:37 +00:00
|
|
|
EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(Exactly(0));
|
2017-10-30 22:14:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(Exactly(eventsSent));
|
|
|
|
EXPECT_CALL(*(m_mockDirectiveHandlerResult.get()), setCompleted())
|
|
|
|
.Times(1)
|
|
|
|
.WillOnce(InvokeWithoutArgs(this, &SpeakerManagerTest::wakeOnSetCompleted));
|
|
|
|
|
|
|
|
m_speakerManager =
|
|
|
|
SpeakerManager::create(speakers, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
m_speakerManager->addSpeakerManagerObserver(m_observer);
|
|
|
|
|
|
|
|
// Create Directive.
|
|
|
|
auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
|
|
|
|
auto avsMessageHeader = std::make_shared<AVSMessageHeader>(SET_MUTE.nameSpace, SET_MUTE.name, MESSAGE_ID);
|
|
|
|
std::shared_ptr<AVSDirective> directive =
|
|
|
|
AVSDirective::create("", avsMessageHeader, MUTE_PAYLOAD, attachmentManager, "");
|
|
|
|
|
|
|
|
m_speakerManager->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
|
|
|
|
m_speakerManager->CapabilityAgent::handleDirective(MESSAGE_ID);
|
|
|
|
m_wakeSetCompletedFuture.wait_for(TIMEOUT);
|
|
|
|
}
|
|
|
|
|
2019-05-22 23:06:18 +00:00
|
|
|
/**
|
|
|
|
* Test setVolume when unmute Directive sent. Setup test by setting volume to 0 and mute to true.
|
|
|
|
* Expect that the volume is unmuted and set to MIN_UNMUTE_VOLUME, as well at most one
|
|
|
|
* event is sent. In the event there are no AVS_SPEAKER_VOLUME speakers registered, no event will be sent.
|
|
|
|
* In addition, only AVS_SPEAKER_VOLUME speakers should be affected.
|
|
|
|
*/
|
|
|
|
TEST_P(SpeakerManagerTest, test_setVolumeDirectiveWhenMuted) {
|
|
|
|
std::vector<std::shared_ptr<SpeakerInterface>> speakers;
|
|
|
|
|
|
|
|
for (auto& typeOfSpeaker : GetParam()) {
|
|
|
|
auto speaker = std::make_shared<NiceMock<MockSpeakerInterface>>(typeOfSpeaker);
|
|
|
|
speaker->DelegateToReal();
|
|
|
|
EXPECT_CALL(*speaker, setVolume(AVS_SET_VOLUME_MIN)).Times(1);
|
|
|
|
EXPECT_CALL(*speaker, setMute(MUTE)).Times(1);
|
|
|
|
|
|
|
|
if (typeOfSpeaker == SpeakerInterface::Type::AVS_SPEAKER_VOLUME) {
|
|
|
|
EXPECT_CALL(*speaker, setMute(UNMUTE)).Times(1);
|
|
|
|
EXPECT_CALL(*speaker, setVolume(MIN_UNMUTE_VOLUME)).Times(1);
|
|
|
|
}
|
|
|
|
speakers.push_back(speaker);
|
|
|
|
}
|
|
|
|
|
|
|
|
m_speakerManager = SpeakerManager::create(speakers, m_mockContextManager, m_mockMessageSender, m_mockExceptionSender);
|
|
|
|
m_speakerManager->addSpeakerManagerObserver(m_observer);
|
|
|
|
|
|
|
|
for (auto type : getUniqueTypes(speakers)) {
|
|
|
|
m_speakerManager->setVolume(type, AVS_SET_VOLUME_MIN, true);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (auto type : getUniqueTypes(speakers)) {
|
|
|
|
std::future<bool> future = m_speakerManager->setMute(type, MUTE, true);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check to see if AVS_SPEAKER_VOLUME speakers exist and set EXPECT_CALL accordingly
|
|
|
|
auto uniqueTypes = getUniqueTypes(speakers);
|
|
|
|
int eventsSent = 0;
|
|
|
|
SpeakerInterface::SpeakerSettings unMuteSettings{MIN_UNMUTE_VOLUME, UNMUTE};
|
|
|
|
|
|
|
|
if (uniqueTypes.count(SpeakerInterface::Type::AVS_SPEAKER_VOLUME)) {
|
|
|
|
eventsSent = 1;
|
|
|
|
|
|
|
|
EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(SpeakerManagerObserverInterface::Source::DIRECTIVE, SpeakerInterface::Type::AVS_SPEAKER_VOLUME, unMuteSettings)).Times(Exactly(1));
|
|
|
|
EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(AnyNumber());
|
|
|
|
EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, generateVolumeStateJson(unMuteSettings), StateRefreshPolicy::NEVER, _)).Times(Exactly(1));
|
|
|
|
} else {
|
|
|
|
EXPECT_CALL(*m_observer, onSpeakerSettingsChanged(_, _, _)).Times(0);
|
|
|
|
EXPECT_CALL(*m_mockContextManager, setState(VOLUME_STATE, _, StateRefreshPolicy::NEVER, _)).Times(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPECT_CALL(*m_mockMessageSender, sendMessage(_)).Times(eventsSent);
|
|
|
|
EXPECT_CALL(*(m_mockDirectiveHandlerResult.get()), setCompleted())
|
|
|
|
.Times(1)
|
|
|
|
.WillOnce(InvokeWithoutArgs(this, &SpeakerManagerTest::wakeOnSetCompleted));
|
|
|
|
|
|
|
|
// Create Directive to unmute the device.
|
|
|
|
auto attachmentManager = std::make_shared<StrictMock<MockAttachmentManager>>();
|
|
|
|
auto avsMessageHeader = std::make_shared<AVSMessageHeader>(SET_MUTE.nameSpace, SET_MUTE.name, MESSAGE_ID);
|
|
|
|
std::shared_ptr<AVSDirective> directive =
|
|
|
|
AVSDirective::create("", avsMessageHeader, UNMUTE_PAYLOAD, attachmentManager, "");
|
|
|
|
|
|
|
|
m_speakerManager->CapabilityAgent::preHandleDirective(directive, std::move(m_mockDirectiveHandlerResult));
|
|
|
|
m_speakerManager->CapabilityAgent::handleDirective(MESSAGE_ID);
|
|
|
|
m_wakeSetCompletedFuture.wait_for(TIMEOUT);
|
|
|
|
}
|
|
|
|
|
2017-10-30 22:14:38 +00:00
|
|
|
} // namespace test
|
|
|
|
} // namespace speakerManager
|
|
|
|
} // namespace capabilityAgents
|
2019-05-22 23:06:18 +00:00
|
|
|
} // namespace alexaClientSDK
|