show misra warnings

Author: danmar

gui/resultstree.cpp

@@ -241,26 +241,13 @@ bool ResultsTree::addErrorItem(const ErrorItem& errorItem)
 
     QSharedPointer<ErrorItem> errorItemPtr{new ErrorItem(errorItem)};
 
-    bool showItem = true;
-
-    // Ids that are temporarily hidden..
-    if (mHiddenMessageId.contains(errorItem.errorId))
-        showItem = false;
-
-    //If specified, filter on summary, message, filename, and id
-    if (showItem && !mFilter.isEmpty() && !errorItem.filterMatch(mFilter))
-        showItem = false;
-
-    if (showItem) {
-        if (mReportType == ReportType::normal)
-            showItem = mShowSeverities.isShown(errorItemPtr->severity);
-        else {
-            errorItemPtr->guideline = getGuideline(mReportType, mGuideline, errorItemPtr->errorId, errorItemPtr->severity);
-            errorItemPtr->classification = getClassification(mReportType, errorItemPtr->guideline);
-            showItem = !errorItemPtr->classification.isEmpty() && mShowSeverities.isShown(getSeverityFromClassification(errorItemPtr->classification));
-        }
+    if (mReportType != ReportType::normal) {
+        errorItemPtr->guideline = getGuideline(mReportType, mGuideline, errorItemPtr->errorId, errorItemPtr->severity);
+        errorItemPtr->classification = getClassification(mReportType, errorItemPtr->guideline);
     }
 
+    const bool showItem = !isErrorItemHidden(errorItemPtr);
+
     // if there is at least one error that is not hidden, we have a visible error
     mVisibleErrors |= showItem;
 
@@ -540,28 +527,7 @@ void ResultsTree::refreshTree()
             }
 
             //Check if this error should be hidden
-            bool hide = child->hidden || mHiddenMessageId.contains(child->errorItem->errorId);
-
-            if (!hide) {
-                if (mReportType == ReportType::normal)
-                    hide = !mShowSeverities.isShown(child->errorItem->severity);
-                else {
-                    hide = child->errorItem->classification.isEmpty() || !mShowSeverities.isShown(child->errorItem->severity);
-                }
-            }
-
-            // If specified, filter on summary, message, filename, and id
-            if (!hide && !mFilter.isEmpty()) {
-                hide = !child->errorItem->filterMatch(mFilter);
-            }
-
-            // Tool filter
-            if (!hide) {
-                if (child->errorItem->errorId.startsWith("clang"))
-                    hide = !mShowClang;
-                else
-                    hide = !mShowCppcheck;
-            }
+            const bool hide = child->hidden || isErrorItemHidden(child->errorItem);
 
             if (!hide) {
                 showFile = true;
@@ -578,6 +544,32 @@ void ResultsTree::refreshTree()
     sortByColumn(header()->sortIndicatorSection(), header()->sortIndicatorOrder());
 }
 
