Fix unloading of file effects.

Includes a beefed up autotest for this problem.

Task-number: MOBILITY-1771

1 files changed, 27 insertions, 8 deletions

diff --git a/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp b/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp
index f79145463a..74410da4b4 100644
--- a/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp
+++ b/tests/auto/qfeedbackplugin/testplugin/qfeedbacktestplugin.cpp
@@ -51,7 +51,7 @@
 
 Q_EXPORT_PLUGIN2(feedback_testplugin, QFeedbackTestPlugin)
 
-QFeedbackTestPlugin::QFeedbackTestPlugin() : QObject(qApp)
+        QFeedbackTestPlugin::QFeedbackTestPlugin() : QObject(qApp), mHapticState(QFeedbackEffect::Stopped), mFileState(QFeedbackEffect::Stopped)
 {
     actuators_ << createFeedbackActuator(this, 7357);
 }
@@ -62,7 +62,7 @@ QFeedbackTestPlugin::~QFeedbackTestPlugin()
 
 QFeedbackInterface::PluginPriority QFeedbackTestPlugin::pluginPriority()
 {
-    return PluginLowPriority;
+    return PluginHighPriority; // to make sure we get used
 }
 
 QList<QFeedbackActuator*> QFeedbackTestPlugin::actuators()
@@ -120,31 +120,42 @@ void QFeedbackTestPlugin::updateEffectProperty(const QFeedbackHapticsEffect *eff
 void QFeedbackTestPlugin::setEffectState(const QFeedbackHapticsEffect *effect, QFeedbackEffect::State state)
 {
     Q_UNUSED(effect)
-    Q_UNUSED(state)
+    mHapticState = state;
 }
 
 QFeedbackEffect::State QFeedbackTestPlugin::effectState(const QFeedbackHapticsEffect *effect)
 {
     Q_UNUSED(effect)
-    return QFeedbackEffect::Stopped;
+    return mHapticState;
 }
 
 void QFeedbackTestPlugin::setLoaded(QFeedbackFileEffect *effect, bool load)
 {
     Q_UNUSED(effect)
-    Q_UNUSED(load)
+    if (effect->source() == QUrl("load")) {
+        // Succeed the load
+        if (load) {
+            mFileState = QFeedbackEffect::Loading;
+            reportLoadFinished(effect, true); // not strictly true
+        } else
+            mFileState = QFeedbackEffect::Stopped;
+    } else {
+        // Fail the load
+        if (load)
+            reportLoadFinished(effect, false);
+    }
 }
 
 void QFeedbackTestPlugin::setEffectState(QFeedbackFileEffect *effect, QFeedbackEffect::State state)
 {
     Q_UNUSED(effect)
-    Q_UNUSED(state)
+    mFileState = state;
 }
 
 QFeedbackEffect::State QFeedbackTestPlugin::effectState(const QFeedbackFileEffect *effect)
 {
     Q_UNUSED(effect)
-    return QFeedbackEffect::Stopped;
+    return mFileState;
 }
 
 int QFeedbackTestPlugin::effectDuration(const QFeedbackFileEffect *effect)
@@ -155,5 +166,13 @@ int QFeedbackTestPlugin::effectDuration(const QFeedbackFileEffect *effect)
 
 QStringList QFeedbackTestPlugin::supportedMimeTypes()
 {
-    return QStringList();
+    return QStringList() << "x-test/this is a test";
+}
+
+bool QFeedbackTestPlugin::play(QFeedbackEffect::ThemeEffect themeEffect)
+{
+    if (themeEffect == QFeedbackEffect::ThemeBasic)
+        return true;
+    else
+        return false;
 }