From 488c4aa0e94e9d50ad2a5355c47d1ffa63a7ad10 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@digia.com>
Date: Tue, 29 Oct 2013 09:41:56 +0100
Subject: [PATCH] Tests: Fix pluginmanager test
Change-Id: Id28825e437d9549016c66e9df6b4438eb827c10b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
.../pluginmanager/circularplugins/plugin1/plugin1.h | 1 +
.../pluginmanager/circularplugins/plugin1/plugin1.json | 1 +
.../pluginmanager/circularplugins/plugin2/plugin2.h | 1 +
.../pluginmanager/circularplugins/plugin2/plugin2.json | 1 +
.../pluginmanager/circularplugins/plugin3/plugin3.h | 1 +
.../pluginmanager/circularplugins/plugin3/plugin3.json | 1 +
.../pluginmanager/correctplugins1/plugin1/plugin1.h | 1 +
.../pluginmanager/correctplugins1/plugin1/plugin1.json | 1 +
.../pluginmanager/correctplugins1/plugin2/plugin2.h | 1 +
.../pluginmanager/correctplugins1/plugin2/plugin2.json | 1 +
.../pluginmanager/correctplugins1/plugin3/plugin3.h | 1 +
.../pluginmanager/correctplugins1/plugin3/plugin3.json | 1 +
tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp | 1 +
13 files changed, 13 insertions(+)
create mode 100644 tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.json
create mode 100644 tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.json
create mode 100644 tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.json
create mode 100644 tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.json
create mode 100644 tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.json
create mode 100644 tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.json
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h
index 8f55c8df5cb..875322014dd 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h
@@ -46,6 +46,7 @@ namespace Plugin1 {
class PLUGIN1_EXPORT MyPlugin1 : public ExtensionSystem::IPlugin
{
Q_OBJECT
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "plugin1.json")
public:
MyPlugin1();
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.json b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.json
new file mode 100644
index 00000000000..0967ef424bc
--- /dev/null
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.json
@@ -0,0 +1 @@
+{}
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h
index 7f7c7e18a47..0c761b2e75e 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h
@@ -46,6 +46,7 @@ namespace Plugin2 {
class PLUGIN2_EXPORT MyPlugin2 : public ExtensionSystem::IPlugin
{
Q_OBJECT
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "plugin2.json")
public:
MyPlugin2();
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.json b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.json
new file mode 100644
index 00000000000..0967ef424bc
--- /dev/null
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.json
@@ -0,0 +1 @@
+{}
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.h b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.h
index 5b47ebec9f7..604f182cd0b 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.h
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.h
@@ -46,6 +46,7 @@ namespace Plugin3 {
class PLUGIN3_EXPORT MyPlugin3 : public ExtensionSystem::IPlugin
{
Q_OBJECT
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "plugin3.json")
public:
MyPlugin3();
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.json b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.json
new file mode 100644
index 00000000000..0967ef424bc
--- /dev/null
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.json
@@ -0,0 +1 @@
+{}
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h
index aa337fd2096..41f518d2acd 100644
--- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h
@@ -46,6 +46,7 @@ namespace Plugin1 {
class PLUGIN1_EXPORT MyPlugin1 : public ExtensionSystem::IPlugin
{
Q_OBJECT
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "plugin1.json")
public:
MyPlugin1();
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.json b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.json
new file mode 100644
index 00000000000..0967ef424bc
--- /dev/null
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.json
@@ -0,0 +1 @@
+{}
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h
index da65f75d099..5f2143909b9 100644
--- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h
@@ -46,6 +46,7 @@ namespace Plugin2 {
class PLUGIN2_EXPORT MyPlugin2 : public ExtensionSystem::IPlugin
{
Q_OBJECT
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "plugin2.json")
public:
MyPlugin2();
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.json b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.json
new file mode 100644
index 00000000000..0967ef424bc
--- /dev/null
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.json
@@ -0,0 +1 @@
+{}
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h
index 5bafe2d41ec..7de6bbeccc9 100644
--- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h
@@ -45,6 +45,7 @@ namespace Plugin3 {
class PLUGIN3_EXPORT MyPlugin3 : public ExtensionSystem::IPlugin
{
Q_OBJECT
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "plugin3.json")
public:
MyPlugin3();
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.json b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.json
new file mode 100644
index 00000000000..0967ef424bc
--- /dev/null
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.json
@@ -0,0 +1 @@
+{}
diff --git a/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp b/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp
index 5abbb82c4d0..74cf6c7343a 100644
--- a/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp
+++ b/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp
@@ -90,6 +90,7 @@ void tst_PluginManager::init()
void tst_PluginManager::cleanup()
{
+ m_pm->shutdown();
delete m_pm;
delete m_objectAdded;
delete m_aboutToRemoveObject;
--
GitLab