--- a/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.cpp	Tue Jun 15 14:14:38 2010 +0100
+++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.cpp	Thu Jul 22 16:33:21 2010 +0100
@@ -23,7 +23,6 @@
 #include <smcmockclassincludes.h>
 #include <hbdataform.h>
 #include <hbdataformmodel.h>
-#include <hbsettingformitem.h>
 #include "cptelephonypluginview.h"
 
 
@@ -65,18 +64,21 @@
 void UT_CpTelephonyPluginView::init()
 {
     initialize();
+
     CpPluginInterface *nullPlugin=0;
-    expect("CpPluginLoader::loadCpPlugin").with(QString("cpcallsplugin")).returns(nullPlugin);
     DummyPlugin *ret = new DummyPlugin;
-    
-    //ret = new DummyPlugin;
+
     QList<CpSettingFormItemData*> list;
     list.append(new CpSettingFormItemData);
-    expect("CpPluginLoader::loadCpPlugin").with(QString("cpdivertplugin")).returns(ret); // cpnetworkplugin
+    expect("CpPluginLoader::loadCpPluginInterface").
+            with(QString("cpcallsplugin")).returns(ret);
     expect("DummyPlugin::createSettingFormItemData").returns(list);
+    expect("CpPluginLoader::loadCpPluginInterface").
+            with(QString("cpdivertplugin")).returns(nullPlugin);
     
     m_callspluginview = new CpTelephonyPluginView;
     QVERIFY( verify() );
+
 }
 
 /*!
@@ -98,11 +100,13 @@
     QList<CpSettingFormItemData*> list;
     list.append(new CpSettingFormItemData);
     DummyPlugin *ret = new DummyPlugin;
-    expect("CpPluginLoader::loadCpPlugin").with(QString("cpcallsplugin")).returns(ret);
+    expect("CpPluginLoader::loadCpPluginInterface").
+            with(QString("cpcallsplugin")).returns(ret);
     expect("DummyPlugin::createSettingFormItemData").returns(list);
     
     ret = new DummyPlugin;
-    expect("CpPluginLoader::loadCpPlugin").with(QString("cpdivertplugin")).returns(ret);
+    expect("CpPluginLoader::loadCpPluginInterface").
+            with(QString("cpdivertplugin")).returns(ret);
     expect("DummyPlugin::createSettingFormItemData").returns(list);