barseries autotest update

1 files changed, 22 insertions, 94 deletions

diff --git a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp
index 5c411c9e..58ab5f76 100644
--- a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp
+++ b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp
@@ -112,8 +112,6 @@ void tst_QStackedBarSeries::mouseclicked()
     *set2 << 10 << 10 << 10;
     series->append(set2);
 
-    QSignalSpy setSpy1(set1, SIGNAL(clicked(QString)));
-    QSignalSpy setSpy2(set2, SIGNAL(clicked(QString)));
     QSignalSpy seriesSpy(series,SIGNAL(clicked(QBarSet*,QString)));
 
     QChartView view(new QChart());
@@ -124,109 +122,69 @@ void tst_QStackedBarSeries::mouseclicked()
 
 //====================================================================================
 // barset 1, category test1
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(115,230));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(106,190));
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
-    QCOMPARE(setSpy1.count(), 1);
-    QCOMPARE(setSpy2.count(), 0);
     QCOMPARE(seriesSpy.count(), 1);
-    QList<QVariant> setSpyArg = setSpy1.takeFirst();
-    QVERIFY(setSpyArg.at(0).type() == QVariant::String);
-    QVERIFY(setSpyArg.at(0).toString().compare(QString("test1")) == 0);
 
     QList<QVariant> seriesSpyArg = seriesSpy.takeFirst();
     QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
+    QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test1")) == 0);
 
 //====================================================================================
 // barset 1, category test2
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(205,230));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(199,190));
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
-    QCOMPARE(setSpy1.count(), 1);
-    QCOMPARE(setSpy2.count(), 0);
     QCOMPARE(seriesSpy.count(), 1);
-    setSpyArg = setSpy1.takeFirst();
-    QVERIFY(setSpyArg.at(0).type() == QVariant::String);
-    QVERIFY(setSpyArg.at(0).toString().compare(QString("test2")) == 0);
 
     seriesSpyArg = seriesSpy.takeFirst();
     QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
+    QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test2")) == 0);
 
 //====================================================================================
 // barset 1, category test3
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(300,230));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(292,190));
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
-    QCOMPARE(setSpy1.count(), 1);
-    QCOMPARE(setSpy2.count(), 0);
     QCOMPARE(seriesSpy.count(), 1);
-    setSpyArg = setSpy1.takeFirst();
-    QVERIFY(setSpyArg.at(0).type() == QVariant::String);
-    QVERIFY(setSpyArg.at(0).toString().compare(QString("test3")) == 0);
 
     seriesSpyArg = seriesSpy.takeFirst();
     QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
+    QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test3")) == 0);
 
 //====================================================================================
 // barset 2, category test1
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(115,140));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(106,95));
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
-    QCOMPARE(setSpy1.count(), 0);
-    QCOMPARE(setSpy2.count(), 1);
     QCOMPARE(seriesSpy.count(), 1);
-    setSpyArg = setSpy2.takeFirst();
-    QVERIFY(setSpyArg.at(0).type() == QVariant::String);
-    QVERIFY(setSpyArg.at(0).toString().compare(QString("test1")) == 0);
 
     seriesSpyArg = seriesSpy.takeFirst();
     QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
+    QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test1")) == 0);
 
 //====================================================================================
 // barset 2, category test2
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(205,140));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(199,95));
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
-    QCOMPARE(setSpy1.count(), 0);
-    QCOMPARE(setSpy2.count(), 1);
     QCOMPARE(seriesSpy.count(), 1);
-    setSpyArg = setSpy2.takeFirst();
-    QVERIFY(setSpyArg.at(0).type() == QVariant::String);
-    QVERIFY(setSpyArg.at(0).toString().compare(QString("test2")) == 0);
 
     seriesSpyArg = seriesSpy.takeFirst();
     QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
+    QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test2")) == 0);
 
 //====================================================================================
 // barset 2, category test3
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(300,140));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(292,95));
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
-    QCOMPARE(setSpy1.count(), 0);
-    QCOMPARE(setSpy2.count(), 1);
     QCOMPARE(seriesSpy.count(), 1);
-    setSpyArg = setSpy2.takeFirst();
-    QVERIFY(setSpyArg.at(0).type() == QVariant::String);
-    QVERIFY(setSpyArg.at(0).toString().compare(QString("test3")) == 0);
 
     seriesSpyArg = seriesSpy.takeFirst();
     QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
-
-//====================================================================================
-// no event cases
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(1,1));     // Outside of both sets
-    QTest::mouseClick(view.viewport(), Qt::RightButton, 0, QPoint(1,1));    // Right mouse button outside and inside sets
-    QTest::mouseClick(view.viewport(), Qt::RightButton, 0, QPoint(115,230)); // barset 1, category test1
-    QTest::mouseClick(view.viewport(), Qt::RightButton, 0, QPoint(205,230)); // barset 1, category test2
-    QTest::mouseClick(view.viewport(), Qt::RightButton, 0, QPoint(300,230)); // barset 1, category test3
-    QTest::mouseClick(view.viewport(), Qt::RightButton, 0, QPoint(115,140)); // barset 2, category test1
-    QTest::mouseClick(view.viewport(), Qt::RightButton, 0, QPoint(205,140)); // barset 2, category test2
-    QTest::mouseClick(view.viewport(), Qt::RightButton, 0, QPoint(300,140)); // barset 2, category test3
-
-    QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
-    QCOMPARE(setSpy1.count(), 0);
-    QCOMPARE(setSpy2.count(), 0);
-    QCOMPARE(seriesSpy.count(), 0);
+    QVERIFY(seriesSpyArg.at(1).toString().compare(QString("test3")) == 0);
 }
 
 void tst_QStackedBarSeries::mousehovered_data()
