--- a/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.cpp	Fri Jun 04 10:19:18 2010 +0100
+++ b/phonesettings/cpphonesettingsplugins/telephonyplugin/tsrc/ut_cptelephonypluginview/ut_cptelephonypluginview.cpp	Wed Jun 23 18:12:20 2010 +0300
@@ -23,7 +23,6 @@
 #include <smcmockclassincludes.h>
 #include <hbdataform.h>
 #include <hbdataformmodel.h>
-#include <hbsettingformitem.h>
 #include "cptelephonypluginview.h"
 
 
@@ -66,13 +65,15 @@
 {
     initialize();
     CpPluginInterface *nullPlugin=0;
-    expect("CpPluginLoader::loadCpPlugin").with(QString("cpcallsplugin")).returns(nullPlugin);
+    expect("CpPluginLoader::loadCpPluginInterface").
+            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("cpdivertplugin")).returns(ret); // cpnetworkplugin
     expect("DummyPlugin::createSettingFormItemData").returns(list);
     
     m_callspluginview = new CpTelephonyPluginView;
@@ -98,11 +99,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);