From 17ddbeb778159d96113a51079b603665a0f1058d 2014-10-24 10:19:08 From: Titta Heikkala Date: 2014-10-24 10:19:08 Subject: [PATCH] Removed the old hovered signal from bar chart A new hovered signal that provides index information has been added for bar chart (QTRD-2161). The old hovered signal has now been removed. Change-Id: Ia65be1c363cbfda942d48bceb5326bd54a3c35ec Task-number: QTRD-2199 Reviewed-by: Miikka Heikkinen Reviewed-by: Mika Salmela --- diff --git a/src/charts/barchart/abstractbarchartitem.cpp b/src/charts/barchart/abstractbarchartitem.cpp index d0adca6..1d32d9f 100644 --- a/src/charts/barchart/abstractbarchartitem.cpp +++ b/src/charts/barchart/abstractbarchartitem.cpp @@ -162,10 +162,8 @@ void AbstractBarChartItem::handleDataStructureChanged() Bar *bar = new Bar(set, c, this); m_bars.append(bar); connect(bar, SIGNAL(clicked(int,QBarSet*)), m_series, SIGNAL(clicked(int,QBarSet*))); - connect(bar, SIGNAL(hovered(bool,QBarSet*)), m_series, SIGNAL(hovered(bool,QBarSet*))); connect(bar, SIGNAL(hovered(bool, int, QBarSet*)), m_series, SIGNAL(hovered(bool, int, QBarSet*))); connect(bar, SIGNAL(clicked(int,QBarSet*)), set, SIGNAL(clicked(int))); - connect(bar, SIGNAL(hovered(bool,QBarSet*)), set, SIGNAL(hovered(bool))); connect(bar, SIGNAL(hovered(bool, int, QBarSet*)), set, SIGNAL(hovered(bool, int))); // m_layout.append(QRectF(0, 0, 1, 1)); diff --git a/src/charts/barchart/bar.cpp b/src/charts/barchart/bar.cpp index 41f20b7..400fd58 100644 --- a/src/charts/barchart/bar.cpp +++ b/src/charts/barchart/bar.cpp @@ -36,10 +36,8 @@ Bar::Bar(QBarSet *barset, int index, QGraphicsItem *parent) : QGraphicsRectItem( Bar::~Bar() { // End hover event, if bar is deleted during it - if (m_hovering) { - emit hovered(false, m_barset); + if (m_hovering) emit hovered(false, m_index, m_barset); - } } void Bar::mousePressEvent(QGraphicsSceneMouseEvent *event) @@ -53,7 +51,6 @@ void Bar::hoverEnterEvent(QGraphicsSceneHoverEvent *event) { Q_UNUSED(event) m_hovering = true; - emit hovered(true, m_barset); emit hovered(true, m_index, m_barset); } @@ -62,7 +59,6 @@ void Bar::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) { Q_UNUSED(event) m_hovering = false; - emit hovered(false, m_barset); emit hovered(false, m_index, m_barset); } diff --git a/src/charts/barchart/bar_p.h b/src/charts/barchart/bar_p.h index 5033fc3..4f8b010 100644 --- a/src/charts/barchart/bar_p.h +++ b/src/charts/barchart/bar_p.h @@ -52,7 +52,6 @@ public: Q_SIGNALS: void clicked(int index, QBarSet *barset); - void hovered(bool status, QBarSet *barset); void hovered(bool status, int index, QBarSet *barset); private: diff --git a/src/charts/barchart/qabstractbarseries.cpp b/src/charts/barchart/qabstractbarseries.cpp index a479524..9c11f92 100644 --- a/src/charts/barchart/qabstractbarseries.cpp +++ b/src/charts/barchart/qabstractbarseries.cpp @@ -211,14 +211,6 @@ QT_CHARTS_BEGIN_NAMESPACE */ /*! - \fn void QAbstractBarSeries::hovered(bool status, QBarSet* barset) - - The signal is emitted if mouse is hovered on top of series. - Parameter \a barset is the pointer of barset, where hover happened. - Parameter \a status is true, if mouse entered on top of series, false if mouse left from top of series. -*/ - -/*! \fn void QAbstractBarSeries::hovered(bool status, int index, QBarSet* barset) The signal is emitted if mouse is hovered on top of series. diff --git a/src/charts/barchart/qabstractbarseries.h b/src/charts/barchart/qabstractbarseries.h index 919c9ab..47a0447 100644 --- a/src/charts/barchart/qabstractbarseries.h +++ b/src/charts/barchart/qabstractbarseries.h @@ -77,7 +77,6 @@ protected: Q_SIGNALS: void clicked(int index, QBarSet *barset); - void hovered(bool status, QBarSet *barset); void hovered(bool status, int index, QBarSet *barset); void countChanged(); void labelsVisibleChanged(); diff --git a/src/charts/barchart/qbarset.cpp b/src/charts/barchart/qbarset.cpp index d7457ba..0555b62 100644 --- a/src/charts/barchart/qbarset.cpp +++ b/src/charts/barchart/qbarset.cpp @@ -134,13 +134,6 @@ QT_CHARTS_BEGIN_NAMESPACE */ /*! - \fn void QBarSet::hovered(bool status) - - The signal is emitted if mouse is hovered on top of bar set. - Parameter \a status is true, if mouse entered on top of bar set, false if mouse left from top of bar set. -*/ - -/*! \fn void QBarSet::hovered(bool status, int index) The signal is emitted if mouse is hovered on top of bar set. diff --git a/src/charts/barchart/qbarset.h b/src/charts/barchart/qbarset.h index ea70829..2faafbe 100644 --- a/src/charts/barchart/qbarset.h +++ b/src/charts/barchart/qbarset.h @@ -84,7 +84,6 @@ public: Q_SIGNALS: void clicked(int index); - void hovered(bool status); void hovered(bool status, int index); void penChanged(); void brushChanged(); diff --git a/tests/auto/qbarseries/tst_qbarseries.cpp b/tests/auto/qbarseries/tst_qbarseries.cpp index 3687659..57dccb5 100644 --- a/tests/auto/qbarseries/tst_qbarseries.cpp +++ b/tests/auto/qbarseries/tst_qbarseries.cpp @@ -610,10 +610,7 @@ void tst_QBarSeries::mousehovered() series->append(set2); QList barSets = series->barSets(); - QSignalSpy seriesSpy(series,SIGNAL(hovered(bool,QBarSet*))); QSignalSpy seriesIndexSpy(series, SIGNAL(hovered(bool, int, QBarSet*))); - QSignalSpy setSpy1(set1, SIGNAL(hovered(bool))); - QSignalSpy setSpy2(set2, SIGNAL(hovered(bool))); QSignalSpy setIndexSpy1(set1, SIGNAL(hovered(bool, int))); QSignalSpy setIndexSpy2(set2, SIGNAL(hovered(bool, int))); @@ -661,37 +658,22 @@ void tst_QBarSeries::mousehovered() // move mouse to left border QTest::mouseMove(view.viewport(), QPoint(0, layout.at(0).center().y())); QCoreApplication::processEvents(QEventLoop::AllEvents, 10000); - TRY_COMPARE(seriesSpy.count(), 0); TRY_COMPARE(seriesIndexSpy.count(), 0); - TRY_COMPARE(setSpy1.count(), 0); - TRY_COMPARE(setSpy2.count(), 0); TRY_COMPARE(setIndexSpy1.count(), 0); TRY_COMPARE(setIndexSpy2.count(), 0); //======================================================================= // move mouse on top of set1 QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setSpy1.count(), 1); - TRY_COMPARE(setSpy2.count(), 0); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 0); - QList seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - QList seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(seriesIndexSpyArg.at(0).toBool() == true); - QList setSpyArg = setSpy1.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == true); - QList setIndexSpyArg = setIndexSpy1.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == true); @@ -699,47 +681,26 @@ void tst_QBarSeries::mousehovered() //======================================================================= // move mouse from top of set1 to top of set2 QTest::mouseMove(view.viewport(), layout.at(1).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 2); TRY_COMPARE(seriesIndexSpy.count(), 2); - TRY_COMPARE(setSpy1.count(), 1); - TRY_COMPARE(setSpy2.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 1); // should leave set1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(seriesIndexSpyArg.at(0).toBool() == false); - setSpyArg = setSpy1.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == false); - setIndexSpyArg = setIndexSpy1.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == false); // should enter set2 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(seriesIndexSpyArg.at(0).toBool() == true); - setSpyArg = setSpy2.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == true); - setIndexSpyArg = setIndexSpy2.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == true); @@ -747,28 +708,16 @@ void tst_QBarSeries::mousehovered() //======================================================================= // move mouse from top of set2 to background QTest::mouseMove(view.viewport(), QPoint(layout.at(1).center().x(), 0)); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setSpy1.count(), 0); - TRY_COMPARE(setSpy2.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 0); TRY_COMPARE(setIndexSpy2.count(), 1); // should leave set2 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(seriesIndexSpyArg.at(0).toBool() == false); - setSpyArg = setSpy2.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == false); - setIndexSpyArg = setIndexSpy2.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == false); @@ -777,19 +726,11 @@ void tst_QBarSeries::mousehovered() // move mouse on top of set1, bar0 to check the index (hover into set1) QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setSpy1.count(), 1); - TRY_COMPARE(setSpy2.count(), 0); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 0); //should enter set1, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -797,10 +738,6 @@ void tst_QBarSeries::mousehovered() QVERIFY(seriesIndexSpyArg.at(1).type() == QVariant::Int); QVERIFY(seriesIndexSpyArg.at(1).toInt() == 0); - setSpyArg = setSpy1.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == true); - setIndexSpyArg = setIndexSpy1.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == true); @@ -812,19 +749,11 @@ void tst_QBarSeries::mousehovered() // hover in set1) QTest::mouseMove(view.viewport(), layout.at(1).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 2); TRY_COMPARE(seriesIndexSpy.count(), 2); - TRY_COMPARE(setSpy1.count(), 1); - TRY_COMPARE(setSpy2.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 1); // should leave set1, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -832,10 +761,6 @@ void tst_QBarSeries::mousehovered() QVERIFY(seriesIndexSpyArg.at(1).type() == QVariant::Int); QVERIFY(seriesIndexSpyArg.at(1).toInt() == 0); - setSpyArg = setSpy1.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == false); - setIndexSpyArg = setIndexSpy1.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == false); @@ -843,11 +768,6 @@ void tst_QBarSeries::mousehovered() QVERIFY(setIndexSpyArg.at(1).toInt() == 0); // should enter set2, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -855,10 +775,6 @@ void tst_QBarSeries::mousehovered() QVERIFY(seriesIndexSpyArg.at(1).type() == QVariant::Int); QVERIFY(seriesIndexSpyArg.at(1).toInt() == 0); - setSpyArg = setSpy2.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == true); - setIndexSpyArg = setIndexSpy2.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == true); @@ -870,19 +786,11 @@ void tst_QBarSeries::mousehovered() // hover in set1) QTest::mouseMove(view.viewport(), layout.at(2).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 2); TRY_COMPARE(seriesIndexSpy.count(), 2); - TRY_COMPARE(setSpy1.count(), 1); - TRY_COMPARE(setSpy2.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 1); // should leave set2, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -890,10 +798,6 @@ void tst_QBarSeries::mousehovered() QVERIFY(seriesIndexSpyArg.at(1).type() == QVariant::Int); QVERIFY(seriesIndexSpyArg.at(1).toInt() == 0); - setSpyArg = setSpy2.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == false); - setIndexSpyArg = setIndexSpy2.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == false); @@ -901,11 +805,6 @@ void tst_QBarSeries::mousehovered() QVERIFY(setIndexSpyArg.at(1).toInt() == 0); // should enter set1, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -913,10 +812,6 @@ void tst_QBarSeries::mousehovered() QVERIFY(seriesIndexSpyArg.at(1).type() == QVariant::Int); QVERIFY(seriesIndexSpyArg.at(1).toInt() == 1); - setSpyArg = setSpy1.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == true); - setIndexSpyArg = setIndexSpy1.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == true); @@ -928,19 +823,11 @@ void tst_QBarSeries::mousehovered() // (hover out set1) QTest::mouseMove(view.viewport(), QPoint((layout.at(2).right() + layout.at(3).left()) / 2, 0)); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setSpy1.count(), 1); - TRY_COMPARE(setSpy2.count(), 0); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 0); // should leave set1, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -948,10 +835,6 @@ void tst_QBarSeries::mousehovered() QVERIFY(seriesIndexSpyArg.at(1).type() == QVariant::Int); QVERIFY(seriesIndexSpyArg.at(1).toInt() == 1); - setSpyArg = setSpy1.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == false); - setIndexSpyArg = setIndexSpy1.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == false); @@ -962,19 +845,11 @@ void tst_QBarSeries::mousehovered() // move mouse on top of set2, bar1 to check the index (hover in set2) QTest::mouseMove(view.viewport(), layout.at(3).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setSpy1.count(), 0); - TRY_COMPARE(setSpy2.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 0); TRY_COMPARE(setIndexSpy2.count(), 1); // should enter set2, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -982,10 +857,6 @@ void tst_QBarSeries::mousehovered() QVERIFY(seriesIndexSpyArg.at(1).type() == QVariant::Int); QVERIFY(seriesIndexSpyArg.at(1).toInt() == 1); - setSpyArg = setSpy2.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == true); - setIndexSpyArg = setIndexSpy2.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == true); @@ -997,19 +868,11 @@ void tst_QBarSeries::mousehovered() //(hover out set2) QTest::mouseMove(view.viewport(), QPoint((layout.at(3).right() + layout.at(3).left()) / 2, 0)); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setSpy1.count(), 0); - TRY_COMPARE(setSpy2.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 0); TRY_COMPARE(setIndexSpy2.count(), 1); // should leave set2, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -1017,10 +880,6 @@ void tst_QBarSeries::mousehovered() QVERIFY(seriesIndexSpyArg.at(1).type() == QVariant::Int); QVERIFY(seriesIndexSpyArg.at(1).toInt() == 1); - setSpyArg = setSpy2.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == false); - setIndexSpyArg = setIndexSpy2.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == false); diff --git a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp index 6445476..af64537 100644 --- a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp +++ b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp @@ -558,10 +558,7 @@ void tst_QHorizontalBarSeries::mousehovered() QList barSets = series->barSets(); - QSignalSpy seriesSpy(series,SIGNAL(hovered(bool,QBarSet*))); QSignalSpy seriesIndexSpy(series, SIGNAL(hovered(bool, int, QBarSet*))); - QSignalSpy setSpy1(set1, SIGNAL(hovered(bool))); - QSignalSpy setSpy2(set2, SIGNAL(hovered(bool))); QSignalSpy setIndexSpy1(set1, SIGNAL(hovered(bool, int))); QSignalSpy setIndexSpy2(set2, SIGNAL(hovered(bool, int))); @@ -609,37 +606,22 @@ void tst_QHorizontalBarSeries::mousehovered() // move mouse to bottom border QTest::mouseMove(view.viewport(), QPoint(layout.at(0).center().x(), 300)); QCoreApplication::processEvents(QEventLoop::AllEvents, 10000); - TRY_COMPARE(seriesSpy.count(), 0); TRY_COMPARE(seriesIndexSpy.count(), 0); - TRY_COMPARE(setSpy1.count(), 0); - TRY_COMPARE(setSpy2.count(), 0); TRY_COMPARE(setIndexSpy1.count(), 0); TRY_COMPARE(setIndexSpy2.count(), 0); //======================================================================= // move mouse on top of set1 QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setSpy1.count(), 1); - TRY_COMPARE(setSpy2.count(), 0); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 0); - QList seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - QList seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(seriesIndexSpyArg.at(0).toBool() == true); - QList setSpyArg = setSpy1.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == true); - QList setIndexSpyArg = setIndexSpy1.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == true); @@ -647,47 +629,26 @@ void tst_QHorizontalBarSeries::mousehovered() //======================================================================= // move mouse from top of set1 to top of set2 QTest::mouseMove(view.viewport(), layout.at(1).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 2); TRY_COMPARE(seriesIndexSpy.count(), 2); - TRY_COMPARE(setSpy1.count(), 1); - TRY_COMPARE(setSpy2.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 1); // should leave set1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(seriesIndexSpyArg.at(0).toBool() == false); - setSpyArg = setSpy1.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == false); - setIndexSpyArg = setIndexSpy1.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == false); // should enter set2 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(seriesIndexSpyArg.at(0).toBool() == true); - setSpyArg = setSpy2.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == true); - setIndexSpyArg = setIndexSpy2.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == true); @@ -695,28 +656,16 @@ void tst_QHorizontalBarSeries::mousehovered() //======================================================================= // move mouse from top of set2 to background QTest::mouseMove(view.viewport(), QPoint(0, layout.at(0).center().y())); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setSpy1.count(), 0); - TRY_COMPARE(setSpy2.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 0); TRY_COMPARE(setIndexSpy2.count(), 1); // should leave set2 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(seriesIndexSpyArg.at(0).toBool() == false); - setSpyArg = setSpy2.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == false); - setIndexSpyArg = setIndexSpy2.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == false); @@ -725,19 +674,11 @@ void tst_QHorizontalBarSeries::mousehovered() // move mouse on top of set1, bar0 to check the index (hover into set1) QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setSpy1.count(), 1); - TRY_COMPARE(setSpy2.count(), 0); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 0); //should enter set1, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -745,10 +686,6 @@ void tst_QHorizontalBarSeries::mousehovered() QVERIFY(seriesIndexSpyArg.at(1).type() == QVariant::Int); QVERIFY(seriesIndexSpyArg.at(1).toInt() == 0); - setSpyArg = setSpy1.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == true); - setIndexSpyArg = setIndexSpy1.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == true); @@ -760,19 +697,11 @@ void tst_QHorizontalBarSeries::mousehovered() // hover in set1) QTest::mouseMove(view.viewport(), layout.at(1).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 2); TRY_COMPARE(seriesIndexSpy.count(), 2); - TRY_COMPARE(setSpy1.count(), 1); - TRY_COMPARE(setSpy2.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 1); // should leave set1, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -780,10 +709,6 @@ void tst_QHorizontalBarSeries::mousehovered() QVERIFY(seriesIndexSpyArg.at(1).type() == QVariant::Int); QVERIFY(seriesIndexSpyArg.at(1).toInt() == 0); - setSpyArg = setSpy1.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == false); - setIndexSpyArg = setIndexSpy1.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == false); @@ -791,11 +716,6 @@ void tst_QHorizontalBarSeries::mousehovered() QVERIFY(setIndexSpyArg.at(1).toInt() == 0); // should enter set2, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -803,10 +723,6 @@ void tst_QHorizontalBarSeries::mousehovered() QVERIFY(seriesIndexSpyArg.at(1).type() == QVariant::Int); QVERIFY(seriesIndexSpyArg.at(1).toInt() == 0); - setSpyArg = setSpy2.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == true); - setIndexSpyArg = setIndexSpy2.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == true); @@ -818,19 +734,11 @@ void tst_QHorizontalBarSeries::mousehovered() // hover in set1) QTest::mouseMove(view.viewport(), layout.at(2).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 2); TRY_COMPARE(seriesIndexSpy.count(), 2); - TRY_COMPARE(setSpy1.count(), 1); - TRY_COMPARE(setSpy2.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 1); // should leave set2, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -838,10 +746,6 @@ void tst_QHorizontalBarSeries::mousehovered() QVERIFY(seriesIndexSpyArg.at(1).type() == QVariant::Int); QVERIFY(seriesIndexSpyArg.at(1).toInt() == 0); - setSpyArg = setSpy2.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == false); - setIndexSpyArg = setIndexSpy2.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == false); @@ -849,11 +753,6 @@ void tst_QHorizontalBarSeries::mousehovered() QVERIFY(setIndexSpyArg.at(1).toInt() == 0); // should enter set1, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -861,10 +760,6 @@ void tst_QHorizontalBarSeries::mousehovered() QVERIFY(seriesIndexSpyArg.at(1).type() == QVariant::Int); QVERIFY(seriesIndexSpyArg.at(1).toInt() == 1); - setSpyArg = setSpy1.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == true); - setIndexSpyArg = setIndexSpy1.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == true); @@ -876,19 +771,11 @@ void tst_QHorizontalBarSeries::mousehovered() // (hover out set1) QTest::mouseMove(view.viewport(), QPoint(0, (layout.at(2).top() + layout.at(3).bottom()) / 2)); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setSpy1.count(), 1); - TRY_COMPARE(setSpy2.count(), 0); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 0); // should leave set1, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -896,10 +783,6 @@ void tst_QHorizontalBarSeries::mousehovered() QVERIFY(seriesIndexSpyArg.at(1).type() == QVariant::Int); QVERIFY(seriesIndexSpyArg.at(1).toInt() == 1); - setSpyArg = setSpy1.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == false); - setIndexSpyArg = setIndexSpy1.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == false); @@ -910,19 +793,11 @@ void tst_QHorizontalBarSeries::mousehovered() // move mouse on top of set2, bar1 to check the index (hover in set2) QTest::mouseMove(view.viewport(), layout.at(3).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setSpy1.count(), 0); - TRY_COMPARE(setSpy2.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 0); TRY_COMPARE(setIndexSpy2.count(), 1); // should enter set2, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -930,10 +805,6 @@ void tst_QHorizontalBarSeries::mousehovered() QVERIFY(seriesIndexSpyArg.at(1).type() == QVariant::Int); QVERIFY(seriesIndexSpyArg.at(1).toInt() == 1); - setSpyArg = setSpy2.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == true); - setIndexSpyArg = setIndexSpy2.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == true); @@ -945,19 +816,11 @@ void tst_QHorizontalBarSeries::mousehovered() //(hover out set2) QTest::mouseMove(view.viewport(), QPoint(0, (layout.at(3).top() + layout.at(3).bottom()) / 2)); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); - TRY_COMPARE(setSpy1.count(), 0); - TRY_COMPARE(setSpy2.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 0); TRY_COMPARE(setIndexSpy2.count(), 1); // should leave set2, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -965,10 +828,6 @@ void tst_QHorizontalBarSeries::mousehovered() QVERIFY(seriesIndexSpyArg.at(1).type() == QVariant::Int); QVERIFY(seriesIndexSpyArg.at(1).toInt() == 1); - setSpyArg = setSpy2.takeFirst(); - QVERIFY(setSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(setSpyArg.at(0).toBool() == false); - setIndexSpyArg = setIndexSpy2.takeFirst(); QVERIFY(setIndexSpyArg.at(0).type() == QVariant::Bool); QVERIFY(setIndexSpyArg.at(0).toBool() == false); diff --git a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp index 5300997..d5df8bd 100644 --- a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp +++ b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp @@ -306,7 +306,6 @@ void tst_QHorizontalPercentBarSeries::mousehovered() QList barSets = series->barSets(); - QSignalSpy seriesSpy(series,SIGNAL(hovered(bool,QBarSet*))); QSignalSpy seriesIndexSpy(series, SIGNAL(hovered(bool, int, QBarSet*))); QSignalSpy setIndexSpy1(set1, SIGNAL(hovered(bool, int))); QSignalSpy setIndexSpy2(set2, SIGNAL(hovered(bool, int))); @@ -355,22 +354,15 @@ void tst_QHorizontalPercentBarSeries::mousehovered() // move mouse to left border QTest::mouseMove(view.viewport(), QPoint(0, layout.at(4).center().y())); QCoreApplication::processEvents(QEventLoop::AllEvents, 10000); - TRY_COMPARE(seriesSpy.count(), 0); TRY_COMPARE(seriesIndexSpy.count(), 0); //======================================================================= // move mouse on top of set1 QTest::mouseMove(view.viewport(), layout.at(4).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 0); - QList seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - QList seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -383,17 +375,11 @@ void tst_QHorizontalPercentBarSeries::mousehovered() //======================================================================= // move mouse from top of set1 to top of set2 QTest::mouseMove(view.viewport(), layout.at(5).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 2); TRY_COMPARE(seriesIndexSpy.count(), 2); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 1); // should leave set1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -404,11 +390,6 @@ void tst_QHorizontalPercentBarSeries::mousehovered() QVERIFY(setIndexSpyArg.at(0).toBool() == false); // should enter set2 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -421,17 +402,11 @@ void tst_QHorizontalPercentBarSeries::mousehovered() //======================================================================= // move mouse from top of set2 to background QTest::mouseMove(view.viewport(), QPoint(layout.at(5).center().x(), 0)); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 0); TRY_COMPARE(setIndexSpy2.count(), 1); // should leave set2 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -445,17 +420,11 @@ void tst_QHorizontalPercentBarSeries::mousehovered() // move mouse on top of set1, bar0 to check the index (hover into set1) QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 0); //should enter set1, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -475,17 +444,11 @@ void tst_QHorizontalPercentBarSeries::mousehovered() QTest::mouseMove(view.viewport(), layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 10000); - TRY_COMPARE(seriesSpy.count(), 2); TRY_COMPARE(seriesIndexSpy.count(), 2); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 1); //should leave set1, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -500,11 +463,6 @@ void tst_QHorizontalPercentBarSeries::mousehovered() QVERIFY(setIndexSpyArg.at(1).toInt() == 0); //should enter set2, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -523,17 +481,11 @@ void tst_QHorizontalPercentBarSeries::mousehovered() // hover in set1) QTest::mouseMove(view.viewport(), layout.at(2).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 2); TRY_COMPARE(seriesIndexSpy.count(), 2); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 1); //should leave set2, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -548,11 +500,6 @@ void tst_QHorizontalPercentBarSeries::mousehovered() QVERIFY(setIndexSpyArg.at(1).toInt() == 0); //should enter set1, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -571,17 +518,11 @@ void tst_QHorizontalPercentBarSeries::mousehovered() QTest::mouseMove(view.viewport(), QPoint(layout.at(3).left(), (layout.at(3).top() + layout.at(4).bottom()) / 2)); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 0); //should leave set1, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -599,17 +540,11 @@ void tst_QHorizontalPercentBarSeries::mousehovered() // move mouse on top of set2, bar1 to check the index (hover in set2) QTest::mouseMove(view.viewport(), layout.at(3).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 0); TRY_COMPARE(setIndexSpy2.count(), 1); //should enter set2, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -629,17 +564,11 @@ void tst_QHorizontalPercentBarSeries::mousehovered() (layout.at(3).top() + layout.at(4).bottom()) / 2)); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 0); TRY_COMPARE(setIndexSpy2.count(), 1); //should leave set1, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); diff --git a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp index 1d2e17b..10dc367 100644 --- a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp +++ b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp @@ -310,7 +310,6 @@ void tst_QHorizontalStackedBarSeries::mousehovered() QList barSets = series->barSets(); - QSignalSpy seriesSpy(series,SIGNAL(hovered(bool,QBarSet*))); QSignalSpy seriesIndexSpy(series, SIGNAL(hovered(bool, int, QBarSet*))); QSignalSpy setIndexSpy1(set1, SIGNAL(hovered(bool, int))); QSignalSpy setIndexSpy2(set2, SIGNAL(hovered(bool, int))); @@ -364,22 +363,15 @@ void tst_QHorizontalStackedBarSeries::mousehovered() // move mouse to left border QTest::mouseMove(view.viewport(), QPoint(0, layout.at(4).center().y())); QCoreApplication::processEvents(QEventLoop::AllEvents, 10000); - TRY_COMPARE(seriesSpy.count(), 0); TRY_COMPARE(seriesIndexSpy.count(), 0); //======================================================================= // move mouse on top of set1 QTest::mouseMove(view.viewport(), layout.at(4).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 0); - QList seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - QList seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -392,17 +384,11 @@ void tst_QHorizontalStackedBarSeries::mousehovered() //======================================================================= // move mouse from top of set1 to top of set2 QTest::mouseMove(view.viewport(), layout.at(5).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 2); TRY_COMPARE(seriesIndexSpy.count(), 2); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 1); // should leave set1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -413,11 +399,6 @@ void tst_QHorizontalStackedBarSeries::mousehovered() QVERIFY(setIndexSpyArg.at(0).toBool() == false); // should enter set2 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -430,17 +411,11 @@ void tst_QHorizontalStackedBarSeries::mousehovered() //======================================================================= // move mouse from top of set2 to background QTest::mouseMove(view.viewport(), QPoint(layout.at(5).center().y(), 0)); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 0); TRY_COMPARE(setIndexSpy2.count(), 1); // should leave set2 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -454,17 +429,11 @@ void tst_QHorizontalStackedBarSeries::mousehovered() // move mouse on top of set1, bar0 to check the index (hover into set1) QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 0); //should enter set1, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -484,17 +453,11 @@ void tst_QHorizontalStackedBarSeries::mousehovered() QTest::mouseMove(view.viewport(), layout.at(1).center().toPoint()); QCoreApplication::processEvents(QEventLoop::AllEvents, 10000); - TRY_COMPARE(seriesSpy.count(), 2); TRY_COMPARE(seriesIndexSpy.count(), 2); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 1); //should leave set1, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -509,11 +472,6 @@ void tst_QHorizontalStackedBarSeries::mousehovered() QVERIFY(setIndexSpyArg.at(1).toInt() == 0); //should enter set2, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -532,17 +490,11 @@ void tst_QHorizontalStackedBarSeries::mousehovered() // hover in set1) QTest::mouseMove(view.viewport(), layout.at(2).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 2); TRY_COMPARE(seriesIndexSpy.count(), 2); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 1); //should leave set2, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -557,11 +509,6 @@ void tst_QHorizontalStackedBarSeries::mousehovered() QVERIFY(setIndexSpyArg.at(1).toInt() == 0); //should enter set1, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -580,17 +527,11 @@ void tst_QHorizontalStackedBarSeries::mousehovered() QTest::mouseMove(view.viewport(), QPoint(layout.at(3).left(), (layout.at(3).top() + layout.at(4).bottom()) / 2)); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 0); //should leave set1, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -608,17 +549,11 @@ void tst_QHorizontalStackedBarSeries::mousehovered() // move mouse on top of set2, bar1 to check the index (hover in set2) QTest::mouseMove(view.viewport(), layout.at(3).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 0); TRY_COMPARE(setIndexSpy2.count(), 1); //should enter set2, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -638,17 +573,11 @@ void tst_QHorizontalStackedBarSeries::mousehovered() (layout.at(3).top() + layout.at(4).bottom()) / 2)); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 0); TRY_COMPARE(setIndexSpy2.count(), 1); //should leave set1, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); diff --git a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp index 15bfc49..d5894c2 100644 --- a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp +++ b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp @@ -308,7 +308,6 @@ void tst_QPercentBarSeries::mousehovered() QList barSets = series->barSets(); - QSignalSpy seriesSpy(series,SIGNAL(hovered(bool,QBarSet*))); QSignalSpy seriesIndexSpy(series, SIGNAL(hovered(bool, int, QBarSet*))); QSignalSpy setIndexSpy1(set1, SIGNAL(hovered(bool, int))); QSignalSpy setIndexSpy2(set2, SIGNAL(hovered(bool, int))); @@ -359,22 +358,15 @@ void tst_QPercentBarSeries::mousehovered() // move mouse to left border QTest::mouseMove(view.viewport(), QPoint(0, layout.at(0).center().y())); QCoreApplication::processEvents(QEventLoop::AllEvents, 10000); - TRY_COMPARE(seriesSpy.count(), 0); TRY_COMPARE(seriesIndexSpy.count(), 0); //======================================================================= // move mouse on top of set1 QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 0); - QList seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - QList seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -387,17 +379,11 @@ void tst_QPercentBarSeries::mousehovered() //======================================================================= // move mouse from top of set1 to top of set2 QTest::mouseMove(view.viewport(), layout.at(1).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 2); TRY_COMPARE(seriesIndexSpy.count(), 2); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 1); // should leave set1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -408,11 +394,6 @@ void tst_QPercentBarSeries::mousehovered() QVERIFY(setIndexSpyArg.at(0).toBool() == false); // should enter set2 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -425,17 +406,11 @@ void tst_QPercentBarSeries::mousehovered() //======================================================================= // move mouse from top of set2 to background QTest::mouseMove(view.viewport(), QPoint(layout.at(1).center().x(), 0)); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 0); TRY_COMPARE(setIndexSpy2.count(), 1); // should leave set2 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -449,17 +424,11 @@ void tst_QPercentBarSeries::mousehovered() // move mouse on top of set1, bar0 to check the index (hover into set1) QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 0); //should enter set1, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -478,17 +447,11 @@ void tst_QPercentBarSeries::mousehovered() // hover in set2) QTest::mouseMove(view.viewport(), layout.at(1).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 2); TRY_COMPARE(seriesIndexSpy.count(), 2); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 1); //should leave set1, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -503,11 +466,6 @@ void tst_QPercentBarSeries::mousehovered() QVERIFY(setIndexSpyArg.at(1).toInt() == 0); //should enter set2, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -526,17 +484,11 @@ void tst_QPercentBarSeries::mousehovered() // hover in set1) QTest::mouseMove(view.viewport(), layout.at(2).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 2); TRY_COMPARE(seriesIndexSpy.count(), 2); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 1); //should leave set2, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -551,11 +503,6 @@ void tst_QPercentBarSeries::mousehovered() QVERIFY(setIndexSpyArg.at(1).toInt() == 0); //should enter set1, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -575,17 +522,11 @@ void tst_QPercentBarSeries::mousehovered() layout.at(2).top())); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 0); //should leave set1, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -603,17 +544,11 @@ void tst_QPercentBarSeries::mousehovered() // move mouse on top of set2, bar1 to check the index (hover in set2) QTest::mouseMove(view.viewport(), layout.at(3).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 0); TRY_COMPARE(setIndexSpy2.count(), 1); //should enter set2, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -633,17 +568,11 @@ void tst_QPercentBarSeries::mousehovered() layout.at(2).top())); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 0); TRY_COMPARE(setIndexSpy2.count(), 1); //should leave set1, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); diff --git a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp index 17d447f..e5dcfa3 100644 --- a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp +++ b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp @@ -310,7 +310,6 @@ void tst_QStackedBarSeries::mousehovered() QList barSets = series->barSets(); - QSignalSpy seriesSpy(series,SIGNAL(hovered(bool,QBarSet*))); QSignalSpy seriesIndexSpy(series, SIGNAL(hovered(bool, int, QBarSet*))); QSignalSpy setIndexSpy1(set1, SIGNAL(hovered(bool, int))); QSignalSpy setIndexSpy2(set2, SIGNAL(hovered(bool, int))); @@ -365,22 +364,15 @@ void tst_QStackedBarSeries::mousehovered() // move mouse to left border QTest::mouseMove(view.viewport(), QPoint(0, layout.at(0).center().y())); QCoreApplication::processEvents(QEventLoop::AllEvents, 10000); - TRY_COMPARE(seriesSpy.count(), 0); TRY_COMPARE(seriesIndexSpy.count(), 0); //======================================================================= // move mouse on top of set1 QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 0); - QList seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - QList seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -393,17 +385,11 @@ void tst_QStackedBarSeries::mousehovered() //======================================================================= // move mouse from top of set1 to top of set2 QTest::mouseMove(view.viewport(), layout.at(1).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 2); TRY_COMPARE(seriesIndexSpy.count(), 2); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 1); // should leave set1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -414,11 +400,6 @@ void tst_QStackedBarSeries::mousehovered() QVERIFY(setIndexSpyArg.at(0).toBool() == false); // should enter set2 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -431,17 +412,11 @@ void tst_QStackedBarSeries::mousehovered() //======================================================================= // move mouse from top of set2 to background QTest::mouseMove(view.viewport(), QPoint(layout.at(1).center().x(), 0)); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 0); TRY_COMPARE(setIndexSpy2.count(), 1); // should leave set2 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -455,17 +430,11 @@ void tst_QStackedBarSeries::mousehovered() // move mouse on top of set1, bar0 to check the index (hover into set1) QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 0); //should enter set1, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -484,17 +453,11 @@ void tst_QStackedBarSeries::mousehovered() // hover in set2) QTest::mouseMove(view.viewport(), layout.at(1).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 2); TRY_COMPARE(seriesIndexSpy.count(), 2); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 1); //should leave set1, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -509,11 +472,6 @@ void tst_QStackedBarSeries::mousehovered() QVERIFY(setIndexSpyArg.at(1).toInt() == 0); //should enter set2, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -532,17 +490,11 @@ void tst_QStackedBarSeries::mousehovered() // hover in set1) QTest::mouseMove(view.viewport(), layout.at(2).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 2); TRY_COMPARE(seriesIndexSpy.count(), 2); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 1); //should leave set2, bar0 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -557,11 +509,6 @@ void tst_QStackedBarSeries::mousehovered() QVERIFY(setIndexSpyArg.at(1).toInt() == 0); //should enter set1, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -581,17 +528,11 @@ void tst_QStackedBarSeries::mousehovered() layout.at(2).top())); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 1); TRY_COMPARE(setIndexSpy2.count(), 0); //should leave set1, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set1); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -609,17 +550,11 @@ void tst_QStackedBarSeries::mousehovered() // move mouse on top of set2, bar1 to check the index (hover in set2) QTest::mouseMove(view.viewport(), layout.at(3).center().toPoint()); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 0); TRY_COMPARE(setIndexSpy2.count(), 1); //should enter set2, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool); @@ -639,17 +574,11 @@ void tst_QStackedBarSeries::mousehovered() layout.at(2).top())); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(seriesIndexSpy.count(), 1); TRY_COMPARE(setIndexSpy1.count(), 0); TRY_COMPARE(setIndexSpy2.count(), 1); //should leave set1, bar1 - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == false); - seriesIndexSpyArg = seriesIndexSpy.takeFirst(); QCOMPARE(qvariant_cast(seriesIndexSpyArg.at(2)), set2); QVERIFY(seriesIndexSpyArg.at(0).type() == QVariant::Bool);