2017-08-08 00:04:43 +00:00
|
|
|
/*
|
2018-02-12 23:31:53 +00:00
|
|
|
* Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
2017-08-08 00:04:43 +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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/// @file UserInactivityMonitorTest.cpp
|
|
|
|
|
|
|
|
#include <gtest/gtest.h>
|
|
|
|
#include <rapidjson/document.h>
|
|
|
|
#include <rapidjson/stringbuffer.h>
|
|
|
|
#include <rapidjson/writer.h>
|
|
|
|
|
|
|
|
#include <AVSCommon/AVS/MessageRequest.h>
|
|
|
|
#include <AVSCommon/AVS/Attachment/MockAttachmentManager.h>
|
|
|
|
#include <AVSCommon/SDKInterfaces/MockMessageSender.h>
|
|
|
|
#include <AVSCommon/SDKInterfaces/MockExceptionEncounteredSender.h>
|
Version 1.7.0 of the avs-device-sdk
Changes in this update:
**Enhancements**
* `AuthDelegate` and `AuthServer.py` have been replaced by `CBLAUthDelegate`, which provides a more straightforward path to authorization.
* Added a new configuration property called [`cblAuthDelegate`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L2). This object specifies parameters for `CBLAuthDelegate`.
* Added a new configuration property called [`miscDatabase`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L34), which is a generic key/value database to be used by various components.
* Added a new configuration property called [`dcfDelegate`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L17) This object specifies parameters for `DCFDelegate`. Within this object, values were added for the 'endpoint' and `overridenDcfPublishMessageBody`. 'endpoint' is the endpoint to connect to in order to send device capabilities. `overridenDcfPublishMessageBody`is the message that will get sent out to the Capabilities API. Note: values within the `dcfDelegate` object will only work in `DEBUG` builds.
* Added a new configuration property called [`deviceInfo`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L9) which specifies device-identifying information for use by the Device Capability Framework (DCF), and for authorization (CBLAuthDelegate).
* Updated the Directive Sequencer to support wildcard directive handlers. This allows a handler for a given AVS interface to register at the namespace level, rather than specifying the names of all directives within that namespace.
* Updated the Raspberry Pi installation script to include `alsasink` in the configuration file.
* Added `audioSink` as a configuration option. This allows users to override the audio sink element used in `Gstreamer`.
* Added an interface for monitoring internet connection status: `InternetConnectionMonitorInterface.h`.
* The Alexa Communications Library (ACL) is no longer required to wait until authorization has succeeded before attempting to connect to AVS. Instead, `HTTP2Transport` handles waiting for authorization to complete.
* Added the Device Capabilities Framework (DCF) delegate. Device capabilities can now be sent for each capability interface using DCF publish messages.
* The sample app has been updated to send DCF publish messages, which will automatically occur when the sample app starts. Note: a DCF publish message must be successfully sent in order for communication with AVS to occur.
* The SDK now supports HTTP PUT messages.
* Added support for opt-arg style arguments and multiple configuration files. Now, the sample app can be invoked by either of these commands: `SampleApp <configfile> <debuglevel>` OR `SampleApp -C file1 -C file2 ... -L loglevel`.
**Bug Fixes**
* Issues [447](https://github.com/alexa/avs-device-sdk/issues/447) and [553](https://github.com/alexa/avs-device-sdk/issues/553) Fixed the `AttachmentRenderSource`'s handling of `BLOCKING` `AttachmentReaders`.
* Updated the `Logger` implementation to be more resilient to `nullptr` string inputs.
* Fixed a `TimeUtils` utility-related compile issue.
* Fixed a bug in which alerts failed to activate if the system was restarted without network connection.
* Fixed Android 64-bit build failure issue.
**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.
* Some ERROR messages may be printed during start-up event if initialization proceeds normally and successfully.
* If an unrecoverable authorization error or an unrecoverable DCF error is encountered, the sample app may crash on shutdown.
* If a non-CBL `clientId` is included in the `deviceInfo` section of `AlexaClientSDKConfig.json`, the error will be reported as an unrecoverable authorization error, rather than a more specific error.
2018-04-18 22:17:28 +00:00
|
|
|
#include <AVSCommon/SDKInterfaces/MockUserInactivityMonitorObserver.h>
|
2017-08-08 00:04:43 +00:00
|
|
|
#include <AVSCommon/Utils/JSON/JSONUtils.h>
|
|
|
|
#include <ADSL/DirectiveSequencer.h>
|
|
|
|
|
|
|
|
#include "System/UserInactivityMonitor.h"
|
|
|
|
|
|
|
|
using namespace testing;
|
|
|
|
|
|
|
|
namespace alexaClientSDK {
|
|
|
|
namespace capabilityAgents {
|
|
|
|
namespace system {
|
|
|
|
namespace test {
|
|
|
|
|
|
|
|
using namespace avsCommon::sdkInterfaces::test;
|
|
|
|
using namespace avsCommon::sdkInterfaces;
|
|
|
|
using namespace avsCommon::avs;
|
|
|
|
using namespace avsCommon::utils::json;
|
|
|
|
using namespace rapidjson;
|
|
|
|
using ::testing::InSequence;
|
|
|
|
|
|
|
|
/// This is a string for the namespace we are testing for.
|
|
|
|
static const std::string USER_INACTIVITY_RESET_NAMESPACE = "System";
|
|
|
|
|
|
|
|
/// This is a string for the correct name the endpointing directive uses.
|
|
|
|
static const std::string USER_INACTIVITY_RESET_NAME = "ResetUserInactivity";
|
|
|
|
|
|
|
|
/// This is the string for the message ID used in the directive.
|
|
|
|
static const std::string USER_INACTIVITY_MESSAGE_ID = "ABC123DEF";
|
|
|
|
static const std::string USER_INACTIVITY_PAYLOAD_KEY = "inactiveTimeInSeconds";
|
|
|
|
static const std::chrono::milliseconds USER_INACTIVITY_REPORT_PERIOD{20};
|
|
|
|
|
|
|
|
/// This is the condition variable to be used to control the exit of the test case.
|
|
|
|
std::condition_variable exitTrigger;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Check if message request has errors.
|
|
|
|
*
|
|
|
|
* @param messageRequest The message requests to be checked.
|
|
|
|
* @return @c true if parsing the JSON has error, otherwise @c false.
|
|
|
|
*/
|
|
|
|
static bool checkMessageRequest(std::shared_ptr<MessageRequest> messageRequest) {
|
|
|
|
rapidjson::Document jsonContent(rapidjson::kObjectType);
|
|
|
|
if (jsonContent.Parse(messageRequest->getJsonContent()).HasParseError()) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
rapidjson::Value::ConstMemberIterator eventNode;
|
|
|
|
if (!jsonUtils::findNode(jsonContent, "event", &eventNode)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
rapidjson::Value::ConstMemberIterator payloadNode;
|
|
|
|
if (!jsonUtils::findNode(eventNode->value, "payload", &payloadNode)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
rapidjson::Value::ConstMemberIterator inactivityNode;
|
|
|
|
if (!jsonUtils::findNode(payloadNode->value, USER_INACTIVITY_PAYLOAD_KEY, &inactivityNode)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
// The payload should be a long integer.
|
|
|
|
return inactivityNode->value.IsUint64();
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Check if message request has errors.
|
|
|
|
*
|
|
|
|
* @param messageRequest The message requests to be checked.
|
|
|
|
* @return @c true if parsing the JSON has error, otherwise @c false.
|
|
|
|
*/
|
|
|
|
static bool checkMessageRequestAndReleaseTrigger(std::shared_ptr<MessageRequest> messageRequest) {
|
|
|
|
auto returnValue = checkMessageRequest(messageRequest);
|
|
|
|
exitTrigger.notify_all();
|
|
|
|
return returnValue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Test harness for @c UserInactivityMonitor class.
|
|
|
|
class UserInactivityMonitorTest : public ::testing::Test {
|
|
|
|
public:
|
|
|
|
/// Set up the test harness for running a test.
|
|
|
|
void SetUp() override;
|
|
|
|
|
|
|
|
protected:
|
|
|
|
/// Mocked Message Sender. Note that we make it a strict mock to ensure we test the flow completely.
|
|
|
|
std::shared_ptr<StrictMock<MockMessageSender>> m_mockMessageSender;
|
|
|
|
/// Mocked Exception Encountered Sender. Note that we make it a strict mock to ensure we test the flow completely.
|
|
|
|
std::shared_ptr<StrictMock<MockExceptionEncounteredSender>> m_mockExceptionEncounteredSender;
|
|
|
|
};
|
|
|
|
|
|
|
|
void UserInactivityMonitorTest::SetUp() {
|
|
|
|
m_mockMessageSender = std::make_shared<StrictMock<MockMessageSender>>();
|
|
|
|
m_mockExceptionEncounteredSender = std::make_shared<StrictMock<MockExceptionEncounteredSender>>();
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This case tests if @c UserInactivityMonitor basic create function works properly
|
|
|
|
*/
|
|
|
|
TEST_F(UserInactivityMonitorTest, createSuccessfully) {
|
|
|
|
std::mutex exitMutex;
|
|
|
|
std::unique_lock<std::mutex> exitLock(exitMutex);
|
|
|
|
EXPECT_CALL(*m_mockMessageSender, sendMessage(ResultOf(&checkMessageRequestAndReleaseTrigger, Eq(true))));
|
|
|
|
|
|
|
|
auto userInactivityMonitor = UserInactivityMonitor::create(
|
2017-10-02 22:59:05 +00:00
|
|
|
m_mockMessageSender, m_mockExceptionEncounteredSender, USER_INACTIVITY_REPORT_PERIOD);
|
2017-08-08 00:04:43 +00:00
|
|
|
ASSERT_NE(nullptr, userInactivityMonitor);
|
|
|
|
|
2017-10-02 22:59:05 +00:00
|
|
|
exitTrigger.wait_for(exitLock, USER_INACTIVITY_REPORT_PERIOD + USER_INACTIVITY_REPORT_PERIOD / 2);
|
2017-08-08 00:04:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This case tests if possible @c nullptr parameters passed to @c UserInactivityMonitor::create are handled properly.
|
|
|
|
*/
|
|
|
|
TEST_F(UserInactivityMonitorTest, createWithError) {
|
|
|
|
ASSERT_EQ(nullptr, UserInactivityMonitor::create(m_mockMessageSender, nullptr));
|
|
|
|
ASSERT_EQ(nullptr, UserInactivityMonitor::create(nullptr, m_mockExceptionEncounteredSender));
|
|
|
|
ASSERT_EQ(nullptr, UserInactivityMonitor::create(nullptr, nullptr));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This case tests if a directive is handled properly.
|
|
|
|
*/
|
|
|
|
TEST_F(UserInactivityMonitorTest, handleDirectiveProperly) {
|
|
|
|
std::mutex exitMutex;
|
|
|
|
std::unique_lock<std::mutex> exitLock(exitMutex);
|
|
|
|
EXPECT_CALL(*m_mockMessageSender, sendMessage(ResultOf(&checkMessageRequestAndReleaseTrigger, Eq(true))));
|
|
|
|
|
|
|
|
auto userInactivityMonitor = UserInactivityMonitor::create(
|
2017-10-02 22:59:05 +00:00
|
|
|
m_mockMessageSender, m_mockExceptionEncounteredSender, USER_INACTIVITY_REPORT_PERIOD);
|
2017-08-08 00:04:43 +00:00
|
|
|
ASSERT_NE(nullptr, userInactivityMonitor);
|
|
|
|
|
Version 1.7.0 of the avs-device-sdk
Changes in this update:
**Enhancements**
* `AuthDelegate` and `AuthServer.py` have been replaced by `CBLAUthDelegate`, which provides a more straightforward path to authorization.
* Added a new configuration property called [`cblAuthDelegate`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L2). This object specifies parameters for `CBLAuthDelegate`.
* Added a new configuration property called [`miscDatabase`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L34), which is a generic key/value database to be used by various components.
* Added a new configuration property called [`dcfDelegate`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L17) This object specifies parameters for `DCFDelegate`. Within this object, values were added for the 'endpoint' and `overridenDcfPublishMessageBody`. 'endpoint' is the endpoint to connect to in order to send device capabilities. `overridenDcfPublishMessageBody`is the message that will get sent out to the Capabilities API. Note: values within the `dcfDelegate` object will only work in `DEBUG` builds.
* Added a new configuration property called [`deviceInfo`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L9) which specifies device-identifying information for use by the Device Capability Framework (DCF), and for authorization (CBLAuthDelegate).
* Updated the Directive Sequencer to support wildcard directive handlers. This allows a handler for a given AVS interface to register at the namespace level, rather than specifying the names of all directives within that namespace.
* Updated the Raspberry Pi installation script to include `alsasink` in the configuration file.
* Added `audioSink` as a configuration option. This allows users to override the audio sink element used in `Gstreamer`.
* Added an interface for monitoring internet connection status: `InternetConnectionMonitorInterface.h`.
* The Alexa Communications Library (ACL) is no longer required to wait until authorization has succeeded before attempting to connect to AVS. Instead, `HTTP2Transport` handles waiting for authorization to complete.
* Added the Device Capabilities Framework (DCF) delegate. Device capabilities can now be sent for each capability interface using DCF publish messages.
* The sample app has been updated to send DCF publish messages, which will automatically occur when the sample app starts. Note: a DCF publish message must be successfully sent in order for communication with AVS to occur.
* The SDK now supports HTTP PUT messages.
* Added support for opt-arg style arguments and multiple configuration files. Now, the sample app can be invoked by either of these commands: `SampleApp <configfile> <debuglevel>` OR `SampleApp -C file1 -C file2 ... -L loglevel`.
**Bug Fixes**
* Issues [447](https://github.com/alexa/avs-device-sdk/issues/447) and [553](https://github.com/alexa/avs-device-sdk/issues/553) Fixed the `AttachmentRenderSource`'s handling of `BLOCKING` `AttachmentReaders`.
* Updated the `Logger` implementation to be more resilient to `nullptr` string inputs.
* Fixed a `TimeUtils` utility-related compile issue.
* Fixed a bug in which alerts failed to activate if the system was restarted without network connection.
* Fixed Android 64-bit build failure issue.
**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.
* Some ERROR messages may be printed during start-up event if initialization proceeds normally and successfully.
* If an unrecoverable authorization error or an unrecoverable DCF error is encountered, the sample app may crash on shutdown.
* If a non-CBL `clientId` is included in the `deviceInfo` section of `AlexaClientSDKConfig.json`, the error will be reported as an unrecoverable authorization error, rather than a more specific error.
2018-04-18 22:17:28 +00:00
|
|
|
// let's verify that observers are notified when the UserInactivityReport Event is sent.
|
|
|
|
auto userInactivityObserver1 = std::make_shared<MockUserInactivityMonitorObserver>();
|
|
|
|
auto userInactivityObserver2 = std::make_shared<MockUserInactivityMonitorObserver>();
|
|
|
|
EXPECT_CALL(*(userInactivityObserver1.get()), onUserInactivityReportSent());
|
|
|
|
EXPECT_CALL(*(userInactivityObserver2.get()), onUserInactivityReportSent());
|
|
|
|
userInactivityMonitor->addObserver(userInactivityObserver1);
|
|
|
|
userInactivityMonitor->addObserver(userInactivityObserver2);
|
|
|
|
|
2017-08-08 00:04:43 +00:00
|
|
|
auto directiveSequencer = adsl::DirectiveSequencer::create(m_mockExceptionEncounteredSender);
|
|
|
|
directiveSequencer->addDirectiveHandler(userInactivityMonitor);
|
|
|
|
|
|
|
|
auto userInactivityDirectiveHeader = std::make_shared<AVSMessageHeader>(
|
2017-10-02 22:59:05 +00:00
|
|
|
USER_INACTIVITY_RESET_NAMESPACE, USER_INACTIVITY_RESET_NAME, USER_INACTIVITY_MESSAGE_ID);
|
2017-08-08 00:04:43 +00:00
|
|
|
auto attachmentManager = std::make_shared<StrictMock<attachment::test::MockAttachmentManager>>();
|
2017-10-02 22:59:05 +00:00
|
|
|
std::shared_ptr<AVSDirective> userInactivityDirective =
|
|
|
|
AVSDirective::create("", userInactivityDirectiveHeader, "", attachmentManager, "");
|
2017-08-08 00:04:43 +00:00
|
|
|
|
|
|
|
directiveSequencer->onDirective(userInactivityDirective);
|
2017-10-02 22:59:05 +00:00
|
|
|
exitTrigger.wait_for(exitLock, USER_INACTIVITY_REPORT_PERIOD + USER_INACTIVITY_REPORT_PERIOD / 2);
|
Version 1.7.0 of the avs-device-sdk
Changes in this update:
**Enhancements**
* `AuthDelegate` and `AuthServer.py` have been replaced by `CBLAUthDelegate`, which provides a more straightforward path to authorization.
* Added a new configuration property called [`cblAuthDelegate`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L2). This object specifies parameters for `CBLAuthDelegate`.
* Added a new configuration property called [`miscDatabase`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L34), which is a generic key/value database to be used by various components.
* Added a new configuration property called [`dcfDelegate`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L17) This object specifies parameters for `DCFDelegate`. Within this object, values were added for the 'endpoint' and `overridenDcfPublishMessageBody`. 'endpoint' is the endpoint to connect to in order to send device capabilities. `overridenDcfPublishMessageBody`is the message that will get sent out to the Capabilities API. Note: values within the `dcfDelegate` object will only work in `DEBUG` builds.
* Added a new configuration property called [`deviceInfo`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L9) which specifies device-identifying information for use by the Device Capability Framework (DCF), and for authorization (CBLAuthDelegate).
* Updated the Directive Sequencer to support wildcard directive handlers. This allows a handler for a given AVS interface to register at the namespace level, rather than specifying the names of all directives within that namespace.
* Updated the Raspberry Pi installation script to include `alsasink` in the configuration file.
* Added `audioSink` as a configuration option. This allows users to override the audio sink element used in `Gstreamer`.
* Added an interface for monitoring internet connection status: `InternetConnectionMonitorInterface.h`.
* The Alexa Communications Library (ACL) is no longer required to wait until authorization has succeeded before attempting to connect to AVS. Instead, `HTTP2Transport` handles waiting for authorization to complete.
* Added the Device Capabilities Framework (DCF) delegate. Device capabilities can now be sent for each capability interface using DCF publish messages.
* The sample app has been updated to send DCF publish messages, which will automatically occur when the sample app starts. Note: a DCF publish message must be successfully sent in order for communication with AVS to occur.
* The SDK now supports HTTP PUT messages.
* Added support for opt-arg style arguments and multiple configuration files. Now, the sample app can be invoked by either of these commands: `SampleApp <configfile> <debuglevel>` OR `SampleApp -C file1 -C file2 ... -L loglevel`.
**Bug Fixes**
* Issues [447](https://github.com/alexa/avs-device-sdk/issues/447) and [553](https://github.com/alexa/avs-device-sdk/issues/553) Fixed the `AttachmentRenderSource`'s handling of `BLOCKING` `AttachmentReaders`.
* Updated the `Logger` implementation to be more resilient to `nullptr` string inputs.
* Fixed a `TimeUtils` utility-related compile issue.
* Fixed a bug in which alerts failed to activate if the system was restarted without network connection.
* Fixed Android 64-bit build failure issue.
**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.
* Some ERROR messages may be printed during start-up event if initialization proceeds normally and successfully.
* If an unrecoverable authorization error or an unrecoverable DCF error is encountered, the sample app may crash on shutdown.
* If a non-CBL `clientId` is included in the `deviceInfo` section of `AlexaClientSDKConfig.json`, the error will be reported as an unrecoverable authorization error, rather than a more specific error.
2018-04-18 22:17:28 +00:00
|
|
|
|
2017-08-17 00:13:40 +00:00
|
|
|
directiveSequencer->shutdown();
|
2017-08-08 00:04:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This case tests if multiple requests are being sent up to AVS.
|
|
|
|
*/
|
|
|
|
TEST_F(UserInactivityMonitorTest, sendMultipleReports) {
|
|
|
|
InSequence s;
|
|
|
|
std::mutex exitMutex;
|
|
|
|
std::unique_lock<std::mutex> exitLock(exitMutex);
|
|
|
|
int repetitionCount = 3;
|
2017-10-02 22:59:05 +00:00
|
|
|
EXPECT_CALL(*m_mockMessageSender, sendMessage(ResultOf(&checkMessageRequest, Eq(true)))).Times(repetitionCount - 1);
|
|
|
|
EXPECT_CALL(*m_mockMessageSender, sendMessage(ResultOf(&checkMessageRequestAndReleaseTrigger, Eq(true)))).Times(1);
|
2017-08-08 00:04:43 +00:00
|
|
|
auto userInactivityMonitor = UserInactivityMonitor::create(
|
2017-10-02 22:59:05 +00:00
|
|
|
m_mockMessageSender, m_mockExceptionEncounteredSender, USER_INACTIVITY_REPORT_PERIOD);
|
2017-08-08 00:04:43 +00:00
|
|
|
ASSERT_NE(nullptr, userInactivityMonitor);
|
|
|
|
|
2017-10-02 22:59:05 +00:00
|
|
|
exitTrigger.wait_for(exitLock, repetitionCount * USER_INACTIVITY_REPORT_PERIOD + USER_INACTIVITY_REPORT_PERIOD / 2);
|
2017-08-08 00:04:43 +00:00
|
|
|
}
|
|
|
|
|
Version 1.7.0 of the avs-device-sdk
Changes in this update:
**Enhancements**
* `AuthDelegate` and `AuthServer.py` have been replaced by `CBLAUthDelegate`, which provides a more straightforward path to authorization.
* Added a new configuration property called [`cblAuthDelegate`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L2). This object specifies parameters for `CBLAuthDelegate`.
* Added a new configuration property called [`miscDatabase`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L34), which is a generic key/value database to be used by various components.
* Added a new configuration property called [`dcfDelegate`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L17) This object specifies parameters for `DCFDelegate`. Within this object, values were added for the 'endpoint' and `overridenDcfPublishMessageBody`. 'endpoint' is the endpoint to connect to in order to send device capabilities. `overridenDcfPublishMessageBody`is the message that will get sent out to the Capabilities API. Note: values within the `dcfDelegate` object will only work in `DEBUG` builds.
* Added a new configuration property called [`deviceInfo`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L9) which specifies device-identifying information for use by the Device Capability Framework (DCF), and for authorization (CBLAuthDelegate).
* Updated the Directive Sequencer to support wildcard directive handlers. This allows a handler for a given AVS interface to register at the namespace level, rather than specifying the names of all directives within that namespace.
* Updated the Raspberry Pi installation script to include `alsasink` in the configuration file.
* Added `audioSink` as a configuration option. This allows users to override the audio sink element used in `Gstreamer`.
* Added an interface for monitoring internet connection status: `InternetConnectionMonitorInterface.h`.
* The Alexa Communications Library (ACL) is no longer required to wait until authorization has succeeded before attempting to connect to AVS. Instead, `HTTP2Transport` handles waiting for authorization to complete.
* Added the Device Capabilities Framework (DCF) delegate. Device capabilities can now be sent for each capability interface using DCF publish messages.
* The sample app has been updated to send DCF publish messages, which will automatically occur when the sample app starts. Note: a DCF publish message must be successfully sent in order for communication with AVS to occur.
* The SDK now supports HTTP PUT messages.
* Added support for opt-arg style arguments and multiple configuration files. Now, the sample app can be invoked by either of these commands: `SampleApp <configfile> <debuglevel>` OR `SampleApp -C file1 -C file2 ... -L loglevel`.
**Bug Fixes**
* Issues [447](https://github.com/alexa/avs-device-sdk/issues/447) and [553](https://github.com/alexa/avs-device-sdk/issues/553) Fixed the `AttachmentRenderSource`'s handling of `BLOCKING` `AttachmentReaders`.
* Updated the `Logger` implementation to be more resilient to `nullptr` string inputs.
* Fixed a `TimeUtils` utility-related compile issue.
* Fixed a bug in which alerts failed to activate if the system was restarted without network connection.
* Fixed Android 64-bit build failure issue.
**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.
* Some ERROR messages may be printed during start-up event if initialization proceeds normally and successfully.
* If an unrecoverable authorization error or an unrecoverable DCF error is encountered, the sample app may crash on shutdown.
* If a non-CBL `clientId` is included in the `deviceInfo` section of `AlexaClientSDKConfig.json`, the error will be reported as an unrecoverable authorization error, rather than a more specific error.
2018-04-18 22:17:28 +00:00
|
|
|
/**
|
|
|
|
* Verify that timeSinceUserInactivity works as expected.
|
|
|
|
*/
|
|
|
|
TEST_F(UserInactivityMonitorTest, verifyInactivityTime) {
|
|
|
|
auto userInactivityMonitor = UserInactivityMonitor::create(m_mockMessageSender, m_mockExceptionEncounteredSender);
|
|
|
|
ASSERT_NE(nullptr, userInactivityMonitor);
|
|
|
|
|
|
|
|
// we should strongly expect that zero seconds have passed!
|
|
|
|
auto timeInactive = userInactivityMonitor->timeSinceUserActivity();
|
|
|
|
ASSERT_EQ(0, timeInactive.count());
|
|
|
|
|
|
|
|
// now test for a small millisecond delta.
|
|
|
|
std::this_thread::sleep_for(USER_INACTIVITY_REPORT_PERIOD);
|
|
|
|
timeInactive = userInactivityMonitor->timeSinceUserActivity();
|
|
|
|
auto msPassed = std::chrono::duration_cast<std::chrono::milliseconds>(timeInactive);
|
|
|
|
ASSERT_GE(msPassed.count(), 0);
|
|
|
|
}
|
|
|
|
|
2017-08-08 00:04:43 +00:00
|
|
|
/**
|
|
|
|
* This case tests if multiple requests are being sent up to AVS with a reset during the process.
|
|
|
|
*/
|
|
|
|
TEST_F(UserInactivityMonitorTest, sendMultipleReportsWithReset) {
|
|
|
|
InSequence s;
|
|
|
|
std::mutex exitMutex;
|
|
|
|
std::unique_lock<std::mutex> exitLock(exitMutex);
|
|
|
|
int repetitionCount = 5;
|
|
|
|
EXPECT_CALL(*m_mockMessageSender, sendMessage(ResultOf(&checkMessageRequest, Eq(true))))
|
2017-10-02 22:59:05 +00:00
|
|
|
.Times(AtLeast(repetitionCount - 1));
|
|
|
|
EXPECT_CALL(*m_mockMessageSender, sendMessage(ResultOf(&checkMessageRequestAndReleaseTrigger, Eq(true)))).Times(1);
|
2017-08-08 00:04:43 +00:00
|
|
|
|
|
|
|
auto userInactivityMonitor = UserInactivityMonitor::create(
|
2017-10-02 22:59:05 +00:00
|
|
|
m_mockMessageSender, m_mockExceptionEncounteredSender, USER_INACTIVITY_REPORT_PERIOD);
|
2017-08-08 00:04:43 +00:00
|
|
|
ASSERT_NE(nullptr, userInactivityMonitor);
|
|
|
|
|
|
|
|
auto directiveSequencer = adsl::DirectiveSequencer::create(m_mockExceptionEncounteredSender);
|
|
|
|
directiveSequencer->addDirectiveHandler(userInactivityMonitor);
|
|
|
|
|
|
|
|
auto userInactivityDirectiveHeader = std::make_shared<AVSMessageHeader>(
|
2017-10-02 22:59:05 +00:00
|
|
|
USER_INACTIVITY_RESET_NAMESPACE, USER_INACTIVITY_RESET_NAME, USER_INACTIVITY_MESSAGE_ID);
|
2017-08-08 00:04:43 +00:00
|
|
|
auto attachmentManager = std::make_shared<StrictMock<attachment::test::MockAttachmentManager>>();
|
2017-10-02 22:59:05 +00:00
|
|
|
std::shared_ptr<AVSDirective> userInactivityDirective =
|
|
|
|
AVSDirective::create("", userInactivityDirectiveHeader, "", attachmentManager, "");
|
|
|
|
|
|
|
|
std::this_thread::sleep_for(2 * USER_INACTIVITY_REPORT_PERIOD + USER_INACTIVITY_REPORT_PERIOD / 2);
|
2017-08-08 00:04:43 +00:00
|
|
|
directiveSequencer->onDirective(userInactivityDirective);
|
|
|
|
|
2017-10-02 22:59:05 +00:00
|
|
|
exitTrigger.wait_for(exitLock, repetitionCount * USER_INACTIVITY_REPORT_PERIOD + USER_INACTIVITY_REPORT_PERIOD / 2);
|
2017-08-17 00:13:40 +00:00
|
|
|
directiveSequencer->shutdown();
|
2017-08-08 00:04:43 +00:00
|
|
|
}
|
|
|
|
|
2017-10-02 22:59:05 +00:00
|
|
|
} // namespace test
|
|
|
|
} // namespace system
|
|
|
|
} // namespace capabilityAgents
|
|
|
|
} // namespace alexaClientSDK
|
Version 1.7.0 of the avs-device-sdk
Changes in this update:
**Enhancements**
* `AuthDelegate` and `AuthServer.py` have been replaced by `CBLAUthDelegate`, which provides a more straightforward path to authorization.
* Added a new configuration property called [`cblAuthDelegate`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L2). This object specifies parameters for `CBLAuthDelegate`.
* Added a new configuration property called [`miscDatabase`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L34), which is a generic key/value database to be used by various components.
* Added a new configuration property called [`dcfDelegate`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L17) This object specifies parameters for `DCFDelegate`. Within this object, values were added for the 'endpoint' and `overridenDcfPublishMessageBody`. 'endpoint' is the endpoint to connect to in order to send device capabilities. `overridenDcfPublishMessageBody`is the message that will get sent out to the Capabilities API. Note: values within the `dcfDelegate` object will only work in `DEBUG` builds.
* Added a new configuration property called [`deviceInfo`](https://github.com/alexa/avs-device-sdk/blob/master/Integration/AlexaClientSDKConfig.json#L9) which specifies device-identifying information for use by the Device Capability Framework (DCF), and for authorization (CBLAuthDelegate).
* Updated the Directive Sequencer to support wildcard directive handlers. This allows a handler for a given AVS interface to register at the namespace level, rather than specifying the names of all directives within that namespace.
* Updated the Raspberry Pi installation script to include `alsasink` in the configuration file.
* Added `audioSink` as a configuration option. This allows users to override the audio sink element used in `Gstreamer`.
* Added an interface for monitoring internet connection status: `InternetConnectionMonitorInterface.h`.
* The Alexa Communications Library (ACL) is no longer required to wait until authorization has succeeded before attempting to connect to AVS. Instead, `HTTP2Transport` handles waiting for authorization to complete.
* Added the Device Capabilities Framework (DCF) delegate. Device capabilities can now be sent for each capability interface using DCF publish messages.
* The sample app has been updated to send DCF publish messages, which will automatically occur when the sample app starts. Note: a DCF publish message must be successfully sent in order for communication with AVS to occur.
* The SDK now supports HTTP PUT messages.
* Added support for opt-arg style arguments and multiple configuration files. Now, the sample app can be invoked by either of these commands: `SampleApp <configfile> <debuglevel>` OR `SampleApp -C file1 -C file2 ... -L loglevel`.
**Bug Fixes**
* Issues [447](https://github.com/alexa/avs-device-sdk/issues/447) and [553](https://github.com/alexa/avs-device-sdk/issues/553) Fixed the `AttachmentRenderSource`'s handling of `BLOCKING` `AttachmentReaders`.
* Updated the `Logger` implementation to be more resilient to `nullptr` string inputs.
* Fixed a `TimeUtils` utility-related compile issue.
* Fixed a bug in which alerts failed to activate if the system was restarted without network connection.
* Fixed Android 64-bit build failure issue.
**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.
* Some ERROR messages may be printed during start-up event if initialization proceeds normally and successfully.
* If an unrecoverable authorization error or an unrecoverable DCF error is encountered, the sample app may crash on shutdown.
* If a non-CBL `clientId` is included in the `deviceInfo` section of `AlexaClientSDKConfig.json`, the error will be reported as an unrecoverable authorization error, rather than a more specific error.
2018-04-18 22:17:28 +00:00
|
|
|
|
|
|
|
int main(int argc, char** argv) {
|
|
|
|
::testing::InitGoogleTest(&argc, argv);
|
|
|
|
|
|
|
|
// ACSDK-1367 - Some tests fail on Windows
|
|
|
|
#if defined(_WIN32) && !defined(RESOLVED_ACSDK_1367)
|
|
|
|
::testing::GTEST_FLAG(filter) =
|
|
|
|
"-UserInactivityMonitorTest.sendMultipleReports:UserInactivityMonitorTest.handleDirectiveProperly";
|
|
|
|
#endif
|
|
|
|
return RUN_ALL_TESTS();
|
|
|
|
}
|