ConfigurationTest friend of managerimpl to be able call private method

globals.mak

@@ -6,6 +6,7 @@ sflcodecdir=$(libdir)/sflphone/codecs
 AM_CPPFLAGS = \
 	-I$(src)/libs \
 	-I$(src)/src \
+	-I$(src)/test \
 	-DPREFIX=\"$(prefix)\" \
 	-DPROGSHAREDIR=\"${datadir}/sflphone\" \
 	$(ZEROCONFFLAGS) \

src/managerimpl.h

@@ -1019,6 +1019,7 @@ class ManagerImpl {
     bool testAccountMap();
 #endif
 
+    friend class ConfigurationTest;
 };
 
 #endif // __MANAGER_H__

test/Makefile.am

@@ -19,6 +19,7 @@ OBJECT_FILES= \
 
 configurationTester_SOURCES = \
 		configurationTest.cpp \
+		configurationTest.h \
 		TestMain.cpp
 
 configurationTester_LDADD = \

test/configurationTest.cpp

@@ -17,47 +17,19 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-// Cppunit import
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/TestCaller.h>
-#include <cppunit/TestCase.h>
-#include <cppunit/TestSuite.h>
-
-#include <assert.h>
 #include <stdio.h>
 
-// Application import
-#include "manager.h"
-#include "global.h"
-#include "user_cfg.h"
-
-/*
- * @file configurationTest.cpp  
- * @brief       Regroups unitary tests related to the user configuration.
- *              Check if the default configuration has been successfully loaded
- */
+#include "configurationTest.h"
 
 using std::cout;
 using std::endl;
 
+void ConfigurationTest::setUp(){
+    // Load the default configuration
+    Manager::instance().initConfigFile(false);
+}
 
-class ConfigurationTest : public CppUnit::TestCase {
-
-    /*
-     * Use cppunit library macros to add unit test the factory
-     */
-    CPPUNIT_TEST_SUITE( ConfigurationTest );
-        CPPUNIT_TEST( testDefaultValueAudio );
-        CPPUNIT_TEST( testDefaultValuePreferences );
-    CPPUNIT_TEST_SUITE_END();
-
-    public:
-        ConfigurationTest() : CppUnit::TestCase("Configuration Tests") {}
- 
-        /*
-         * Unit tests related to the audio preferences
-         */
-        void testDefaultValueAudio(){
+void ConfigurationTest::testDefaultValueAudio(){
     CPPUNIT_ASSERT( Manager::instance().getConfigString( AUDIO, ALSA_CARD_ID_IN ) == ALSA_DFT_CARD) ;
     CPPUNIT_ASSERT( Manager::instance().getConfigString( AUDIO, ALSA_CARD_ID_OUT ) == ALSA_DFT_CARD );
     CPPUNIT_ASSERT( Manager::instance().getConfigString( AUDIO, ALSA_SAMPLE_RATE ) == DFT_SAMPLE_RATE);
@@ -67,10 +39,7 @@ class ConfigurationTest : public CppUnit::TestCase {
     CPPUNIT_ASSERT( Manager::instance().getConfigString( AUDIO, VOLUME_MICRO ) == DFT_VOL_MICRO_STR);
 }
 
-        /*
-         * Unit tests related to the global settings
-         */
-        void testDefaultValuePreferences(){
+void ConfigurationTest::testDefaultValuePreferences(){
     CPPUNIT_ASSERT( Manager::instance().getConfigString( PREFERENCES, ZONE_TONE ) == DFT_ZONE );
     CPPUNIT_ASSERT( Manager::instance().getConfigString( PREFERENCES, CONFIG_ZEROCONF ) == CONFIG_ZEROCONF_DEFAULT_STR );
     CPPUNIT_ASSERT( Manager::instance().getConfigString( PREFERENCES, CONFIG_DIALPAD ) == YES_STR );
@@ -86,24 +55,15 @@ class ConfigurationTest : public CppUnit::TestCase {
 
 }
 
-        /*
-         * Code factoring - Common resources can be initialized here.
-         * This method is called by unitcpp before each test
-         */
-        void setUp(){
-            // Load the default configuration
-            Manager::instance().initConfigFile(false);
+void ConfigurationTest::testDefaultValueSignalisation(){
+    CPPUNIT_ASSERT( Manager::instance().getConfigString( SIGNALISATION , SYMMETRIC ) == YES_STR );
+    CPPUNIT_ASSERT( Manager::instance().getConfigString( SIGNALISATION , PLAY_DTMF ) == YES_STR );
+    CPPUNIT_ASSERT( Manager::instance().getConfigString( SIGNALISATION , PLAY_TONES ) == YES_STR );
+    CPPUNIT_ASSERT( Manager::instance().getConfigString( SIGNALISATION , PULSE_LENGTH ) == DFT_PULSE_LENGTH_STR );
+    CPPUNIT_ASSERT( Manager::instance().getConfigString( SIGNALISATION , SEND_DTMF_AS ) == SIP_INFO_STR );
 }
 
-        /*
-         * Code factoring - Common resources can be released here.
-         * This method is called by unitcpp after each test
-         */
-        void tearDown(){
-            // Not much to do
+void ConfigurationTest::testLoadAccountMap(){
+    Manager::instance().loadAccountMap();  
 }
 
-};
-
-/* Register our test module */
-CPPUNIT_TEST_SUITE_REGISTRATION( ConfigurationTest );

test/configurationTest.h

+/*
+ *  Copyright (C) 2008 Savoir-Faire Linux inc.
+ *  Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+// Cppunit import
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestCaller.h>
+#include <cppunit/TestCase.h>
+#include <cppunit/TestSuite.h>
+
+#include <assert.h>
+
+// Application import
+#include "manager.h"
+#include "global.h"
+#include "user_cfg.h"
+
+/*
+ * @file configurationTest.cpp  
+ * @brief       Regroups unitary tests related to the user configuration.
+ *              Check if the default configuration has been successfully loaded
+ */
+
+#ifndef _CONFIGURATION_TEST_
+#define _CONFIGURATION_TEST_
+
+class ConfigurationTest : public CppUnit::TestCase {
+
+    /*
+     * Use cppunit library macros to add unit test the factory
+     */
+    CPPUNIT_TEST_SUITE( ConfigurationTest );
+        CPPUNIT_TEST( testDefaultValueAudio );
+        CPPUNIT_TEST( testDefaultValuePreferences );
+        CPPUNIT_TEST( testDefaultValueSignalisation ); 
+        CPPUNIT_TEST( testLoadAccountMap );
+    CPPUNIT_TEST_SUITE_END();
+
+    public:
+        ConfigurationTest() : CppUnit::TestCase("Configuration Tests") {}
+        
+        /*
+         * Code factoring - Common resources can be initialized here.
+         * This method is called by unitcpp before each test
+         */
+        void setUp();
+
+        /*
+         * Code factoring - Common resources can be released here.
+         * This method is called by unitcpp after each test
+         */
+        inline void tearDown(){
+            // Not much to do
+        }
+
+        /*
+         * Unit tests related to the audio preferences
+         */
+        void testDefaultValueAudio();
+            
+        /*
+         * Unit tests related to the global settings
+         */
+        void testDefaultValuePreferences();
+
+        void testDefaultValueSignalisation();
+        
+        void testLoadAccountMap();
+
+};
+
+/* Register our test module */
+CPPUNIT_TEST_SUITE_REGISTRATION( ConfigurationTest );
+
+#endif