1 files changed, 69 insertions, 1 deletions
diff --git a/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
index ae5502852c..d0e1e1cd74 100644
--- a/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
+++ b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 
 #include <QTest>
@@ -75,6 +75,8 @@ private slots:
 #endif
     void checkBorderAttributes_data();
     void checkBorderAttributes();
+    void checkTableBorderAttributes_data();
+    void checkTableBorderAttributes();
 
 #ifndef QT_NO_WIDGETS
     void columnWidthWithSpans();
@@ -1261,6 +1263,72 @@ void tst_QTextTable::checkBorderAttributes()
     }
 }
 
+void tst_QTextTable::checkTableBorderAttributes_data()
+{
+    QTest::addColumn<QString>("html");
+    QTest::addColumn<qreal>("tableBorderWidth");
+    QTest::addColumn<QTextFrameFormat::BorderStyle>("tableBorderStyle");
+    QTest::addColumn<QBrush>("tableBorderBrush");
+
+    const QString tableHtmlStart = QStringLiteral("<html><head><style>");
+    const QString tableHtmlEnd1 = QStringLiteral("</style></head><body>"
+                                                "<table><tr><td>One</td><td>Two</td></tr></table>"
+                                                "</body></html>");
+    const QString tableHtmlEnd2 = QStringLiteral("</style></head><body>"
+                                                "<table border=10><tr><td>One</td><td>Two</td></tr></table>"
+                                                "</body></html>");
+
+    QTest::newRow("table-border-attributes-shorthand")
+            << QString("%1"
+                       "table {"
+                            "border: 2px solid red;"
+                       "}"
+                       "%2").arg(tableHtmlStart).arg(tableHtmlEnd1)
+            << 2.0 << QTextFrameFormat::BorderStyle_Solid << QBrush(Qt::red);
+
+    QTest::newRow("table-border-attributes-explicit")
+            << QString("%1"
+                       "table {"
+                            "border-width: 2px;"
+                            "border-color: red;"
+                            "border-style: dashed;"
+                       "}"
+                       "%2").arg(tableHtmlStart).arg(tableHtmlEnd1)
+            << 2.0 << QTextFrameFormat::BorderStyle_Dashed << QBrush(Qt::red);
+
+    QTest::newRow("table-border-override")
+            << QString("%1"
+                       "table {"
+                          "border: 2px solid red;"
+                       "}"
+                       "%2").arg(tableHtmlStart).arg(tableHtmlEnd2)
+            << 2.0 << QTextFrameFormat::BorderStyle_Solid << QBrush(Qt::red);
+
+    QTest::newRow("table-border-default")
+            << QString("%1"
+                       "%2").arg(tableHtmlStart).arg(tableHtmlEnd2)
+            << 10.0 << QTextFrameFormat::BorderStyle_Outset << QBrush(Qt::darkGray);
+}
+
+void tst_QTextTable::checkTableBorderAttributes()
+{
+    QFETCH(QString, html);
+    QFETCH(qreal, tableBorderWidth);
+    QFETCH(QTextFrameFormat::BorderStyle, tableBorderStyle);
+    QFETCH(QBrush, tableBorderBrush);
+
+    QTextDocument doc;
+    doc.setHtml(html);
+    QTextCursor cursor(doc.firstBlock());
+    cursor.movePosition(QTextCursor::Right);
+
+    QTextTable *currentTable = cursor.currentTable();
+    QVERIFY(currentTable);
+    QCOMPARE(currentTable->format().border(), tableBorderWidth);
+    QCOMPARE(currentTable->format().borderStyle(), tableBorderStyle);
+    QCOMPARE(currentTable->format().borderBrush(), tableBorderBrush);
+}
+
 #ifndef QT_NO_WIDGETS
 void tst_QTextTable::columnWidthWithSpans()
 {