Changes: Fixed unit tests

RevBy: TrustMe

4 files changed, 12 insertions, 11 deletions

diff --git a/tests/ut_mappletmetadata/ut_mappletmetadata.cpp b/tests/ut_mappletmetadata/ut_mappletmetadata.cpp
index f94139d7..ff31e1ff 100644
--- a/tests/ut_mappletmetadata/ut_mappletmetadata.cpp
+++ b/tests/ut_mappletmetadata/ut_mappletmetadata.cpp
@@ -22,7 +22,7 @@
 #include "ut_mappletmetadata.h"
 #include "mappletmetadata.h"
 
-QString gType = "MApplet";
+QString gType = "X-MeeGoApplet";
 QString gRunner = "";
 QString gApplet = "";
 QString gName = "";
@@ -40,9 +40,9 @@ QString MDesktopEntry::value(const QString &key) const
         return QString(gIcon);
     } else if (key == "Desktop Entry/Exec") {
         return QString(gRunner);
-    } else if (key == "M/X-MApplet-Applet") {
+    } else if (key == "X-MeeGoApplet/Applet") {
         return QString(gApplet);
-    } else if (key == "M/X-MApplet-Identifier") {
+    } else if (key == "X-MeeGoApplet/Identifier") {
         return QString(gExtraIdentifier);
     }
     return QString();
@@ -58,9 +58,9 @@ bool MDesktopEntry::contains(const QString &key) const
         return gIcon != "";
     } else if (key == "Desktop Entry/Exec") {
         return gRunner != "";
-    } else if (key == "M/X-MApplet-Applet") {
+    } else if (key == "X-MeeGoApplet/Applet") {
         return gApplet != "";
-    } else if (key == "M/X-MApplet-Identifier") {
+    } else if (key == "X-MeeGoApplet/Identifier") {
         return gExtraIdentifier != "";
     }
     return false;
@@ -167,9 +167,9 @@ void Ut_MAppletMetaData::testIconMissing()
 void Ut_MAppletMetaData::testExtraIdentifier()
 {
     gExtraIdentifier = "";
-    QVERIFY(!m_subject->contains("M/X-MApplet-Identifier"));
+    QVERIFY(!m_subject->contains("X-MeeGoApplet/Identifier"));
     gExtraIdentifier = "foo";
-    QVERIFY(m_subject->contains("M/X-MApplet-Identifier"));
+    QVERIFY(m_subject->contains("X-MeeGoApplet/Identifier"));
 }
 
 void Ut_MAppletMetaData::testResourceIdentifier()
diff --git a/tests/ut_mapplicationextensionloader/ut_mapplicationextensionloader.cpp b/tests/ut_mapplicationextensionloader/ut_mapplicationextensionloader.cpp
index e200d04f..6ccb3dc3 100644
--- a/tests/ut_mapplicationextensionloader/ut_mapplicationextensionloader.cpp
+++ b/tests/ut_mapplicationextensionloader/ut_mapplicationextensionloader.cpp
@@ -52,7 +52,7 @@ QString MApplicationExtensionMetaData::extensionBinary() const
 
 QString MApplicationExtensionMetaData::interface() const
 {
-    return "com.nokia.m.core.ApplicationExtensionInterface/1.0";
+    return "com.meego.core.MApplicationExtensionInterface/1.0";
 }
 
 // QPluginLoader stubs
@@ -112,7 +112,7 @@ void Ut_MApplicationExtensionLoader::testExtensionLoading()
     QVERIFY(extension != NULL);
     QCOMPARE(extension, dynamic_cast<MApplicationExtensionInterface *>(QPluginLoader_instance_return));
     QCOMPARE(gQPluginLoaderFileName, QString("TestExtensionBinary"));
-    QCOMPARE(initializedInterface, QString("com.nokia.m.core.ApplicationExtensionInterface/1.0"));
+    QCOMPARE(initializedInterface, QString("com.meego.core.MApplicationExtensionInterface/1.0"));
 }
 
 void Ut_MApplicationExtensionLoader::testExtensionLoadingFailNullExtensionObject()
diff --git a/tests/ut_mapplicationextensionloader/ut_mapplicationextensionloader.h b/tests/ut_mapplicationextensionloader/ut_mapplicationextensionloader.h
index 7a8e1d50..3437c040 100644
--- a/tests/ut_mapplicationextensionloader/ut_mapplicationextensionloader.h
+++ b/tests/ut_mapplicationextensionloader/ut_mapplicationextensionloader.h
@@ -41,7 +41,7 @@ class BadApplicationExtensionInterface
 {
 };
 
-Q_DECLARE_INTERFACE(BadApplicationExtensionInterface, "com.nokia.m.core.BadApplicationExtensionInterface/1.0")
+Q_DECLARE_INTERFACE(BadApplicationExtensionInterface, "com.meego.core.BadApplicationExtensionInterface/1.0")
 
 /*!
  * A bad application extension that does not derive from the correct interface
diff --git a/tests/ut_mapplicationextensionmanager/ut_mapplicationextensionmanager.cpp b/tests/ut_mapplicationextensionmanager/ut_mapplicationextensionmanager.cpp
index 71fdffcc..87e1900d 100644
--- a/tests/ut_mapplicationextensionmanager/ut_mapplicationextensionmanager.cpp
+++ b/tests/ut_mapplicationextensionmanager/ut_mapplicationextensionmanager.cpp
@@ -72,7 +72,7 @@ bool QDir::exists() const
     return true;
 }
 
-const QString interfaceName("com.nokia.m.core.ApplicationExtensionInterface/1.0");
+const QString interfaceName("com.meego.core.MApplicationExtensionInterface/1.0");
 
 void SignalListener::extensionInstantiated(MApplicationExtensionInterface *extension)
 {
@@ -142,6 +142,7 @@ void Ut_MApplicationExtensionManager::initTestCase()
     manager = NULL;
 
     gDefaultMApplicationExtensionMetaDataStub.stubReset();
+    gDefaultMDesktopEntryStub.stubSetReturnValue("type", QString("X-MeeGoApplicationExtension"));
 }
 
 void Ut_MApplicationExtensionManager::cleanupTestCase()