diff options
author | Antti Pulakka <ext-antti.j.pulakka@nokia.com> | 2010-09-14 11:14:21 +0300 |
---|---|---|
committer | Daniel d'Andrada <daniel.dandrada@nokia.com> | 2010-09-16 08:00:11 +0300 |
commit | df069e8e49bda3878fe57de810849c17f2184a30 (patch) | |
tree | f7ece761a420cd55d6eadbfd4513c4aba3baa3d9 /tests/ut_mfeedback/ut_mfeedback.cpp | |
parent | 3110119fed8b4ce2b033fe30889aeb0d11cd39e9 (diff) |
Changes: Deprecated MFeedbackPlayer class
RevBy: Daniel d'Andrada
Details:
The goal is to allow hiding of MFeedbackPlayer class from the public API.
All necessary functionality regarding to input feedbacks should come from
class MFeedback. Please note the deprecation of MApplication::feedbackPlayer()
and MComponentData::feedbackPlayer() as well.
Updated unit test for MFeedback
- Added test against MFeedback::play(const QString&)
Adapted implementation for MFeedbackPlayer deprecation
Updated input feedback documentation
Diffstat (limited to 'tests/ut_mfeedback/ut_mfeedback.cpp')
-rw-r--r-- | tests/ut_mfeedback/ut_mfeedback.cpp | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/tests/ut_mfeedback/ut_mfeedback.cpp b/tests/ut_mfeedback/ut_mfeedback.cpp index dccaa5a7..c00576e2 100644 --- a/tests/ut_mfeedback/ut_mfeedback.cpp +++ b/tests/ut_mfeedback/ut_mfeedback.cpp @@ -61,11 +61,13 @@ void Ut_MFeedback::name() } /* - * Check that MFeedback playing works as expected. + * Check that MFeedback::play() works as expected. */ void Ut_MFeedback::play() { - MFeedbackPlayer *testPlayer; + MFeedbackPlayer *testPlayer = MApplication::feedbackPlayer(); + testPlayer->playedFeedbacks.clear(); + MFeedback feedback1("press-foo"); MFeedback feedback2; MFeedback feedback3("release-foo"); @@ -78,7 +80,6 @@ void Ut_MFeedback::play() feedback4.play(); // See that the feedbacks actually got played - testPlayer = MApplication::feedbackPlayer(); QCOMPARE(testPlayer->playedFeedbacks.size(), static_cast<int>(4)); QCOMPARE(testPlayer->playedFeedbacks.at(0), QString("press-foo")); QCOMPARE(testPlayer->playedFeedbacks.at(1), QString()); @@ -86,5 +87,23 @@ void Ut_MFeedback::play() QCOMPARE(testPlayer->playedFeedbacks.at(3), QString("cancel-foo")); } +/* + * Check that MFeedback::play(const QString&) works as expected. + */ +void Ut_MFeedback::playWithName() +{ + MFeedbackPlayer *testPlayer = MApplication::feedbackPlayer(); + testPlayer->playedFeedbacks.clear(); + + // Play the feedbacks + MFeedback::play("press-bar"); + MFeedback::play("cancel-everything"); + + // See that the feedbacks actually got played + QCOMPARE(testPlayer->playedFeedbacks.size(), static_cast<int>(2)); + QCOMPARE(testPlayer->playedFeedbacks.at(0), QString("press-bar")); + QCOMPARE(testPlayer->playedFeedbacks.at(1), QString("cancel-everything")); +} + QTEST_MAIN(Ut_MFeedback) |