diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp index 7c40afb2471..cb0200bae7a 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp @@ -3191,46 +3191,78 @@ void tst_QGraphicsItem::graphicsitem_cast() QGraphicsTextItem textItem; const QGraphicsTextItem *pTextItem = &textItem; - QVERIFY(qgraphicsitem_cast(&pathItem)); - //QVERIFY(qgraphicsitem_cast(&pathItem)); - QVERIFY(qgraphicsitem_cast(&pathItem)); - QVERIFY(qgraphicsitem_cast(pPathItem)); - QVERIFY(qgraphicsitem_cast(pPathItem)); + QCOMPARE_EQ(qgraphicsitem_cast(&pathItem), + dynamic_cast(&pathItem)); + //QCOMPARE_EQ(qgraphicsitem_cast(&pathItem), + // dynamic_cast(&pathItem)); + QCOMPARE_EQ(qgraphicsitem_cast(&pathItem), + dynamic_cast(&pathItem)); + QCOMPARE_EQ(qgraphicsitem_cast(pPathItem), + dynamic_cast(pPathItem)); + QCOMPARE_EQ(qgraphicsitem_cast(pPathItem), + dynamic_cast(pPathItem)); - QVERIFY(qgraphicsitem_cast(&rectItem)); - QVERIFY(qgraphicsitem_cast(&rectItem)); - QVERIFY(qgraphicsitem_cast(pRectItem)); - QVERIFY(qgraphicsitem_cast(pRectItem)); + QCOMPARE_EQ(qgraphicsitem_cast(&rectItem), + dynamic_cast(&rectItem)); + QCOMPARE_EQ(qgraphicsitem_cast(&rectItem), + dynamic_cast(&rectItem)); + QCOMPARE_EQ(qgraphicsitem_cast(pRectItem), + dynamic_cast(pRectItem)); + QCOMPARE_EQ(qgraphicsitem_cast(pRectItem), + dynamic_cast(pRectItem)); - QVERIFY(qgraphicsitem_cast(&ellipseItem)); - QVERIFY(qgraphicsitem_cast(&ellipseItem)); - QVERIFY(qgraphicsitem_cast(pEllipseItem)); - QVERIFY(qgraphicsitem_cast(pEllipseItem)); + QCOMPARE_EQ(qgraphicsitem_cast(&ellipseItem), + dynamic_cast(&ellipseItem)); + QCOMPARE_EQ(qgraphicsitem_cast(&ellipseItem), + dynamic_cast(&ellipseItem)); + QCOMPARE_EQ(qgraphicsitem_cast(pEllipseItem), + dynamic_cast(pEllipseItem)); + QCOMPARE_EQ(qgraphicsitem_cast(pEllipseItem), + dynamic_cast(pEllipseItem)); - QVERIFY(qgraphicsitem_cast(&polygonItem)); - //QVERIFY(qgraphicsitem_cast(&polygonItem)); - QVERIFY(qgraphicsitem_cast(&polygonItem)); - QVERIFY(qgraphicsitem_cast(pPolygonItem)); - QVERIFY(qgraphicsitem_cast(pPolygonItem)); + QCOMPARE_EQ(qgraphicsitem_cast(&polygonItem), + dynamic_cast(&polygonItem)); + //QCOMPARE_EQ(qgraphicsitem_cast(&polygonItem), + // dynamic_cast(&polygonItem)); + QCOMPARE_EQ(qgraphicsitem_cast(&polygonItem), + dynamic_cast(&polygonItem)); + QCOMPARE_EQ(qgraphicsitem_cast(pPolygonItem), + dynamic_cast(pPolygonItem)); + QCOMPARE_EQ(qgraphicsitem_cast(pPolygonItem), + dynamic_cast(pPolygonItem)); - QVERIFY(qgraphicsitem_cast(&lineItem)); - QVERIFY(qgraphicsitem_cast(&lineItem)); - QVERIFY(qgraphicsitem_cast(pLineItem)); - QVERIFY(qgraphicsitem_cast(pLineItem)); + QCOMPARE_EQ(qgraphicsitem_cast(&lineItem), + dynamic_cast(&lineItem)); + QCOMPARE_EQ(qgraphicsitem_cast(&lineItem), + dynamic_cast(&lineItem)); + QCOMPARE_EQ(qgraphicsitem_cast(pLineItem), + dynamic_cast(pLineItem)); + QCOMPARE_EQ(qgraphicsitem_cast(pLineItem), + dynamic_cast(pLineItem)); - QVERIFY(qgraphicsitem_cast(&pixmapItem)); - QVERIFY(qgraphicsitem_cast(&pixmapItem)); - QVERIFY(qgraphicsitem_cast(pPixmapItem)); - QVERIFY(qgraphicsitem_cast(pPixmapItem)); + QCOMPARE_EQ(qgraphicsitem_cast(&pixmapItem), + dynamic_cast(&pixmapItem)); + QCOMPARE_EQ(qgraphicsitem_cast(&pixmapItem), + dynamic_cast(&pixmapItem)); + QCOMPARE_EQ(qgraphicsitem_cast(pPixmapItem), + dynamic_cast(pPixmapItem)); + QCOMPARE_EQ(qgraphicsitem_cast(pPixmapItem), + dynamic_cast(pPixmapItem)); - QVERIFY(qgraphicsitem_cast(&textItem)); - QVERIFY(qgraphicsitem_cast(&textItem)); - QVERIFY(qgraphicsitem_cast(pTextItem)); - QVERIFY(qgraphicsitem_cast(pTextItem)); + QCOMPARE_EQ(qgraphicsitem_cast(&textItem), + dynamic_cast(&textItem)); + QCOMPARE_EQ(qgraphicsitem_cast(&textItem), + dynamic_cast(&textItem)); + QCOMPARE_EQ(qgraphicsitem_cast(pTextItem), + dynamic_cast(pTextItem)); + QCOMPARE_EQ(qgraphicsitem_cast(pTextItem), + dynamic_cast(pTextItem)); // and some casts that _should_ fail: - QVERIFY(!qgraphicsitem_cast(&pathItem)); - QVERIFY(!qgraphicsitem_cast(pPolygonItem)); + QCOMPARE_EQ(qgraphicsitem_cast(&pathItem), + dynamic_cast(&pathItem)); + QCOMPARE_EQ(qgraphicsitem_cast(pPolygonItem), + dynamic_cast(pPolygonItem)); // and this shouldn't crash QGraphicsItem *ptr = nullptr;