From 34ed3f295be2a2c7dae156f86517236f5b07804d Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 12 Dec 2011 15:13:22 +0100 Subject: Remote Linux: Rework device testing Allow for a set of tests to be defined. This simplifies the code for the individual test to run and allows for a more flexible approach to device testing. MaddeDeviceTester is no longer needed due to that. Change-Id: I77fd2d53246dec2d8c6b584d0c73cc1134d7f47d Reviewed-by: Christian Kandeler Reviewed-by: Tobias Hunger --- .../genericlinuxdeviceconfigurationwizard.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp') diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp index bbb838d98d..8bba285cf4 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp @@ -30,12 +30,17 @@ **************************************************************************/ #include "genericlinuxdeviceconfigurationwizard.h" +#include "genericlinuxdeviceconfigurationfactory.h" #include "genericlinuxdeviceconfigurationwizardpages.h" #include "linuxdevicetestdialog.h" #include "linuxdevicetester.h" #include "portlist.h" #include "remotelinux_constants.h" +#include + +#include + using namespace Utils; namespace RemoteLinux { @@ -87,8 +92,16 @@ LinuxDeviceConfiguration::Ptr GenericLinuxDeviceConfigurationWizard::deviceConfi LinuxDeviceConfiguration::Ptr devConf = LinuxDeviceConfiguration::create(d->setupPage.configurationName(), QLatin1String(Constants::GenericLinuxOsType), LinuxDeviceConfiguration::Hardware, PortList::fromString(QLatin1String("10000-10100")), sshParams); - LinuxDeviceTestDialog dlg(devConf, new GenericLinuxDeviceTester(this), this); - dlg.exec(); + + GenericLinuxDeviceConfigurationFactory *factory = + ExtensionSystem::PluginManager::instance()->getObject(); + QTC_ASSERT(factory, return LinuxDeviceConfiguration::Ptr(0)); + + QDialog *dlg = factory->createDeviceAction(QLatin1String(Constants::GenericTestDeviceActionId), devConf, 0); + QTC_ASSERT(dlg, return LinuxDeviceConfiguration::Ptr(0)); + dlg->exec(); + delete dlg; + return devConf; } -- cgit v1.2.1