+bool ResultsTree::isErrorItemHidden(const QSharedPointer<ErrorItem> errorItem) const {
+    //Check if this error should be hidden
+    if (mHiddenMessageId.contains(errorItem->errorId))
+        return true;
+
+    bool hide;
+    if (mReportType == ReportType::normal)
+        hide = !mShowSeverities.isShown(errorItem->severity);
+    else
+        hide = errorItem->classification.isEmpty() || !mShowSeverities.isShown(getSeverityFromClassification(errorItem->classification));
+
+    // If specified, filter on summary, message, filename, and id
+    if (!hide && !mFilter.isEmpty())
+        hide = !errorItem->filterMatch(mFilter);
+
+    // Tool filter
+    if (!hide) {
+        if (errorItem->isClangResult())
+            hide = !mShowClang;
+        else
+            hide = !mShowCppcheck;
+    }
+
+    return hide;
+}
+
 ResultItem *ResultsTree::ensureFileItem(const QSharedPointer<ErrorItem>& errorItem, bool hide)
 {
     QString name = QDir::toNativeSeparators(stripPath(errorItem->getFile(), false));

gui/resultstree.h

@@ -208,6 +208,13 @@ class ResultsTree : public QTreeView {
 
     void setReportType(ReportType reportType);
 
+    /**
+     * @brief should errorItem be hidden by filter/severity/etc?
+     * @param errorItem error item
+     * @return true if error item should be hidden
+     */
+    bool isErrorItemHidden(const QSharedPointer<ErrorItem> errorItem) const;
+
 signals:
     /**
      * @brief Signal that results have been hidden or shown

gui/test/resultstree/testresultstree.cpp

@@ -303,5 +303,50 @@ void TestResultsTree::testGetGuidelineError() const
     QCOMPARE(report.output, "id1,Required,1.3");
 }
 
+void TestResultsTree::misraCReportShowClassifications() const
+{
+    ResultsTree tree(nullptr);
+    tree.showResults(ShowTypes::ShowType::ShowErrors, true);
+    tree.showResults(ShowTypes::ShowType::ShowWarnings, true);
+    tree.showResults(ShowTypes::ShowType::ShowStyle, true);
+    tree.setReportType(ReportType::misraC2012);
+    tree.addErrorItem(createErrorItem("file1.c", 10, Severity::style, "some rule text", "premium-misra-c-2012-1.1")); // Required
+    tree.addErrorItem(createErrorItem("file1.c", 20, Severity::style, "some rule text", "premium-misra-c-2012-1.2")); // Advisory
+    tree.addErrorItem(createErrorItem("file1.c", 30, Severity::style, "some rule text", "premium-misra-c-2012-9.1")); // Mandatory
+    QCOMPARE(tree.isRowHidden(0, QModelIndex()), false);
+
+    const auto* model = dynamic_cast<QStandardItemModel*>(tree.model());
+    QVERIFY(model != nullptr);
+    QVERIFY(model->rowCount() == 1);
+    const ResultItem* fileItem = dynamic_cast<ResultItem*>(model->item(0,0));
+    QVERIFY(fileItem != nullptr);
+    QVERIFY(fileItem->rowCount() == 3);
+
+    QCOMPARE(tree.isRowHidden(0, fileItem->index()), false);
+    QCOMPARE(tree.isRowHidden(1, fileItem->index()), false);
+    QCOMPARE(tree.isRowHidden(2, fileItem->index()), false);
+
+    tree.showResults(ShowTypes::ShowType::ShowErrors, false);
+    tree.showResults(ShowTypes::ShowType::ShowWarnings, true);
+    tree.showResults(ShowTypes::ShowType::ShowStyle, true);
+    QCOMPARE(tree.isRowHidden(0, fileItem->index()), false);
+    QCOMPARE(tree.isRowHidden(1, fileItem->index()), false);
+    QCOMPARE(tree.isRowHidden(2, fileItem->index()), true);
+
+    tree.showResults(ShowTypes::ShowType::ShowErrors, true);
+    tree.showResults(ShowTypes::ShowType::ShowWarnings, false);
+    tree.showResults(ShowTypes::ShowType::ShowStyle, true);
+    QCOMPARE(tree.isRowHidden(0, fileItem->index()), true);
+    QCOMPARE(tree.isRowHidden(1, fileItem->index()), false);
+    QCOMPARE(tree.isRowHidden(2, fileItem->index()), false);
+
+    tree.showResults(ShowTypes::ShowType::ShowErrors, true);
+    tree.showResults(ShowTypes::ShowType::ShowWarnings, true);
+    tree.showResults(ShowTypes::ShowType::ShowStyle, false);
+    QCOMPARE(tree.isRowHidden(0, fileItem->index()), false);
+    QCOMPARE(tree.isRowHidden(1, fileItem->index()), true);
+    QCOMPARE(tree.isRowHidden(2, fileItem->index()), false);
+}
+
 QTEST_MAIN(TestResultsTree)
 

gui/test/resultstree/testresultstree.h

@@ -27,4 +27,5 @@ private slots:
     void resultsInSameFile() const;
     void testReportType() const;
     void testGetGuidelineError() const;
+    void misraCReportShowClassifications() const;
 };