Skip to content
Snippets Groups Projects
Commit dc84b942 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

configurationtest: cleanup

parent a49f9497
No related branches found
No related tags found
No related merge requests found
...@@ -62,9 +62,9 @@ void ConfigurationTest::testDefaultValueSignalisation() ...@@ -62,9 +62,9 @@ void ConfigurationTest::testDefaultValueSignalisation()
{ {
DEBUG("-------------------- ConfigurationTest::testDefaultValueSignalisation --------------------\n"); DEBUG("-------------------- ConfigurationTest::testDefaultValueSignalisation --------------------\n");
CPPUNIT_ASSERT(Manager::instance().voipPreferences.getSymmetricRtp() == true); CPPUNIT_ASSERT(Manager::instance().voipPreferences.getSymmetricRtp());
CPPUNIT_ASSERT(Manager::instance().voipPreferences.getPlayDtmf() == true); CPPUNIT_ASSERT(Manager::instance().voipPreferences.getPlayDtmf());
CPPUNIT_ASSERT(Manager::instance().voipPreferences.getPlayTones() == true); CPPUNIT_ASSERT(Manager::instance().voipPreferences.getPlayTones());
CPPUNIT_ASSERT(Manager::instance().voipPreferences.getPulseLength() == 250); CPPUNIT_ASSERT(Manager::instance().voipPreferences.getPulseLength() == 250);
} }
...@@ -93,13 +93,11 @@ void ConfigurationTest::testInitAudioDriver() ...@@ -93,13 +93,11 @@ void ConfigurationTest::testInitAudioDriver()
void ConfigurationTest::testYamlParser() void ConfigurationTest::testYamlParser()
{ {
try { try {
Conf::YamlParser *parser = new Conf::YamlParser("ymlParser.yml"); Conf::YamlParser parser("ymlParser.yml");
parser->serializeEvents(); parser.serializeEvents();
parser->composeEvents(); parser.composeEvents();
parser->constructNativeData(); parser.constructNativeData();
} catch (const Conf::YamlParserException &e) {
delete parser;
} catch (Conf::YamlParserException &e) {
ERROR("ConfigTree: %s", e.what()); ERROR("ConfigTree: %s", e.what());
} }
} }
...@@ -223,13 +221,12 @@ void ConfigurationTest::testYamlEmitter() ...@@ -223,13 +221,12 @@ void ConfigurationTest::testYamlEmitter()
tlsmap.setKeyValue(verifyServerKey, &verifyserver); tlsmap.setKeyValue(verifyServerKey, &verifyserver);
try { try {
YamlEmitter *emitter = new YamlEmitter("/tmp/ymlEmiter.txt"); YamlEmitter emitter("/tmp/ymlEmiter.txt");
emitter->serializeAccount(&accountmap); emitter.serializeAccount(&accountmap);
emitter->serializeAccount(&accountmap); emitter.serializeAccount(&accountmap);
emitter->serializeData(); emitter.serializeData();
delete emitter;
} catch (const YamlEmitterException &e) { } catch (const YamlEmitterException &e) {
ERROR("ConfigTree: %s", e.what()); ERROR("ConfigTree: %s", e.what());
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment