diff -r bc103bfb69cf -r 35488577e233 telutils/keysequencerecognitionservice/tsrc/ut_keysequencerecognitionprovider/ut_keysequencerecognitionprovider.cpp --- a/telutils/keysequencerecognitionservice/tsrc/ut_keysequencerecognitionprovider/ut_keysequencerecognitionprovider.cpp Tue Aug 10 13:19:41 2010 +0300 +++ b/telutils/keysequencerecognitionservice/tsrc/ut_keysequencerecognitionprovider/ut_keysequencerecognitionprovider.cpp Mon Aug 23 15:50:31 2010 +0300 @@ -66,8 +66,8 @@ void UT_KeySequenceRecognitionProvider::t_setupLocalization() { // localization setup ok - EXPECT(QTranslator::load).returns(true); - EXPECT(QCoreApplication::installTranslator).times(1); + EXPECT(QTranslator, load).returns(true); + EXPECT(QCoreApplication, installTranslator).times(1); QScopedPointer provider1( new KeySequenceRecognitionProvider()); @@ -75,8 +75,8 @@ QVERIFY(verify()); // localization setup fails - EXPECT(QTranslator::load).returns(false); - EXPECT(QCoreApplication::installTranslator).times(0); + EXPECT(QTranslator, load).returns(false); + EXPECT(QCoreApplication, installTranslator).times(0); QScopedPointer provider2( new KeySequenceRecognitionProvider()); @@ -88,11 +88,11 @@ void UT_KeySequenceRecognitionProvider::t_keySequenceValidator() { QString KExpectedValidator = "1|2|3"; - EXPECT(KeySequenceHandler::keySequenceValidator) + EXPECT(KeySequenceHandler, keySequenceValidator) .returns(QString("1")); - EXPECT(KeySequenceHandler::keySequenceValidator) + EXPECT(KeySequenceHandler, keySequenceValidator) .returns(QString("2")); - EXPECT(KeySequenceHandler::keySequenceValidator) + EXPECT(KeySequenceHandler, keySequenceValidator) .returns(QString("3")); QString actualValidator = m_provider->keySequenceValidator(); @@ -101,7 +101,7 @@ QVERIFY(verify()); // second query should not require validator string construction again - EXPECT(KeySequenceHandler::keySequenceValidator).times(0); + EXPECT(KeySequenceHandler, keySequenceValidator).times(0); actualValidator = m_provider->keySequenceValidator(); QCOMPARE(actualValidator, KExpectedValidator); QVERIFY(verify()); @@ -111,11 +111,11 @@ void UT_KeySequenceRecognitionProvider::t_keySequenceValidatorEmptyString() { QString KExpectedValidator = ""; - EXPECT(KeySequenceHandler::keySequenceValidator) + EXPECT(KeySequenceHandler, keySequenceValidator) .returns(QString("")); - EXPECT(KeySequenceHandler::keySequenceValidator) + EXPECT(KeySequenceHandler, keySequenceValidator) .returns(QString("")); - EXPECT(KeySequenceHandler::keySequenceValidator) + EXPECT(KeySequenceHandler, keySequenceValidator) .returns(QString("")); QString actualValidator = m_provider->keySequenceValidator();