test

Author: danmar

gui/resultitem.h

@@ -19,14 +19,14 @@
 #ifndef RESULTITEM_H
 #define RESULTITEM_H
 
-#include <QStandardItem>
 #include "erroritem.h"
+#include <QStandardItem>
 #include <QSharedPointer>
 
 class ResultItem : public QStandardItem
 {
 public:
-    enum class Type {file, message, note};
+    enum class Type: std::uint8_t {file, message, note};
 
     ResultItem(QSharedPointer<ErrorItem> errorItem, Type type, int errorPathIndex);
     QSharedPointer<ErrorItem> errorItem;

gui/test/resultstree/testresultstree.cpp

@@ -134,6 +134,70 @@ void TestResultsTree::test1() const
     QCOMPARE(tree.isRowHidden(0,QModelIndex()), false); // Show item
 }
 
+static QErrorPathItem createErrorPathItem(QString file, int line, int column, QString info) {
+    QErrorPathItem ret;
+    ret.file = file;
+    ret.line = line;
+    ret.column = column;
+    ret.info = info;
+    return ret;
+}
+
+static ErrorItem createErrorItem(QString file, int line, Severity sev, QString message, QString id) {
+    ErrorItem ret;
+    ret.errorId = id;
+    ret.severity = sev;
+    ret.cwe = ret.hash = 0;
+    ret.file0 = file;
+    ret.inconclusive = false;
+    ret.message = ret.summary = message;
+    ret.errorPath << createErrorPathItem(file, line, 1, message);
+    return ret;
+}
+
+void TestResultsTree::resultsInSameFile() const
+{
+    ResultsTree tree(nullptr);
+    tree.addErrorItem(createErrorItem("file1.c", 10, Severity::style, "test", "bugId"));
+    tree.addErrorItem(createErrorItem("file1.c", 20, Severity::style, "test", "bugId"));
+    QStandardItemModel* 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);
+    QCOMPARE(fileItem->getType(), ResultItem::Type::file);
+    QCOMPARE(fileItem->text(), "file1.c");
+    QCOMPARE(fileItem->getErrorPathItem().file, "file1.c");
+    QVERIFY(fileItem->rowCount() == 2);
+
+    const ResultItem* res1 = dynamic_cast<ResultItem*>(fileItem->child(0,0));
+    QVERIFY(res1 != nullptr);
+    QCOMPARE(res1->text(), "file1.c");
+    QVERIFY(res1->errorItem != nullptr);
+    QCOMPARE(res1->errorItem->toString(), "file1.c:10:1:style: test [bugId]");
+    QVERIFY(res1->rowCount() == 0);
+    for (int col = 0; col < fileItem->columnCount(); ++col) {
+        const ResultItem* item = dynamic_cast<ResultItem*>(fileItem->child(0,col));
+        QVERIFY(item);
+        QCOMPARE(item->errorItem.get(), res1->errorItem.get());
+        QCOMPARE(item->getType(), ResultItem::Type::message);
+    }
+
+    const ResultItem* res2 = dynamic_cast<ResultItem*>(fileItem->child(1,0));
+    QVERIFY(res2 != nullptr);
+    QCOMPARE(res2->text(), "file1.c");
+    QVERIFY(res2->errorItem != nullptr);
+    QCOMPARE(res2->errorItem->toString(), "file1.c:20:1:style: test [bugId]");
+    QVERIFY(res2->rowCount() == 0);
+    for (int col = 0; col < fileItem->columnCount(); ++col) {
+        const ResultItem* item = dynamic_cast<ResultItem*>(fileItem->child(1,col));
+        QVERIFY(item);
+        QCOMPARE(item->errorItem.get(), res2->errorItem.get());
+        QCOMPARE(item->getType(), ResultItem::Type::message);
+    }
+}
+
 void TestResultsTree::testReportType() const
 {
     TestReport report("{id},{classification},{guideline}");

gui/test/resultstree/testresultstree.h

@@ -23,6 +23,7 @@ class TestResultsTree : public QObject {
 
 private slots:
     void test1() const;
+    void resultsInSameFile() const;
     void testReportType() const;
     void testGetGuidelineError() const;
 };