diff options
author | Christian Stenger <christian.stenger@qt.io> | 2016-06-01 16:22:50 +0200 |
---|---|---|
committer | Christian Stenger <christian.stenger@qt.io> | 2016-06-09 11:50:26 +0000 |
commit | 5ef85949a81742b89fabbcfd752460312d64e6b4 (patch) | |
tree | ccf3a120f2cd1dabaeb724828944b34cec26b4e8 /src/plugins/autotest/autotestplugin.cpp | |
parent | 1681066c37e545da33a3c428b9cfec7974c8c627 (diff) |
AutoTest: Add test frame work handling
Mainly a preparation for enabling/disabling test frame works.
Change-Id: I0bbea7e055a607517ef8193587c229cadf0de027
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Diffstat (limited to 'src/plugins/autotest/autotestplugin.cpp')
-rw-r--r-- | src/plugins/autotest/autotestplugin.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/plugins/autotest/autotestplugin.cpp b/src/plugins/autotest/autotestplugin.cpp index b68877d92b..df8ece06ea 100644 --- a/src/plugins/autotest/autotestplugin.cpp +++ b/src/plugins/autotest/autotestplugin.cpp @@ -26,6 +26,7 @@ #include "autotestplugin.h" #include "autotestconstants.h" #include "testcodeparser.h" +#include "testframeworkmanager.h" #include "testrunner.h" #include "testsettings.h" #include "testsettingspage.h" @@ -35,6 +36,10 @@ #include "testresultspane.h" #include "testnavigationwidget.h" +#include "qtest/qttestframework.h" +#include "quick/quicktestframework.h" +#include "gtest/gtestframework.h" + #include <coreplugin/icore.h> #include <coreplugin/icontext.h> #include <coreplugin/actionmanager/actionmanager.h> @@ -73,11 +78,7 @@ AutotestPlugin::AutotestPlugin() AutotestPlugin::~AutotestPlugin() { - // Delete members - TestTreeModel *model = TestTreeModel::instance(); - delete model; - TestRunner *runner = TestRunner::instance(); - delete runner; + delete m_frameworkManager; } AutotestPlugin *AutotestPlugin::instance() @@ -129,6 +130,12 @@ bool AutotestPlugin::initialize(const QStringList &arguments, QString *errorStri initializeMenuEntries(); + m_frameworkManager = TestFrameworkManager::instance(); + m_frameworkManager->registerTestFramework(new QtTestFramework); + m_frameworkManager->registerTestFramework(new QuickTestFramework); + m_frameworkManager->registerTestFramework(new GTestFramework); + TestTreeModel::instance()->syncTestFrameworks(); + m_settings->fromSettings(ICore::settings()); addAutoReleasedObject(new TestSettingsPage(m_settings)); addAutoReleasedObject(new TestNavigationWidgetFactory); |