diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-10 11:41:33 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-21 22:01:20 +0200 |
commit | d25589e0529732996e405aaff8d6c46b012e1601 (patch) | |
tree | 29b596d0c2ca0e36aa9aea65f426ed393c660e78 /tests/auto/widgets/graphicsview/qgraphicsview | |
parent | b50daef9771d8829fc7f808898cbe051a5464b79 (diff) |
QTestlib: Enable comparing QList against initializer lists/arrays
It is unnecessary to create a QList container just for comparison.
Split out helpers for comparing sequence sizes and sequences from
qCompare(QList) and add a template for an array with a non-type template
parameter for the size.
One can then write something like:
const int expected[] = {10, 12,...};
QCOMPARE(QFontDatabase.pointSizes(...), expected)
Unfortunately, any commas in such an array will be misread by macro expansion
as macro argument separators, so any expected array with more than one entry
needs an extra macro expanding __VA_ARGS__.
Change-Id: Ie7c8dc20bf669bbb25f6d7f8562455f8d03968c8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests/auto/widgets/graphicsview/qgraphicsview')
-rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index 2dddcbe31e..84841428f0 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -948,7 +948,7 @@ void tst_QGraphicsView::rubberBandSelectionMode() sendMousePress(view.viewport(), QPoint(), Qt::LeftButton); sendMouseMove(view.viewport(), view.viewport()->rect().center(), Qt::LeftButton, Qt::LeftButton); - QCOMPARE(scene.selectedItems(), QList<QGraphicsItem *>() << rect); + QCOMPARE(scene.selectedItems(), {rect}); sendMouseRelease(view.viewport(), QPoint(), Qt::LeftButton); view.setRubberBandSelectionMode(Qt::ContainsItemShape); @@ -960,7 +960,7 @@ void tst_QGraphicsView::rubberBandSelectionMode() QVERIFY(scene.selectedItems().isEmpty()); sendMouseMove(view.viewport(), view.viewport()->rect().bottomRight(), Qt::LeftButton, Qt::LeftButton); - QCOMPARE(scene.selectedItems(), QList<QGraphicsItem *>() << rect); + QCOMPARE(scene.selectedItems(), {rect}); } void tst_QGraphicsView::rubberBandExtendSelection() @@ -990,7 +990,7 @@ void tst_QGraphicsView::rubberBandExtendSelection() // select first item item1->setSelected(true); - QCOMPARE(scene.selectedItems(), QList<QGraphicsItem *>() << item1); + QCOMPARE(scene.selectedItems(), {item1}); // first rubberband without modifier key sendMousePress(view.viewport(), view.mapFromScene(20, 115), Qt::LeftButton); |