aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--test/test-platform/Android.mk2
-rw-r--r--test/test-platform/TestPlatform.cpp40
-rw-r--r--test/test-platform/TestPlatform.h23
-rw-r--r--test/test-platform/main.cpp9
4 files changed, 70 insertions, 4 deletions
diff --git a/test/test-platform/Android.mk b/test/test-platform/Android.mk
index 5755c38..4a5ad41 100644
--- a/test/test-platform/Android.mk
+++ b/test/test-platform/Android.mk
@@ -31,6 +31,7 @@ LOCAL_C_INCLUDES += \
$(call include-path-for, libstdc++)/.. \
bionic/
+LOCAL_STATIC_LIBRARIES := libaudio_comms_convert
LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libstlport
include $(BUILD_EXECUTABLE)
@@ -47,6 +48,7 @@ LOCAL_MODULE_TAGS := $(common_module_tags)
LOCAL_C_INCLUDES += $(common_c_includes)
+LOCAL_STATIC_LIBRARIES := libaudio_comms_convert_host
LOCAL_SHARED_LIBRARIES := $(foreach shared_library, $(common_shared_libraries), \
$(shared_library)_host)
diff --git a/test/test-platform/TestPlatform.cpp b/test/test-platform/TestPlatform.cpp
index 91b86fd..0eaa261 100644
--- a/test/test-platform/TestPlatform.cpp
+++ b/test/test-platform/TestPlatform.cpp
@@ -28,6 +28,7 @@
#include <sstream>
#include <assert.h>
#include <errno.h>
+#include <convert.hpp>
#include "TestPlatform.h"
#include "ParameterMgrPlatformConnector.h"
#include "RemoteProcessorServer.h"
@@ -63,9 +64,19 @@ CTestPlatform::CTestPlatform(const string& strClass, int iPortNumber) :
_pCommandHandler->addCommandParser("createInclusiveSelectionCriterion", &CTestPlatform::createInclusiveSelectionCriterionCommandProcess, 2, "<name> <nbStates>", "Create exclusive selection criterion");
_pCommandHandler->addCommandParser("start", &CTestPlatform::startParameterMgrCommandProcess, 0, "", "Start ParameterMgr");
+
_pCommandHandler->addCommandParser("setCriterionState", &CTestPlatform::setCriterionStateCommandProcess, 2, "<name> <state>", "Set the current state of a selection criterion");
_pCommandHandler->addCommandParser("applyConfigurations", &CTestPlatform::applyConfigurationsCommandProcess, 0, "", "Apply configurations selected by current selection criteria states");
+ _pCommandHandler->addCommandParser("setFailureOnMissingSubsystem",
+ &CTestPlatform::setFailureOnMissingSubsystemCommandProcess,
+ 1, "true|false", "Set policy for missing subsystems, "
+ "either abort start or fallback on virtual subsystem");
+ _pCommandHandler->addCommandParser("getMissingSubsystemPolicy",
+ &CTestPlatform::getFailureOnMissingSubsystemCommandProcess,
+ 0, "", "Get policy for missing subsystems, "
+ "either abort start or fallback on virtual subsystem");
+
// Create server
_pRemoteProcessorServer = new CRemoteProcessorServer(iPortNumber, _pCommandHandler);
@@ -127,6 +138,35 @@ CTestPlatform::CCommandHandler::CommandStatus CTestPlatform::startParameterMgrCo
CTestPlatform::CCommandHandler::EDone : CTestPlatform::CCommandHandler::EFailed;
}
+CTestPlatform::CCommandHandler::CommandStatus
+ CTestPlatform::setFailureOnMissingSubsystemCommandProcess(
+ const IRemoteCommand& remoteCommand, string& strResult)
+{
+ const string& strAbort = remoteCommand.getArgument(0);
+
+ bool bFail;
+
+ if(!audio_comms::utilities::convertTo(strAbort, bFail)) {
+ return CTestPlatform::CCommandHandler::EShowUsage;
+ }
+
+ return _pParameterMgrPlatformConnector->setFailureOnMissingSubsystem(bFail, strResult) ?
+ CTestPlatform::CCommandHandler::EDone : CTestPlatform::CCommandHandler::EFailed;
+}
+
+CTestPlatform::CCommandHandler::CommandStatus
+ CTestPlatform::getFailureOnMissingSubsystemCommandProcess(
+ const IRemoteCommand& remoteCommand, string& strResult)
+{
+ (void)remoteCommand;
+ (void)strResult;
+
+ strResult = _pParameterMgrPlatformConnector->getFailureOnMissingSubsystem() ?
+ "true":"false";
+
+ return CTestPlatform::CCommandHandler::EDone;
+}
+
CTestPlatform::CCommandHandler::CommandStatus CTestPlatform::setCriterionStateCommandProcess(const IRemoteCommand& remoteCommand, string& strResult)
{
diff --git a/test/test-platform/TestPlatform.h b/test/test-platform/TestPlatform.h
index 8a3e59c..47f81f8 100644
--- a/test/test-platform/TestPlatform.h
+++ b/test/test-platform/TestPlatform.h
@@ -24,9 +24,9 @@
*/
#pragma once
+#include "RemoteCommandHandlerTemplate.h"
#include <string>
#include <list>
-#include "RemoteCommandHandlerTemplate.h"
using namespace std;
@@ -57,6 +57,27 @@ private:
CCommandHandler::CommandStatus setCriterionStateCommandProcess(const IRemoteCommand& remoteCommand, string& strResult);
CCommandHandler::CommandStatus applyConfigurationsCommandProcess(const IRemoteCommand& remoteCommand, string& strResult);
+ /** Callback to set if the PFW start should fail in case of missing subsystems.
+ *
+ * @param[in] remoteCommand contains the arguments of the received command.
+ * @param[out] strResult a string containing the result of the command.
+ *
+ * @return CCommandHandler::ESucceeded if command succeeded
+ * or CCommandHandler::EFailed otherwise
+ */
+ CCommandHandler::CommandStatus setFailureOnMissingSubsystemCommandProcess(
+ const IRemoteCommand& remoteCommand, string& strResult);
+ /** Callback to get if the PFW start should fail in case of missing subsystems.
+ *
+ * @param[in] remoteCommand contains the arguments of the received command.
+ * @param[out] strResult a string containing the result of the command.
+ *
+ * @return CCommandHandler::ESucceeded if command succeeded
+ * or CCommandHandler::EFailed otherwise
+ */
+ CCommandHandler::CommandStatus getFailureOnMissingSubsystemCommandProcess(
+ const IRemoteCommand& remoteCommand, string& strResult);
+
// Commands
bool createExclusiveSelectionCriterionFromStateList(const string& strName, const IRemoteCommand& remoteCommand, string& strResult);
bool createInclusiveSelectionCriterionFromStateList(const string& strName, const IRemoteCommand& remoteCommand, string& strResult);
diff --git a/test/test-platform/main.cpp b/test/test-platform/main.cpp
index 1cd1594..8a2a07a 100644
--- a/test/test-platform/main.cpp
+++ b/test/test-platform/main.cpp
@@ -22,11 +22,14 @@
* CREATED: 2011-11-25
* UPDATED: 2011-11-25
*/
-#include <iostream>
-#include <semaphore.h>
+
#include "TestPlatform.h"
+
+#include <iostream>
+#include <cstdlib>
+extern "C" {
#include <semaphore.h>
-#include <stdlib.h>
+}
using namespace std;