Skip to content
This repository was archived by the owner on Aug 5, 2022. It is now read-only.

Commit f8ac041

Browse files
committed
test-platform: stop using pointer without reason
Signed-off-by: Jules Clero <julesx.clero@intel.com>
1 parent d461d12 commit f8ac041

File tree

3 files changed

+18
-32
lines changed

3 files changed

+18
-32
lines changed

test/test-platform/TestPlatform.cpp

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,29 +40,19 @@ namespace platform
4040
{
4141

4242
CTestPlatform::CTestPlatform(const string& strClass, int iPortNumber, sem_t& exitSemaphore) :
43-
_pParameterMgrPlatformConnector(new CParameterMgrPlatformConnector(strClass)),
44-
_pParameterMgrPlatformConnectorLogger(new log::CParameterMgrPlatformConnectorLogger),
43+
_parameterMgrPlatformConnector(strClass),
44+
_parameterMgrPlatformConnectorLogger(),
4545
_commandParser(*this),
46+
_remoteProcessorServer(iPortNumber, _commandParser.getCommandHandler()),
4647
_exitSemaphore(exitSemaphore)
4748
{
48-
// Create server
49-
_pRemoteProcessorServer = new CRemoteProcessorServer(iPortNumber,
50-
_commandParser.getCommandHandler());
51-
52-
_pParameterMgrPlatformConnector->setLogger(_pParameterMgrPlatformConnectorLogger);
53-
}
54-
55-
CTestPlatform::~CTestPlatform()
56-
{
57-
delete _pRemoteProcessorServer;
58-
delete _pParameterMgrPlatformConnectorLogger;
59-
delete _pParameterMgrPlatformConnector;
49+
_parameterMgrPlatformConnector.setLogger(&_parameterMgrPlatformConnectorLogger);
6050
}
6151

6252
bool CTestPlatform::load(std::string& strError)
6353
{
6454
// Start remote processor server
65-
if (!_pRemoteProcessorServer->start(strError)) {
55+
if (!_remoteProcessorServer.start(strError)) {
6656

6757
strError = "TestPlatform: Unable to start remote processor server: " + strError;
6858
return false;
@@ -76,7 +66,7 @@ bool CTestPlatform::setCriterionState(std::string criterionName,
7666
string& strResult)
7767
{
7868
core::criterion::Criterion* pCriterion =
79-
_pParameterMgrPlatformConnector->getCriterion(criterionName);
69+
_parameterMgrPlatformConnector.getCriterion(criterionName);
8070

8171
if (!pCriterion) {
8272

test/test-platform/TestPlatform.h

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
#include "command/Parser.h"
3333
#include "ParameterMgrPlatformConnector.h"
3434
#include "RemoteProcessorServer.h"
35-
#include <assert.h>
3635
#include <string>
3736
#include <semaphore.h>
3837
#include <iostream>
@@ -73,7 +72,6 @@ class CTestPlatform
7372

7473
public:
7574
CTestPlatform(const std::string &strclass, int iPortNumber, sem_t& exitSemaphore);
76-
virtual ~CTestPlatform();
7775

7876
// Init
7977
bool load(std::string& strError);
@@ -96,8 +94,6 @@ class CTestPlatform
9694
const IRemoteCommand& command,
9795
std::string& result)
9896
{
99-
assert(_pParameterMgrPlatformConnector != NULL);
100-
10197
uint32_t nbStates = command.getArgumentCount() - 1;
10298

10399
core::criterion::Values values;
@@ -145,8 +141,8 @@ class CTestPlatform
145141
std::string& result)
146142
{
147143
core::criterion::Criterion* criterion = (isInclusive ?
148-
_pParameterMgrPlatformConnector->createInclusiveCriterion(name, values, result) :
149-
_pParameterMgrPlatformConnector->createExclusiveCriterion(name, values, result));
144+
_parameterMgrPlatformConnector.createInclusiveCriterion(name, values, result) :
145+
_parameterMgrPlatformConnector.createExclusiveCriterion(name, values, result));
150146

151147
if (criterion == nullptr) {
152148
return false;
@@ -168,17 +164,17 @@ class CTestPlatform
168164
const IRemoteCommand& remoteCommand,
169165
std::string& strResult);
170166

171-
// Connector
172-
CParameterMgrPlatformConnector* _pParameterMgrPlatformConnector;
167+
/** Parameter-Framework Connector */
168+
CParameterMgrPlatformConnector _parameterMgrPlatformConnector;
173169

174-
// Logger
175-
log::CParameterMgrPlatformConnectorLogger* _pParameterMgrPlatformConnectorLogger;
170+
/** Parameter-Framework Logger */
171+
log::CParameterMgrPlatformConnectorLogger _parameterMgrPlatformConnectorLogger;
176172

177173
/** Command Parser delegate */
178174
command::Parser _commandParser;
179175

180-
// Remote Processor Server
181-
CRemoteProcessorServer* _pRemoteProcessorServer;
176+
/** Remote Processor Server */
177+
CRemoteProcessorServer _remoteProcessorServer;
182178

183179
// Semaphore used by calling thread to avoid exiting
184180
sem_t& _exitSemaphore;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ Parser::createCriterionFromStateList(const IRemoteCommand& remoteCommand, std::s
131131

132132
Parser::CommandReturn Parser::startParameterMgr(const IRemoteCommand&, std::string& result)
133133
{
134-
return mTestPlatform._pParameterMgrPlatformConnector->start(result) ?
134+
return mTestPlatform._parameterMgrPlatformConnector.start(result) ?
135135
Parser::CommandHandler::EDone : Parser::CommandHandler::EFailed;
136136
}
137137

@@ -142,14 +142,14 @@ Parser::CommandReturn Parser::setter(const IRemoteCommand& remoteCommand, std::s
142142
if(!convertTo(remoteCommand.getArgument(0), fail)) {
143143
return Parser::CommandHandler::EShowUsage;
144144
}
145-
return (mTestPlatform._pParameterMgrPlatformConnector->*setFunction)(fail, result) ?
145+
return (mTestPlatform._parameterMgrPlatformConnector.*setFunction)(fail, result) ?
146146
Parser::CommandHandler::EDone : Parser::CommandHandler::EFailed;
147147
}
148148

149149
template <Parser::getter_t getFunction>
150150
Parser::CommandReturn Parser::getter(const IRemoteCommand&, std::string& result)
151151
{
152-
result = (mTestPlatform._pParameterMgrPlatformConnector->*getFunction)() ? "true" : "false";
152+
result = (mTestPlatform._parameterMgrPlatformConnector.*getFunction)() ? "true" : "false";
153153
return Parser::CommandHandler::ESucceeded;
154154
}
155155

@@ -164,7 +164,7 @@ Parser::CommandReturn Parser::setCriterionState(const IRemoteCommand& remoteComm
164164

165165
Parser::CommandReturn Parser::applyConfigurations(const IRemoteCommand&, std::string&)
166166
{
167-
mTestPlatform._pParameterMgrPlatformConnector->applyConfigurations();
167+
mTestPlatform._parameterMgrPlatformConnector.applyConfigurations();
168168

169169
return Parser::CommandHandler::EDone;
170170
}

0 commit comments

Comments
 (0)