test-platform: stop using pointer without reason

Signed-off-by: Jules Clero <julesx.clero@intel.com>

Author: clero

test/test-platform/TestPlatform.cpp

@@ -40,29 +40,19 @@ namespace platform
 {
 
 CTestPlatform::CTestPlatform(const string& strClass, int iPortNumber, sem_t& exitSemaphore) :
-    _pParameterMgrPlatformConnector(new CParameterMgrPlatformConnector(strClass)),
-    _pParameterMgrPlatformConnectorLogger(new log::CParameterMgrPlatformConnectorLogger),
+    _parameterMgrPlatformConnector(strClass),
+    _parameterMgrPlatformConnectorLogger(),
     _commandParser(*this),
+    _remoteProcessorServer(iPortNumber, _commandParser.getCommandHandler()),
     _exitSemaphore(exitSemaphore)
 {
-    // Create server
-    _pRemoteProcessorServer = new CRemoteProcessorServer(iPortNumber,
-                                                         _commandParser.getCommandHandler());
-
-    _pParameterMgrPlatformConnector->setLogger(_pParameterMgrPlatformConnectorLogger);
-}
-
-CTestPlatform::~CTestPlatform()
-{
-    delete _pRemoteProcessorServer;
-    delete _pParameterMgrPlatformConnectorLogger;
-    delete _pParameterMgrPlatformConnector;
+    _parameterMgrPlatformConnector.setLogger(&_parameterMgrPlatformConnectorLogger);
 }
 
 bool CTestPlatform::load(std::string& strError)
 {
     // Start remote processor server
-    if (!_pRemoteProcessorServer->start(strError)) {
+    if (!_remoteProcessorServer.start(strError)) {
 
         strError = "TestPlatform: Unable to start remote processor server: " + strError;
         return false;
@@ -76,7 +66,7 @@ bool CTestPlatform::setCriterionState(std::string criterionName,
                                       string& strResult)
 {
     core::criterion::Criterion* pCriterion =
-        _pParameterMgrPlatformConnector->getCriterion(criterionName);
+        _parameterMgrPlatformConnector.getCriterion(criterionName);
 
     if (!pCriterion) {
 

test/test-platform/TestPlatform.h

@@ -32,7 +32,6 @@
 #include "command/Parser.h"
 #include "ParameterMgrPlatformConnector.h"
 #include "RemoteProcessorServer.h"
-#include <assert.h>
 #include <string>
 #include <semaphore.h>
 #include <iostream>
@@ -73,7 +72,6 @@ class CTestPlatform
 
 public:
     CTestPlatform(const std::string &strclass, int iPortNumber, sem_t& exitSemaphore);
-    virtual ~CTestPlatform();
 
     // Init
     bool load(std::string& strError);
@@ -96,8 +94,6 @@ class CTestPlatform
                          const IRemoteCommand& command,
                          std::string& result)
     {
-        assert(_pParameterMgrPlatformConnector != NULL);
-
         uint32_t nbStates = command.getArgumentCount() - 1;
 
         core::criterion::Values values;
@@ -145,8 +141,8 @@ class CTestPlatform
                          std::string& result)
     {
         core::criterion::Criterion* criterion = (isInclusive ?
-            _pParameterMgrPlatformConnector->createInclusiveCriterion(name, values, result) :
-            _pParameterMgrPlatformConnector->createExclusiveCriterion(name, values, result));
+            _parameterMgrPlatformConnector.createInclusiveCriterion(name, values, result) :
+            _parameterMgrPlatformConnector.createExclusiveCriterion(name, values, result));
 
         if (criterion == nullptr) {
             return false;
@@ -168,17 +164,17 @@ class CTestPlatform
                            const IRemoteCommand& remoteCommand,
                            std::string& strResult);
 
-    // Connector
-    CParameterMgrPlatformConnector* _pParameterMgrPlatformConnector;
+    /** Parameter-Framework Connector */
+    CParameterMgrPlatformConnector _parameterMgrPlatformConnector;
 
-    // Logger
-    log::CParameterMgrPlatformConnectorLogger* _pParameterMgrPlatformConnectorLogger;
+    /** Parameter-Framework Logger */
+    log::CParameterMgrPlatformConnectorLogger _parameterMgrPlatformConnectorLogger;
 
     /** Command Parser delegate */
     command::Parser _commandParser;
 
-    // Remote Processor Server
-    CRemoteProcessorServer* _pRemoteProcessorServer;
+    /** Remote Processor Server */
+    CRemoteProcessorServer _remoteProcessorServer;
 
     // Semaphore used by calling thread to avoid exiting
     sem_t& _exitSemaphore;

test/test-platform/command/src/Parser.cpp

@@ -131,7 +131,7 @@ Parser::createCriterionFromStateList(const IRemoteCommand& remoteCommand, std::s
 
 Parser::CommandReturn Parser::startParameterMgr(const IRemoteCommand&, std::string& result)
 {
-    return mTestPlatform._pParameterMgrPlatformConnector->start(result) ?
+    return mTestPlatform._parameterMgrPlatformConnector.start(result) ?
            Parser::CommandHandler::EDone : Parser::CommandHandler::EFailed;
 }
 
@@ -142,14 +142,14 @@ Parser::CommandReturn Parser::setter(const IRemoteCommand& remoteCommand, std::s
     if(!convertTo(remoteCommand.getArgument(0), fail)) {
         return Parser::CommandHandler::EShowUsage;
     }
-    return (mTestPlatform._pParameterMgrPlatformConnector->*setFunction)(fail, result) ?
+    return (mTestPlatform._parameterMgrPlatformConnector.*setFunction)(fail, result) ?
            Parser::CommandHandler::EDone : Parser::CommandHandler::EFailed;
 }
 
 template <Parser::getter_t getFunction>
 Parser::CommandReturn Parser::getter(const IRemoteCommand&, std::string& result)
 {
-    result = (mTestPlatform._pParameterMgrPlatformConnector->*getFunction)() ? "true" : "false";
+    result = (mTestPlatform._parameterMgrPlatformConnector.*getFunction)() ? "true" : "false";
     return Parser::CommandHandler::ESucceeded;
 }
 
@@ -164,7 +164,7 @@ Parser::CommandReturn Parser::setCriterionState(const IRemoteCommand& remoteComm
 
 Parser::CommandReturn Parser::applyConfigurations(const IRemoteCommand&, std::string&)
 {
-    mTestPlatform._pParameterMgrPlatformConnector->applyConfigurations();
+    mTestPlatform._parameterMgrPlatformConnector.applyConfigurations();
 
     return Parser::CommandHandler::EDone;
 }