FCL/sf/mw/qt: comparison tests/auto/qgraphicsproxywidget/tst

equal deleted inserted replaced

-:fcece45ef507
+:79de32ba3296
 #include <QtTest/QtTest>
 #include <QtGui>
 #include "../../shared/util.h"
+#include <private/qgraphicsproxywidget_p.h>
 #include <private/qlayoutengine_p.h>    // qSmartMin functions...
 #if defined(Q_WS_MAC) && !defined(QT_NO_STYLE_MAC)
 #include <QMacStyle>
 #endif
 #ifdef Q_WS_X11
 QGraphicsScene scene;
 QGraphicsView view(&scene);
 view.show();
 QApplication::setActiveWindow(&view);
 QTest::qWaitForWindowShown(&view);
-QApplication::processEvents();
 QTRY_COMPARE(QApplication::activeWindow(), &view);
 if (hasScene) {
 scene.addItem(proxy);
 proxy->show();
 view.show();
 QApplication::setActiveWindow(&view);
 view.activateWindow();
 view.setFocus();
 QTest::qWaitForWindowShown(&view);
-QApplication::processEvents();
 QTRY_VERIFY(view.isVisible());
 QTRY_COMPARE(QApplication::activeWindow(), &view);
 QWidget *widget = new QWidget;
 widget->setFocusPolicy(Qt::WheelFocus);
 QTest::mouseMove(&view, QPoint(10, 10));
 QTest::qWait(30);
 // in
 QTest::mouseMove(&view, QPoint(50, 50));
-QTest::qWait(25);
 QTRY_COMPARE(widget->testAttribute(Qt::WA_UnderMouse), hasWidget ? true : false);
 // ### this attribute isn't supported
 QCOMPARE(widget->enterCount, hasWidget ? 1 : 0);
 QCOMPARE(widget->hoverEnter, (hasWidget && hoverEnabled) ? 1 : 0);
 // does not work on all platforms
 //QCOMPARE(widget->moveCount, 0);
 // out
 QTest::mouseMove(&view, QPoint(10, 10));
-QTest::qWait(25);
 // QTRY_COMPARE(widget->testAttribute(Qt::WA_UnderMouse), false);
 // ### this attribute isn't supported
-QCOMPARE(widget->leaveCount, hasWidget ? 1 : 0);
+QTRY_COMPARE(widget->leaveCount, hasWidget ? 1 : 0);
-QCOMPARE(widget->hoverLeave, (hasWidget && hoverEnabled) ? 1 : 0);
+QTRY_COMPARE(widget->hoverLeave, (hasWidget && hoverEnabled) ? 1 : 0);
 // does not work on all platforms
 //QCOMPARE(widget->moveCount, 0);
 if (!hasWidget)
 delete widget;
 if (mouseDown)
 QTest::mousePress(view.viewport(), Qt::LeftButton);
 // move a little bit
 QTest::mouseMove(&view, QPoint(60, 60));
-QTest::qWait(12);
 QTRY_COMPARE(widget->hoverEnter, (hasWidget && hoverEnabled) ? 1 : 0);
 QCOMPARE(widget->moveCount, (hasWidget && mouseTracking) || (hasWidget && mouseDown) ? 1 : 0);
 if (!hasWidget)
 delete widget;
 QGraphicsView view(&scene);
 view.show();
 view.viewport()->setFocus();
 QApplication::setActiveWindow(&view);
 QTest::qWaitForWindowShown(&view);
-QApplication::processEvents();
 QTRY_COMPARE(QApplication::activeWindow(), &view);
 SubQGraphicsProxyWidget *proxy = new SubQGraphicsProxyWidget;
 proxy->setFlag(QGraphicsItem::ItemIsFocusable, true); // ### remove me!!!
 QTest::qWait(30);
 proxy.setWidget(w);
 scene.addItem(&proxy);
 //make sure we flush all the paint events
-QTest::qWait(30);
 QTRY_VERIFY(proxy.paintCount > 1);
 QTest::qWait(30);
 proxy.paintCount = 0;
 w->update();
-QTest::qWait(30);
 QTRY_COMPARE(proxy.paintCount, 1); //the widget should have been painted now
 }
 void tst_QGraphicsProxyWidget::wheelEvent()
 widget->paintEventRegion = QRegion();
 widget->npaints = 0;
 view.paintEventRegion = QRegion();
 view.npaints = 0;
 QTimer::singleShot(0, widget, SLOT(updateScroll()));
