diff --git a/plugins/perforce/kdevperforce.json b/plugins/perforce/kdevperforce.json --- a/plugins/perforce/kdevperforce.json +++ b/plugins/perforce/kdevperforce.json @@ -52,9 +52,6 @@ "Version": "5.0" }, "X-KDevelop-Category": "Global", - "X-KDevelop-IRequired": [ - "org.kdevelop.IExecutePlugin" - ], "X-KDevelop-Interfaces": [ "org.kdevelop.IBasicVersionControl", "org.kdevelop.ICentralizedVersionControl" diff --git a/plugins/perforce/tests/test_perforce.h b/plugins/perforce/tests/test_perforce.h --- a/plugins/perforce/tests/test_perforce.h +++ b/plugins/perforce/tests/test_perforce.h @@ -26,17 +26,15 @@ class PerforcePlugin; -namespace KDevelop -{ -class TestCore; -} - class PerforcePluginTest : public QObject { Q_OBJECT private Q_SLOTS: + void initTestCase(); + void cleanupTestCase(); void init(); void cleanup(); + void testAdd(); void testEdit(); void testEditMultipleFiles(); @@ -50,7 +48,6 @@ void testDiff(); private: PerforcePlugin* m_plugin; - KDevelop::TestCore* m_core; void removeTempDirsIfAny(); void createNewTempDirs(); }; diff --git a/plugins/perforce/tests/test_perforce.cpp b/plugins/perforce/tests/test_perforce.cpp --- a/plugins/perforce/tests/test_perforce.cpp +++ b/plugins/perforce/tests/test_perforce.cpp @@ -47,12 +47,22 @@ using namespace KDevelop; +void PerforcePluginTest::initTestCase() +{ + AutoTestShell::init({QStringLiteral("kdevperforce")}); + TestCore::initialize(); + m_plugin = new PerforcePlugin(TestCore::self()); +} + +void PerforcePluginTest::cleanupTestCase() +{ + delete m_plugin; + TestCore::shutdown(); +} + + void PerforcePluginTest::init() { - AutoTestShell::init({"kdevperforce"}); - m_core = new TestCore(); - m_core->initialize(); - m_plugin = new PerforcePlugin(m_core); /// During test we are setting the executable the plugin uses to our own stub m_plugin->m_perforceExecutable = P4_CLIENT_STUB_EXE; removeTempDirsIfAny(); @@ -102,8 +112,6 @@ void PerforcePluginTest::cleanup() { - m_core->cleanup(); - delete m_core; removeTempDirsIfAny(); }