AutoTest: Unify container usage in TestFrameworkManager

And provide an accessor for the framework's priority which
will be needed later on.

Change-Id: I5a2480699d9467ee50e2cc44b9d4ff58f9e8da88
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2019-08-07 10:25:43 +02:00
parent 297410ba4e
commit 0d11d880ca
5 changed files with 17 additions and 10 deletions

View File

@@ -120,9 +120,9 @@ QList<Core::Id> TestFrameworkManager::sortedRegisteredFrameworkIds() const
return registered;
}
QVector<Core::Id> TestFrameworkManager::activeFrameworkIds() const
QList<Core::Id> TestFrameworkManager::activeFrameworkIds() const
{
QVector<Core::Id> active;
QList<Core::Id> active;
FrameworkIterator it = m_registeredFrameworks.begin();
FrameworkIterator end = m_registeredFrameworks.end();
for ( ; it != end; ++it) {
@@ -132,9 +132,9 @@ QVector<Core::Id> TestFrameworkManager::activeFrameworkIds() const
return active;
}
QVector<Core::Id> TestFrameworkManager::sortedActiveFrameworkIds() const
QList<Core::Id> TestFrameworkManager::sortedActiveFrameworkIds() const
{
QVector<Core::Id> active = activeFrameworkIds();
QList<Core::Id> active = activeFrameworkIds();
Utils::sort(active, [this] (const Core::Id &lhs, const Core::Id &rhs) {
return m_registeredFrameworks[lhs]->priority() < m_registeredFrameworks[rhs]->priority();
});
@@ -210,5 +210,12 @@ bool TestFrameworkManager::hasActiveFrameworks() const
return false;
}
unsigned TestFrameworkManager::priority(const Core::Id &frameworkId) const
{
if (ITestFramework *framework = m_registeredFrameworks.value(frameworkId))
return framework->priority();
return unsigned(-1);
}
} // namespace Internal
} // namespace Autotest