From a797d2aeb90d713ca931ddac75dede8a1d12f356 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Wed, 17 Jul 2019 22:35:28 +0200 Subject: [PATCH] parttest: Move calculating the width/height to a bit later Seems to make tests more stable --- autotests/parttest.cpp | 120 ++++++++++++++++++++--------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/autotests/parttest.cpp b/autotests/parttest.cpp index 6145cee88..a2dc8794a 100644 --- a/autotests/parttest.cpp +++ b/autotests/parttest.cpp @@ -285,16 +285,16 @@ void PartTest::testSelectText() part.widget()->show(); QVERIFY(QTest::qWaitForWindowExposed(part.widget())); - const int width = part.m_pageView->horizontalScrollBar()->maximum() + - part.m_pageView->viewport()->width(); - const int height = part.m_pageView->verticalScrollBar()->maximum() + - part.m_pageView->viewport()->height(); - part.m_document->setViewportPage(0); // wait for pixmap QTRY_VERIFY(part.m_document->page(0)->hasPixmap(part.m_pageView)); + const int width = part.m_pageView->horizontalScrollBar()->maximum() + + part.m_pageView->viewport()->width(); + const int height = part.m_pageView->verticalScrollBar()->maximum() + + part.m_pageView->viewport()->height(); + QVERIFY(QMetaObject::invokeMethod(part.m_pageView, "slotSetMouseTextSelect")); const int mouseY = height * 0.052; @@ -317,16 +317,16 @@ void PartTest::testClickInternalLink() part.widget()->show(); QVERIFY(QTest::qWaitForWindowExposed(part.widget())); - const int width = part.m_pageView->horizontalScrollBar()->maximum() + - part.m_pageView->viewport()->width(); - const int height = part.m_pageView->verticalScrollBar()->maximum() + - part.m_pageView->viewport()->height(); - part.m_document->setViewportPage(0); // wait for pixmap QTRY_VERIFY(part.m_document->page(0)->hasPixmap(part.m_pageView)); + const int width = part.m_pageView->horizontalScrollBar()->maximum() + + part.m_pageView->viewport()->width(); + const int height = part.m_pageView->verticalScrollBar()->maximum() + + part.m_pageView->viewport()->height(); + QMetaObject::invokeMethod(part.m_pageView, "slotSetMouseNormal"); QCOMPARE(part.m_document->currentPage(), 0u); @@ -346,16 +346,16 @@ void PartTest::testMouseMoveOverLinkWhileInSelectionMode() part.widget()->show(); QVERIFY(QTest::qWaitForWindowExposed(part.widget())); - const int width = part.m_pageView->horizontalScrollBar()->maximum() + - part.m_pageView->viewport()->width(); - const int height = part.m_pageView->verticalScrollBar()->maximum() + - part.m_pageView->viewport()->height(); - part.m_document->setViewportPage(0); // wait for pixmap QTRY_VERIFY(part.m_document->page(0)->hasPixmap(part.m_pageView)); + const int width = part.m_pageView->horizontalScrollBar()->maximum() + + part.m_pageView->viewport()->width(); + const int height = part.m_pageView->verticalScrollBar()->maximum() + + part.m_pageView->viewport()->height(); + // enter text-selection mode QVERIFY(QMetaObject::invokeMethod(part.m_pageView, "slotSetMouseTextSelect")); @@ -377,16 +377,16 @@ void PartTest::testClickUrlLinkWhileInSelectionMode() part.widget()->show(); QVERIFY(QTest::qWaitForWindowExposed(part.widget())); - const int width = part.m_pageView->horizontalScrollBar()->maximum() + - part.m_pageView->viewport()->width(); - const int height = part.m_pageView->verticalScrollBar()->maximum() + - part.m_pageView->viewport()->height(); - part.m_document->setViewportPage(0); // wait for pixmap QTRY_VERIFY(part.m_document->page(0)->hasPixmap(part.m_pageView)); + const int width = part.m_pageView->horizontalScrollBar()->maximum() + + part.m_pageView->viewport()->width(); + const int height = part.m_pageView->verticalScrollBar()->maximum() + + part.m_pageView->viewport()->height(); + // enter text-selection mode QVERIFY(QMetaObject::invokeMethod(part.m_pageView, "slotSetMouseTextSelect")); @@ -429,16 +429,16 @@ void PartTest::testeTextSelectionOverAndAcrossLinks() part.widget()->show(); QVERIFY(QTest::qWaitForWindowExposed(part.widget())); - const int width = part.m_pageView->horizontalScrollBar()->maximum() + - part.m_pageView->viewport()->width(); - const int height = part.m_pageView->verticalScrollBar()->maximum() + - part.m_pageView->viewport()->height(); - part.m_document->setViewportPage(0); // wait for pixmap QTRY_VERIFY(part.m_document->page(0)->hasPixmap(part.m_pageView)); + const int width = part.m_pageView->horizontalScrollBar()->maximum() + + part.m_pageView->viewport()->width(); + const int height = part.m_pageView->verticalScrollBar()->maximum() + + part.m_pageView->viewport()->height(); + // enter text-selection mode QVERIFY(QMetaObject::invokeMethod(part.m_pageView, "slotSetMouseTextSelect")); @@ -469,16 +469,16 @@ void PartTest::testClickUrlLinkWhileLinkTextIsSelected() part.widget()->show(); QVERIFY(QTest::qWaitForWindowExposed(part.widget())); - const int width = part.m_pageView->horizontalScrollBar()->maximum() + - part.m_pageView->viewport()->width(); - const int height = part.m_pageView->verticalScrollBar()->maximum() + - part.m_pageView->viewport()->height(); - part.m_document->setViewportPage(0); // wait for pixmap QTRY_VERIFY(part.m_document->page(0)->hasPixmap(part.m_pageView)); + const int width = part.m_pageView->horizontalScrollBar()->maximum() + + part.m_pageView->viewport()->width(); + const int height = part.m_pageView->verticalScrollBar()->maximum() + + part.m_pageView->viewport()->height(); + // enter text-selection mode QVERIFY(QMetaObject::invokeMethod(part.m_pageView, "slotSetMouseTextSelect")); @@ -516,16 +516,16 @@ void PartTest::testRClickWhileLinkTextIsSelected() part.widget()->show(); QVERIFY(QTest::qWaitForWindowExposed(part.widget())); - const int width = part.m_pageView->horizontalScrollBar()->maximum() + - part.m_pageView->viewport()->width(); - const int height = part.m_pageView->verticalScrollBar()->maximum() + - part.m_pageView->viewport()->height(); - part.m_document->setViewportPage(0); // wait for pixmap QTRY_VERIFY(part.m_document->page(0)->hasPixmap(part.m_pageView)); + const int width = part.m_pageView->horizontalScrollBar()->maximum() + + part.m_pageView->viewport()->width(); + const int height = part.m_pageView->verticalScrollBar()->maximum() + + part.m_pageView->viewport()->height(); + // enter text-selection mode QVERIFY(QMetaObject::invokeMethod(part.m_pageView, "slotSetMouseTextSelect")); @@ -585,16 +585,16 @@ void PartTest::testRClickOverLinkWhileLinkTextIsSelected() part.widget()->show(); QVERIFY(QTest::qWaitForWindowExposed(part.widget())); - const int width = part.m_pageView->horizontalScrollBar()->maximum() + - part.m_pageView->viewport()->width(); - const int height = part.m_pageView->verticalScrollBar()->maximum() + - part.m_pageView->viewport()->height(); - part.m_document->setViewportPage(0); // wait for pixmap QTRY_VERIFY(part.m_document->page(0)->hasPixmap(part.m_pageView)); + const int width = part.m_pageView->horizontalScrollBar()->maximum() + + part.m_pageView->viewport()->width(); + const int height = part.m_pageView->verticalScrollBar()->maximum() + + part.m_pageView->viewport()->height(); + // enter text-selection mode QVERIFY(QMetaObject::invokeMethod(part.m_pageView, "slotSetMouseTextSelect")); @@ -648,16 +648,16 @@ void PartTest::testRClickOnSelectionModeShoulShowFollowTheLinkMenu() part.widget()->show(); QVERIFY(QTest::qWaitForWindowExposed(part.widget())); - const int width = part.m_pageView->horizontalScrollBar()->maximum() + - part.m_pageView->viewport()->width(); - const int height = part.m_pageView->verticalScrollBar()->maximum() + - part.m_pageView->viewport()->height(); - part.m_document->setViewportPage(0); // wait for pixmap QTRY_VERIFY(part.m_document->page(0)->hasPixmap(part.m_pageView)); + const int width = part.m_pageView->horizontalScrollBar()->maximum() + + part.m_pageView->viewport()->width(); + const int height = part.m_pageView->verticalScrollBar()->maximum() + + part.m_pageView->viewport()->height(); + // enter text-selection mode QVERIFY(QMetaObject::invokeMethod(part.m_pageView, "slotSetMouseTextSelect")); @@ -705,16 +705,16 @@ void PartTest::testClickAnywhereAfterSelectionShouldUnselect() part.widget()->show(); QVERIFY(QTest::qWaitForWindowExposed(part.widget())); - const int width = part.m_pageView->horizontalScrollBar()->maximum() + - part.m_pageView->viewport()->width(); - const int height = part.m_pageView->verticalScrollBar()->maximum() + - part.m_pageView->viewport()->height(); - part.m_document->setViewportPage(0); // wait for pixmap QTRY_VERIFY(part.m_document->page(0)->hasPixmap(part.m_pageView)); + const int width = part.m_pageView->horizontalScrollBar()->maximum() + + part.m_pageView->viewport()->width(); + const int height = part.m_pageView->verticalScrollBar()->maximum() + + part.m_pageView->viewport()->height(); + // enter text-selection mode QVERIFY(QMetaObject::invokeMethod(part.m_pageView, "slotSetMouseTextSelect")); @@ -747,16 +747,16 @@ void PartTest::testeRectSelectionStartingOnLinks() part.widget()->show(); QVERIFY(QTest::qWaitForWindowExposed(part.widget())); - const int width = part.m_pageView->horizontalScrollBar()->maximum() + - part.m_pageView->viewport()->width(); - const int height = part.m_pageView->verticalScrollBar()->maximum() + - part.m_pageView->viewport()->height(); - part.m_document->setViewportPage(0); // wait for pixmap QTRY_VERIFY(part.m_document->page(0)->hasPixmap(part.m_pageView)); + const int width = part.m_pageView->horizontalScrollBar()->maximum() + + part.m_pageView->viewport()->width(); + const int height = part.m_pageView->verticalScrollBar()->maximum() + + part.m_pageView->viewport()->height(); + // enter text-selection mode QVERIFY(QMetaObject::invokeMethod(part.m_pageView, "slotSetMouseSelect")); @@ -1539,16 +1539,16 @@ void PartTest::testAnnotWindow() part.widget()->resize(800, 600); QVERIFY(QTest::qWaitForWindowExposed(part.widget())); - const int width = part.m_pageView->horizontalScrollBar()->maximum() + - part.m_pageView->viewport()->width(); - const int height = part.m_pageView->verticalScrollBar()->maximum() + - part.m_pageView->viewport()->height(); - part.m_document->setViewportPage(0); // wait for pixmap QTRY_VERIFY(part.m_document->page(0)->hasPixmap(part.m_pageView)); + const int width = part.m_pageView->horizontalScrollBar()->maximum() + + part.m_pageView->viewport()->width(); + const int height = part.m_pageView->verticalScrollBar()->maximum() + + part.m_pageView->viewport()->height(); + QMetaObject::invokeMethod(part.m_pageView, "slotSetMouseNormal"); QCOMPARE(part.m_document->currentPage(), 0u);