--- a/idlefw/tsrc/mcsplugin/ut_mcsplugin/ut_mcspluginpublisher.cpp	Wed Sep 01 12:22:09 2010 +0100
+++ b/idlefw/tsrc/mcsplugin/ut_mcsplugin/ut_mcspluginpublisher.cpp	Tue Sep 14 21:55:16 2010 +0300
@@ -47,19 +47,13 @@
 _LIT( KMenuMailboxIconId, "16388" );
 _LIT( KMenuMailboxMaskId, "16389" );
 _LIT( KMenuTypeMailbox, "menu:mailbox" );
-_LIT( KIcon, "icon" );
 
 _LIT8( KProperNameType, "type" );
-_LIT8( KProperNameParam, "param" );
 _LIT8( KProperNameUid, "uid" );
-_LIT8( KProperNameView, "view" );
-_LIT8( KProperNameLocked, "locked" );
 _LIT8( KProperValueBookmark, "bookmark" );
 _LIT8( KProperValueFolder, "folder" );
 _LIT8( KProperValueMailbox, "mailbox" );
 _LIT8( KMenuAttrUndefUid, "0x99999991" );
-_LIT8( KMenuAttrViewTest, "view:test" );
-_LIT8( KMenuAttrParamTest, "param:test" );
 
 _LIT( KTestName, "test:name" );
 _LIT( KTestIconAttr, "icon_attributes" );
@@ -203,7 +197,7 @@
 void UT_MCSPluginPublisher::Teardown()
 {
     User::LeaveIfError( iPluginSettings->SetSettingsL( KNameSpace,
-        iSettings, ETrue ));
+        iSettings, EFalse ));
 
     iSettings.ResetAndDestroy();
 
@@ -231,8 +225,8 @@
     data->SetNameL( KTestName );
     data->SetValueL( KTestValue );
 
-    EUNIT_ASSERT_EQUALS( data->Name(), KTestName );
-    EUNIT_ASSERT_EQUALS( data->Value(), KTestValue );
+    EUNIT_ASSERT_EQUALS( *data->Name(), KTestName );
+    EUNIT_ASSERT_EQUALS( *data->Value(), KTestValue );
 
     CleanupStack::PopAndDestroy( data );
 }
@@ -278,7 +272,7 @@
     }
 
     User::LeaveIfError( iPluginSettings->SetSettingsL( KNameSpace, settings,
-        ETrue) );
+        EFalse ));
     iMCSPlugin->iEngine->iPluginData->UpdateDataL();
 
     CMCSData& itemData =  iMCSPlugin->iEngine->iPluginData->DataItemL( 0 );
@@ -309,7 +303,7 @@
     }
 
     User::LeaveIfError( iPluginSettings->SetSettingsL( KNameSpace, settings,
-        ETrue ));
+        EFalse ));
     iMCSPlugin->iEngine->iPluginData->UpdateDataL();
 
     CMCSData& itemData =  iMCSPlugin->iEngine->iPluginData->DataItemL( 0 );
@@ -340,7 +334,7 @@
     }
 
     User::LeaveIfError( iPluginSettings->SetSettingsL( KNameSpace, settings,
-        ETrue));
+        EFalse ));
     iMCSPlugin->iEngine->iPluginData->UpdateDataL();
 
     CMCSData& itemData =  iMCSPlugin->iEngine->iPluginData->DataItemL(0);