@@ -249,8 +207,6 @@ void tst_QStackedBarSeries::mousehovered()
     *set2 << 10 << 10 << 10;
     series->append(set2);
 
-    QSignalSpy setSpy1(set1, SIGNAL(hovered(bool)));
-    QSignalSpy setSpy2(set2, SIGNAL(hovered(bool)));
     QSignalSpy seriesSpy(series,SIGNAL(hovered(QBarSet*,bool)));
 
     QChartView view(new QChart());
@@ -259,48 +215,33 @@ void tst_QStackedBarSeries::mousehovered()
     view.show();
     QTest::qWaitForWindowShown(&view);
 
+    //this is hack since view does not get events otherwise
+    view.setMouseTracking(true);
+
 //=======================================================================
 // move mouse to left border
-    QTest::mouseMove(view.viewport(), QPoint(0, 230));
+    QTest::mouseMove(view.viewport(), QPoint(0, 190));
 
-    QVERIFY(setSpy1.count() == 0);
-    QVERIFY(setSpy2.count() == 0);
     QVERIFY(seriesSpy.count() == 0);
 
 //=======================================================================
 // move mouse on top of set1
-    QTest::mouseMove(view.viewport(), QPoint(115,230));
+    QTest::mouseMove(view.viewport(), QPoint(106,190));
 
-    QVERIFY(setSpy1.count() == 1);
-    QVERIFY(setSpy2.count() == 0);
     QVERIFY(seriesSpy.count() == 1);
 
-    QList<QVariant> setSpyArg = setSpy1.takeFirst();
-    QVERIFY(setSpyArg.at(0).type() == QVariant::Bool);
-    QVERIFY(setSpyArg.at(0).toBool() == true);
-
     QList<QVariant> seriesSpyArg = seriesSpy.takeFirst();
     QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
+    QVERIFY(seriesSpyArg.at(1).type() == QVariant::Bool);
+    QVERIFY(seriesSpyArg.at(1).toBool() == true);
 
 //=======================================================================
 // move mouse from top of set1 to top of set2
-    QTest::mouseMove(view.viewport(), QPoint(115,140));
+    QTest::mouseMove(view.viewport(), QPoint(106,95));
 
-    QVERIFY(setSpy1.count() == 1);
-    QVERIFY(setSpy2.count() == 1);
     QVERIFY(seriesSpy.count() == 2);
 
     // should leave set1
-    setSpyArg = setSpy1.takeFirst();
-    QVERIFY(setSpyArg.at(0).type() == QVariant::Bool);
-    QVERIFY(setSpyArg.at(0).toBool() == false);
-
-    // should enter set2
-    setSpyArg = setSpy2.takeFirst();
-    QVERIFY(setSpyArg.at(0).type() == QVariant::Bool);
-    QVERIFY(setSpyArg.at(0).toBool() == true);
-
-    // should leave set1
     seriesSpyArg = seriesSpy.takeFirst();
     QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
     QVERIFY(seriesSpyArg.at(1).type() == QVariant::Bool);
@@ -314,30 +255,17 @@ void tst_QStackedBarSeries::mousehovered()
 
 //=======================================================================
 // move mouse from top of set2 to background
-    QTest::mouseMove(view.viewport(), QPoint(0,140));
+    QTest::mouseMove(view.viewport(), QPoint(106,0));
 
-    QVERIFY(setSpy1.count() == 0);
-    QVERIFY(setSpy2.count() == 1);
     QVERIFY(seriesSpy.count() == 1);
 
-    // should leave set2 (event via set)
-    setSpyArg = setSpy2.takeFirst();
-    QVERIFY(setSpyArg.at(0).type() == QVariant::Bool);
-    QVERIFY(setSpyArg.at(0).toBool() == false);
-
-    // should leave set2 (event via series)
+    // should leave set2
     seriesSpyArg = seriesSpy.takeFirst();
     QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
     QVERIFY(seriesSpyArg.at(1).type() == QVariant::Bool);
     QVERIFY(seriesSpyArg.at(1).toBool() == false);
 }
 
-
-/*
-bool setModel(QAbstractItemModel *model);
-void setModelMapping(int categories, int bottomBoundary, int topBoundary, Qt::Orientation orientation = Qt::Vertical);
-void setModelMappingRange(int first, int count = -1);
-*/
 QTEST_MAIN(tst_QStackedBarSeries)
 
 #include "tst_qstackedbarseries.moc"