-QTest::qWait(50);
 QTRY_COMPARE(view.npaints, 2);
 // QRect(0, 0, 200, 12) is the first update, expanded (-2, -2, 2, 2)
 // QRect(0, 12, 102, 10) is the scroll update, expanded (-2, -2, 2, 2),
 // intersected with the above update.
 QCOMPARE(view.paintEventRegion.rects(),
 QApplication::processEvents();
 QTest::mousePress(view.viewport(), Qt::LeftButton, 0,
 		      view.mapFromScene(proxy->mapToScene(proxy->boundingRect().center())));
-QTest::qWait(12);
+QTRY_COMPARE(box->pos(), QPoint());
-QCOMPARE(box->pos(), QPoint());
 QCOMPARE(proxy->childItems().count(), 1);
 QGraphicsProxyWidget *child = (QGraphicsProxyWidget*)(proxy->childItems())[0];
 QVERIFY(child->isWidget());
 QVERIFY(child->widget());
 opt.editable = box->isEditable();
 if (box->style()->styleHint(QStyle::SH_ComboBox_Popup, &opt))
 QSKIP("Does not work due to SH_Combobox_Popup", SkipAll);
 QCOMPARE(child->widget()->parent(), static_cast<QObject*>(box));
-QTest::qWait(12);
 QTRY_COMPARE(proxy->pos(), QPointF(box->pos()));
 QCOMPARE(child->x(), qreal(box->x()));
 QCOMPARE(child->y(), qreal(box->rect().bottom()));
 #ifndef Q_OS_WIN
 // The popup's coordinates on Windows are in global space,
 QTRY_VERIFY(view.isActiveWindow());
 // in
 QTest::mouseMove(view.viewport(), view.mapFromScene(proxy->mapToScene(proxy->boundingRect().center())));
 sendMouseMove(view.viewport(), view.mapFromScene(proxy->mapToScene(proxy->boundingRect().center())));
-QTest::qWait(12);
 QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
 // out
 QTest::mouseMove(view.viewport(), QPoint(1, 1));
 sendMouseMove(view.viewport(), QPoint(1, 1));
-QTest::qWait(12);
 QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::ArrowCursor);
 #endif
 }
 void tst_QGraphicsProxyWidget::tooltip_basic()
 {
-// Confirm that mouse events are working properly by checking that
+QString toolTip = "Qt rocks!";
-// when moving the mouse over a label with a tooptip the tooltip appears
+QString toolTip2 = "Qt rocks even more!";
-QGraphicsScene scene;
+QPushButton *button = new QPushButton("button");
+QGraphicsProxyWidget *proxy = new QGraphicsProxyWidget;
+QGraphicsProxyWidgetPrivate *proxyd = static_cast<QGraphicsProxyWidgetPrivate *>(QGraphicsItemPrivate::get(proxy));
+proxy->setWidget(button);
+proxyd->lastWidgetUnderMouse = button; // force widget under mouse
+QVERIFY(button->toolTip().isEmpty());
+QVERIFY(proxy->toolTip().isEmpty());
+// Check that setting the tooltip on the proxy also set it on the widget
+proxy->setToolTip(toolTip);
+QCOMPARE(proxy->toolTip(), toolTip);
+QCOMPARE(button->toolTip(), toolTip);
+// Check that setting the tooltip on the widget also set it on the proxy
+button->setToolTip(toolTip2);
+QCOMPARE(proxy->toolTip(), toolTip2);
+QCOMPARE(button->toolTip(), toolTip2);
+QGraphicsScene scene;
+scene.addItem(proxy);
 QGraphicsView view(&scene);
+view.setFixedSize(200, 200);
 view.show();
+QTest::qWaitForWindowShown(&view);
-QSKIP("Tooltips don't work yet", SkipAll);
+{
+QHelpEvent helpEvent(QEvent::ToolTip, view.viewport()->rect().topLeft(),
-SubQGraphicsProxyWidget *proxy = new SubQGraphicsProxyWidget;
+view.viewport()->mapToGlobal(view.viewport()->rect().topLeft()));
-QLabel *widget = new QLabel;
+QApplication::sendEvent(view.viewport(), &helpEvent);
-widget->setText("If it ain't tested it's broken");
+QTest::qWait(350);
-widget->setToolTip("When in doubt, test");
-proxy->setWidget(widget);
+bool foundView = false;
-widget->show();
+bool foundTipLabel = false;
-scene.addItem(proxy);
+foreach (QWidget *widget, QApplication::topLevelWidgets()) {
-QTest::qWait(125);
+if (widget == &view)
+foundView = true;
-// in
+if (widget->inherits("QTipLabel"))
-QTest::mouseMove(view.viewport(), view.mapFromScene(proxy->mapToScene(proxy->boundingRect().center())));
+foundTipLabel = true;
-QTest::qWait(3000);
+}
+QVERIFY(foundView);
-QCOMPARE(proxy->childItems().count(), 1);
+QVERIFY(!foundTipLabel);
-QGraphicsProxyWidget *child = (QGraphicsProxyWidget*)(proxy->childItems())[0];
+}
-QVERIFY(child->isWidget());
-QVERIFY(child->widget());
+{
-QCOMPARE(child->widget()->parent(), static_cast<QObject*>(widget));
+QHelpEvent helpEvent(QEvent::ToolTip, view.mapFromScene(proxy->boundingRect().center()),
-QCOMPARE(child->widget()->x(), widget->x()); // ### ???
+view.viewport()->mapToGlobal(view.mapFromScene(proxy->boundingRect().center())));
-QCOMPARE(child->widget()->y(), widget->y() + widget->height()); // ### ???
+QApplication::sendEvent(view.viewport(), &helpEvent);
+QTest::qWait(350);
+bool foundView = false;
+bool foundTipLabel = false;
+foreach (QWidget *widget, QApplication::topLevelWidgets()) {
+if (widget == &view)
+foundView = true;
+if (widget->inherits("QTipLabel"))
+foundTipLabel = true;
+}
+QVERIFY(foundView);
+QVERIFY(foundTipLabel);
+}
 }
 void tst_QGraphicsProxyWidget::childPos_data()
 {
 QTest::addColumn<bool>("moveCombo");
 View view(&scene);
 view.show();
 #ifdef Q_WS_X11
 qt_x11_wait_for_window_manager(&view);
 #endif
-QTest::qWait(20);
 QTRY_VERIFY(view.npaints > 0);
 const QRect itemDeviceBoundingRect = proxy->deviceTransform(view.viewportTransform())
 .mapRect(proxy->boundingRect()).toRect();
 const QRegion expectedRegion = itemDeviceBoundingRect.adjusted(-2, -2, 2, 2);
 view.paintEventRegion = QRegion();
 // Update and hide.
 proxy->update();
 proxy->hide();
-QTest::qWait(50);
+QTRY_COMPARE(view.npaints, 1);
-QCOMPARE(view.npaints, 1);
 QCOMPARE(view.paintEventRegion, expectedRegion);
 proxy->show();
 QTest::qWait(50);
 view.npaints = 0;
 view.paintEventRegion = QRegion();
 // Update and delete.
 proxy->update();
 delete proxy;
-QTest::qWait(50);
+QTRY_COMPARE(view.npaints, 1);
-QCOMPARE(view.npaints, 1);
 QCOMPARE(view.paintEventRegion, expectedRegion);
 }
 class InputMethod_LineEdit : public QLineEdit
 {
 view.show();
 #ifdef Q_WS_X11
 qt_x11_wait_for_window_manager(&view);
 #endif
 QApplication::setActiveWindow(&view);
-QTest::qWait(25);
 QTRY_COMPARE(QApplication::activeWindow(), &view);
 QVERIFY(!proxy->hasFocus());
 QVERIFY(!proxy->widget()->hasFocus());

changeset 22	79de32ba3296
parent 19	fcece45ef507
child 30	5dc02b23752f