diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-04-14 06:36:55 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-04-14 06:36:55 (GMT) |
| commit | a683587a5ffd07366d60f1c4eb56aaee090fcbc4 (patch) | |
| tree | 2403a648b9b0a4bd68823cdfa38a9d69e2252100 /tests | |
| parent | 90de3e5c903b67b2e5f3d7dc14266fe24f1daa23 (diff) | |
| parent | e2b31c909912c24bd87a4454dca8ae766e9aca52 (diff) | |
| download | Qt-a683587a5ffd07366d60f1c4eb56aaee090fcbc4.zip Qt-a683587a5ffd07366d60f1c4eb56aaee090fcbc4.tar.gz Qt-a683587a5ffd07366d60f1c4eb56aaee090fcbc4.tar.bz2 | |
Merge remote branch 'staging/4.7' into bearermanagement/mobility-changes-squash
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qcssparser/tst_qcssparser.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/auto/qcssparser/tst_qcssparser.cpp b/tests/auto/qcssparser/tst_qcssparser.cpp index ef102a0..966563c 100644 --- a/tests/auto/qcssparser/tst_qcssparser.cpp +++ b/tests/auto/qcssparser/tst_qcssparser.cpp @@ -1381,6 +1381,13 @@ void tst_QCssParser::shorthandBackgroundProperty() QTEST(image, "expectedImage"); QTEST(int(repeat), "expectedRepeatValue"); QTEST(int(alignment), "expectedAlignment"); + + //QTBUG-9674 : a second evaluation should give the same results + QVERIFY(v.extractBackground(&brush, &image, &repeat, &alignment, &origin, &attachment, &ignoredOrigin)); + QVERIFY(expectedBrush.color() == brush.color()); + QTEST(image, "expectedImage"); + QTEST(int(repeat), "expectedRepeatValue"); + QTEST(int(alignment), "expectedAlignment"); } void tst_QCssParser::pseudoElement_data() @@ -1644,6 +1651,12 @@ void tst_QCssParser::extractBorder() QVERIFY(widths[QCss::TopEdge] == expectedTopWidth); QVERIFY(styles[QCss::TopEdge] == expectedTopStyle); QVERIFY(colors[QCss::TopEdge] == expectedTopColor); + + //QTBUG-9674 : a second evaluation should give the same results + QVERIFY(extractor.extractBorder(widths, colors, styles, radii)); + QVERIFY(widths[QCss::TopEdge] == expectedTopWidth); + QVERIFY(styles[QCss::TopEdge] == expectedTopStyle); + QVERIFY(colors[QCss::TopEdge] == expectedTopColor); } void tst_QCssParser::noTextDecoration() |