feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AutoTest: Fix uncheck all filter

Browse Source 
Change-Id: I0fe6b95b0aebc723f57546e796650cea4d3fd8d4
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2019-04-16 09:21:36 +02:00
parent 9f97878c6b
commit a182478d94
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/autotest/testresultmodel.cpp
View File

@@ -381,22 +381,27 @@ TestResultFilterModel::TestResultFilterModel(TestResultModel *sourceModel, QObje
m_sourceModel(sourceModel)
{
setSourceModel(sourceModel);
enableAllResultTypes();
enableAllResultTypes(true);
}
void TestResultFilterModel::enableAllResultTypes()
void TestResultFilterModel::enableAllResultTypes(bool enabled)
{
m_enabled << Result::Pass << Result::Fail << Result::ExpectedFail
<< Result::UnexpectedPass << Result::Skip << Result::MessageDebug
<< Result::MessageWarn << Result::MessageInternal << Result::MessageLocation
<< Result::MessageFatal << Result::Invalid << Result::BlacklistedPass
<< Result::BlacklistedFail << Result::BlacklistedXFail << Result::BlacklistedXPass
<< Result::Benchmark << Result::MessageIntermediate
<< Result::MessageCurrentTest << Result::MessageTestCaseStart
<< Result::MessageTestCaseSuccess << Result::MessageTestCaseSuccessWarn
<< Result::MessageTestCaseFail << Result::MessageTestCaseFailWarn
<< Result::MessageTestCaseEnd
<< Result::MessageInfo << Result::MessageSystem << Result::Application;
if (enabled) {
m_enabled << Result::Pass << Result::Fail << Result::ExpectedFail
<< Result::UnexpectedPass << Result::Skip << Result::MessageDebug
<< Result::MessageWarn << Result::MessageInternal << Result::MessageLocation
<< Result::MessageFatal << Result::Invalid << Result::BlacklistedPass
<< Result::BlacklistedFail << Result::BlacklistedXFail << Result::BlacklistedXPass
<< Result::Benchmark << Result::MessageIntermediate
<< Result::MessageCurrentTest << Result::MessageTestCaseStart
<< Result::MessageTestCaseSuccess << Result::MessageTestCaseSuccessWarn
<< Result::MessageTestCaseFail << Result::MessageTestCaseFailWarn
<< Result::MessageTestCaseEnd
<< Result::MessageInfo << Result::MessageSystem << Result::Application;
} else {
m_enabled.clear();
m_enabled << Result::MessageFatal << Result::MessageSystem;
}
invalidateFilter();
}

2
src/plugins/autotest/testresultmodel.h
View File

@@ -90,7 +90,7 @@ class TestResultFilterModel : public QSortFilterProxyModel
public:
explicit TestResultFilterModel(TestResultModel *sourceModel, QObject *parent = nullptr);
void enableAllResultTypes();
void enableAllResultTypes(bool enabled);
void toggleTestResultType(Result::Type type);
void clearTestResults();
bool hasResults();

2
src/plugins/autotest/testresultspane.cpp
View File

@@ -492,7 +492,7 @@ void TestResultsPane::checkAllFilter(bool checked)
if (action->isCheckable())
action->setChecked(checked);
}
m_filterModel->enableAllResultTypes();
m_filterModel->enableAllResultTypes(checked);
}
void TestResultsPane::filterMenuTriggered(QAction *action)