diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-19 17:27:44 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-07-26 13:26:00 +0000 |
commit | b3959b515fce642b4f873a25f1c13c604512d9fe (patch) | |
tree | 9ddf427069c5740953c7feb7aba33ebc8e213826 /tests/auto/gui/text/qcssparser/tst_qcssparser.cpp | |
parent | a12cc29cf542cb7c325da6b266d1179d13c3b831 (diff) |
Update qcssscanner so it can parse our normal offline documentation CSS
Adds the three CSS3 attribute selectors.
During this the internal naming of the existing attribute-selectors have
been changed to be more clear, and the dash-matching has been fixed to
not just be beginsWith.
A non-breaking space have also been removed from the CSS.
Change-Id: Ia4db4a5a19e3ceee8c3c8a4b744149edd1d32bdc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/gui/text/qcssparser/tst_qcssparser.cpp')
-rw-r--r-- | tests/auto/gui/text/qcssparser/tst_qcssparser.cpp | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp index 51e9bf646a..95d1557300 100644 --- a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp +++ b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp @@ -113,6 +113,9 @@ static const char *tokenName(QCss::TokenType t) case QCss::CDC: return "CDC"; case QCss::INCLUDES: return "INCLUDES"; case QCss::DASHMATCH: return "DASHMATCH"; + case QCss::BEGINSWITH: return "BEGINSWITH"; + case QCss::ENDSWITH: return "ENDSWITH"; + case QCss::CONTAINS: return "CONTAINS"; case QCss::LBRACE: return "LBRACE"; case QCss::PLUS: return "PLUS"; case QCss::GREATER: return "GREATER"; @@ -615,11 +618,11 @@ void tst_QCssParser::selector_data() QCss::AttributeSelector attrSel; attrSel.name = "foo"; attrSel.value = "warning"; - attrSel.valueMatchCriterium = QCss::AttributeSelector::MatchContains; + attrSel.valueMatchCriterium = QCss::AttributeSelector::MatchIncludes; basic.attributeSelectors << attrSel; sel.basicSelectors << basic; - QTest::newRow("attr-contains") << QString("e[foo~=\"warning\"]") << sel; + QTest::newRow("attr-includes") << QString("e[foo~=\"warning\"]") << sel; } { @@ -630,11 +633,26 @@ void tst_QCssParser::selector_data() QCss::AttributeSelector attrSel; attrSel.name = "lang"; attrSel.value = "en"; - attrSel.valueMatchCriterium = QCss::AttributeSelector::MatchBeginsWith; + attrSel.valueMatchCriterium = QCss::AttributeSelector::MatchDashMatch; + basic.attributeSelectors << attrSel; + sel.basicSelectors << basic; + + QTest::newRow("attr-dash") << QString("e[lang|=\"en\"]") << sel; + } + + { + QCss::Selector sel; + QCss::BasicSelector basic; + + basic.elementName = "e"; + QCss::AttributeSelector attrSel; + attrSel.name = "foo"; + attrSel.value = "warning"; + attrSel.valueMatchCriterium = QCss::AttributeSelector::MatchContains; basic.attributeSelectors << attrSel; sel.basicSelectors << basic; - QTest::newRow("attr-contains") << QString("e[lang|=\"en\"]") << sel; + QTest::newRow("attr-contains") << QString("e[foo*=\"warning\"]") << sel; } { @@ -645,7 +663,7 @@ void tst_QCssParser::selector_data() QCss::AttributeSelector attrSel; attrSel.name = "class"; - attrSel.valueMatchCriterium = QCss::AttributeSelector::MatchContains; + attrSel.valueMatchCriterium = QCss::AttributeSelector::MatchIncludes; attrSel.value = "warning"; basic.attributeSelectors.append(attrSel); |