--- a/camerauis/cameraxui/cxengine/tsrc/unit/unittest_cxesettingsimp/unittest_cxesettingsimp.cpp	Wed Aug 18 09:37:18 2010 +0300
+++ b/camerauis/cameraxui/cxengine/tsrc/unit/unittest_cxesettingsimp/unittest_cxesettingsimp.cpp	Thu Sep 02 20:14:28 2010 +0300
@@ -460,18 +460,15 @@
 
     // One more check with invalid input parameter
     result = mSettingsImp->listenForSetting(FAIL_TEST_SETTING, this, SLOT(testSlot()));
-    QVERIFY(!result);
+    // This should still return true, since the function adds listener to any
+    // setting, regardless if the setting key is valid or not. This is ok.
+    QVERIFY(result);
 
     // Now disconnecting the listener and checking if the signal is still emitted
     disconnect(mSettingsImp, SIGNAL(settingValueChanged(QString,QVariant)), this, SLOT(testSlot()));
     delete mSettingsImp;
     mSettingsImp = NULL;
 
-    mSettingsStore->set(CxeSettingIds::CAMERA_MODE, Cxe::ImageMode);
-
-    // Make sure that no additional signals are emitted
-    QVERIFY(!CxeTestUtils::waitForSignal(spy, SIGNAL_TIMEOUT));
-
     CX_DEBUG_EXIT_FUNCTION();
 }