bar test update. Tests now calculate expected layout from charts plot area and use that instead of precalculated QPointF magic numbers

6 files changed, 503 insertions, 84 deletions

diff --git a/tests/auto/qbarseries/tst_qbarseries.cpp b/tests/auto/qbarseries/tst_qbarseries.cpp
index 823d96fd..98f080b9 100644
--- a/tests/auto/qbarseries/tst_qbarseries.cpp
+++ b/tests/auto/qbarseries/tst_qbarseries.cpp
@@ -380,6 +380,7 @@ void tst_QBarSeries::mouseclicked()
     QBarSet* set2 = new QBarSet(QString("set 2"));
     *set2 << 10 << 10 << 10;
     series->append(set2);
+    QList<QBarSet*> barSets = series->barSets();
 
     QSignalSpy seriesSpy(series,SIGNAL(clicked(int,QBarSet*)));
     QSignalSpy setSpy1(set1, SIGNAL(clicked(int)));
@@ -391,9 +392,40 @@ void tst_QBarSeries::mouseclicked()
     view.show();
     QTest::qWaitForWindowShown(&view);
 
+    // Calculate expected layout for bars
+    QRectF plotArea = view.chart()->plotArea();
+    qreal width = plotArea.width();
+    qreal height = plotArea.height();
+    qreal rangeY = 10;  // From 0 to 10 because of maximum value in set is 10
+    qreal rangeX = 3; // 3 values per set
+    qreal scaleY = (height / rangeY);
+    qreal scaleX = (width / rangeX);
+
+    qreal setCount = series->count();
+    qreal domainMinY = 0;       // These come from internal domain used by barseries.
+    qreal domainMinX = -0.5;    // No access to domain from outside, so use hard coded values.
+    qreal rectWidth = (scaleX / setCount) * series->barWidth();
+
+    QVector<QRectF> layout;
+
+    // 3 = count of values in set
+    // Note that rects in this vector will be interleaved (set1 bar0, set2 bar0, set1 bar1, set2 bar1, etc.)
+    for (int i = 0; i < 3; i++) {
+        qreal yPos = height + scaleY * domainMinY + plotArea.top();
+        for (int set = 0; set < setCount; set++) {
+            qreal xPos = (i - domainMinX) * scaleX + plotArea.left();
+            xPos -= series->count()*rectWidth/2;
+            xPos += set*rectWidth;
+
+            qreal rectHeight = barSets.at(set)->at(i) * scaleY;
+            QRectF rect(xPos, yPos - rectHeight, rectWidth, rectHeight);
+            layout.append(rect);
+        }
+    }
+
 //====================================================================================
 // barset 1, bar 0
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(72,150));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -411,7 +443,7 @@ void tst_QBarSeries::mouseclicked()
 
 //====================================================================================
 // barset 1, bar 1
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(186,150));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -429,7 +461,7 @@ void tst_QBarSeries::mouseclicked()
 
 //====================================================================================
 // barset 1, bar 2
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(300,150));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -447,7 +479,7 @@ void tst_QBarSeries::mouseclicked()
 
 //====================================================================================
 // barset 2, bar 0
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(100,150));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -465,7 +497,7 @@ void tst_QBarSeries::mouseclicked()
 
 //====================================================================================
 // barset 2, bar 1
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(214,150));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -483,7 +515,7 @@ void tst_QBarSeries::mouseclicked()
 
 //====================================================================================
 // barset 2, bar 2
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(328,150));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -518,6 +550,7 @@ void tst_QBarSeries::mousehovered()
     QBarSet* set2 = new QBarSet(QString("set 2"));
     *set2 << 10 << 10 << 10;
     series->append(set2);
+    QList<QBarSet*> barSets = series->barSets();
 
     QSignalSpy seriesSpy(series,SIGNAL(hovered(bool,QBarSet*)));
     QSignalSpy setSpy1(set1, SIGNAL(hovered(bool)));
@@ -532,9 +565,40 @@ void tst_QBarSeries::mousehovered()
     //this is hack since view does not get events otherwise
     view.setMouseTracking(true);
 
+    // Calculate expected layout for bars
+    QRectF plotArea = view.chart()->plotArea();
+    qreal width = plotArea.width();
+    qreal height = plotArea.height();
+    qreal rangeY = 10;  // From 0 to 10 because of maximum value in set is 10
+    qreal rangeX = 3;   // 3 values per set
+    qreal scaleY = (height / rangeY);
+    qreal scaleX = (width / rangeX);
+
+    qreal setCount = series->count();
+    qreal domainMinY = 0;       // These come from internal domain used by barseries.
+    qreal domainMinX = -0.5;    // No access to domain from outside, so use hard coded values.
+    qreal rectWidth = (scaleX / setCount) * series->barWidth();
+
+    QVector<QRectF> layout;
+
+    // 3 = count of values in set
+    // Note that rects in this vector will be interleaved (set1 bar0, set2 bar0, set1 bar1, set2 bar1, etc.)
+    for (int i = 0; i < 3; i++) {
+        qreal yPos = height + scaleY * domainMinY + plotArea.top();
+        for (int set = 0; set < setCount; set++) {
+            qreal xPos = (i - domainMinX) * scaleX + plotArea.left();
+            xPos -= series->count()*rectWidth/2;
+            xPos += set*rectWidth;
+
+            qreal rectHeight = barSets.at(set)->at(i) * scaleY;
+            QRectF rect(xPos, yPos - rectHeight, rectWidth, rectHeight);
+            layout.append(rect);
+        }
+    }
+
 //=======================================================================
 // move mouse to left border
-    QTest::mouseMove(view.viewport(), QPoint(0, 150));
+    QTest::mouseMove(view.viewport(), QPoint(0, layout.at(0).center().y()));
     QCoreApplication::processEvents(QEventLoop::AllEvents, 10000);
     TRY_COMPARE(seriesSpy.count(), 0);
     TRY_COMPARE(setSpy1.count(), 0);
@@ -542,7 +606,7 @@ void tst_QBarSeries::mousehovered()
 
 //=======================================================================
 // move mouse on top of set1
-    QTest::mouseMove(view.viewport(), QPoint(72,150));
+    QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint());
     TRY_COMPARE(seriesSpy.count(), 1);
     TRY_COMPARE(setSpy1.count(), 1);
     TRY_COMPARE(setSpy2.count(), 0);
@@ -558,7 +622,7 @@ void tst_QBarSeries::mousehovered()
 
 //=======================================================================
 // move mouse from top of set1 to top of set2
-    QTest::mouseMove(view.viewport(), QPoint(100,150));
+    QTest::mouseMove(view.viewport(), layout.at(1).center().toPoint());
     TRY_COMPARE(seriesSpy.count(), 2);
     TRY_COMPARE(setSpy1.count(), 1);
     TRY_COMPARE(setSpy2.count(), 1);
@@ -585,7 +649,7 @@ void tst_QBarSeries::mousehovered()
 
 //=======================================================================
 // move mouse from top of set2 to background
-    QTest::mouseMove(view.viewport(), QPoint(100,0));
+    QTest::mouseMove(view.viewport(), QPoint(layout.at(1).center().x(), 0));
     TRY_COMPARE(seriesSpy.count(), 1);
     TRY_COMPARE(setSpy1.count(), 0);
     TRY_COMPARE(setSpy2.count(), 1);
diff --git a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp
index b14b369e..9cb44a7c 100644
--- a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp
+++ b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp
@@ -327,6 +327,8 @@ void tst_QHorizontalBarSeries::mouseclicked()
     *set2 << 10 << 10 << 10;
     series->append(set2);
 
+    QList<QBarSet*> barSets = series->barSets();
+
     QSignalSpy seriesSpy(series,SIGNAL(clicked(int,QBarSet*)));
     QSignalSpy setSpy1(set1, SIGNAL(clicked(int)));
     QSignalSpy setSpy2(set2, SIGNAL(clicked(int)));
@@ -337,9 +339,40 @@ void tst_QHorizontalBarSeries::mouseclicked()
     view.show();
     QTest::qWaitForWindowShown(&view);
 
+    // Calculate expected layout for bars
+    QRectF plotArea = view.chart()->plotArea();
+    qreal width = plotArea.width();
+    qreal height = plotArea.height();
+    qreal rangeX = 10;  // From 0 to 10 because of maximum value in set is 10
+    qreal rangeY = 3;   // 3 values per set
+    qreal scaleY = (height / rangeY);
+    qreal scaleX = (width / rangeX);
+
+    qreal setCount = series->count();
+    qreal domainMinY = -0.5;    // These come from internal domain used by barseries.
+    qreal domainMinX = 0;       // No access to domain from outside, so use hard coded values.
+    qreal rectHeight = (scaleY / setCount) * series->barWidth(); // On horizontal chart barWidth of the barseries means height of the rect.
+
+    QVector<QRectF> layout;
+
+    // 3 = count of values in set
+    // Note that rects in this vector will be interleaved (set1 bar0, set2 bar0, set1 bar1, set2 bar1, etc.)
+    for (int i = 0; i < 3; i++) {
+        qreal xPos = -scaleX * domainMinX + plotArea.left();
+        for (int set = 0; set < setCount; set++) {
+            qreal yPos = plotArea.bottom() + (domainMinY - i) * scaleY;
+            yPos += setCount*rectHeight/2;
+            yPos -= set*rectHeight;
+
+            qreal rectWidth = barSets.at(set)->at(i) * scaleX;
+            QRectF rect(xPos, yPos - rectHeight, rectWidth, rectHeight);
+            layout.append(rect);
+        }
+    }
+
 //====================================================================================
 // barset 1, bar 0
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(200,241));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -357,7 +390,7 @@ void tst_QHorizontalBarSeries::mouseclicked()
 
 //====================================================================================
 // barset 1, bar 1
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(200,160));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -375,7 +408,7 @@ void tst_QHorizontalBarSeries::mouseclicked()
 
 //====================================================================================
 // barset 1, bar 2
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(200,79));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -393,7 +426,7 @@ void tst_QHorizontalBarSeries::mouseclicked()
 
 //====================================================================================
 // barset 2, bar 0
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(200,221));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -411,7 +444,7 @@ void tst_QHorizontalBarSeries::mouseclicked()
 
 //====================================================================================
 // barset 2, bar 1
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(200,140));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -429,7 +462,7 @@ void tst_QHorizontalBarSeries::mouseclicked()
 
 //====================================================================================
 // barset 2, bar 2
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(200,59));
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -465,6 +498,8 @@ void tst_QHorizontalBarSeries::mousehovered()
     *set2 << 10 << 10 << 10;
     series->append(set2);
 
+    QList<QBarSet*> barSets = series->barSets();
+
     QSignalSpy seriesSpy(series,SIGNAL(hovered(bool,QBarSet*)));
     QSignalSpy setSpy1(set1, SIGNAL(hovered(bool)));
     QSignalSpy setSpy2(set2, SIGNAL(hovered(bool)));
@@ -478,9 +513,40 @@ void tst_QHorizontalBarSeries::mousehovered()
     //this is hack since view does not get events otherwise
     view.setMouseTracking(true);
 
+    // Calculate expected layout for bars
+    QRectF plotArea = view.chart()->plotArea();
+    qreal width = plotArea.width();
+    qreal height = plotArea.height();
+    qreal rangeX = 10;  // From 0 to 10 because of maximum value in set is 10
+    qreal rangeY = 3;   // 3 values per set
+    qreal scaleY = (height / rangeY);
+    qreal scaleX = (width / rangeX);
+
+    qreal setCount = series->count();
+    qreal domainMinY = -0.5;    // These come from internal domain used by barseries.
+    qreal domainMinX = 0;       // No access to domain from outside, so use hard coded values.
+    qreal rectHeight = (scaleY / setCount) * series->barWidth(); // On horizontal chart barWidth of the barseries means height of the rect.
+
+    QVector<QRectF> layout;
+
+    // 3 = count of values in set
+    // Note that rects in this vector will be interleaved (set1 bar0, set2 bar0, set1 bar1, set2 bar1, etc.)
+    for (int i = 0; i < 3; i++) {
+        qreal xPos = -scaleX * domainMinX + plotArea.left();
+        for (int set = 0; set < setCount; set++) {
+            qreal yPos = plotArea.bottom() + (domainMinY - i) * scaleY;
+            yPos += setCount*rectHeight/2;
+            yPos -= set*rectHeight;
+
+            qreal rectWidth = barSets.at(set)->at(i) * scaleX;
+            QRectF rect(xPos, yPos - rectHeight, rectWidth, rectHeight);
+            layout.append(rect);
+        }
+    }
+
 //=======================================================================
 // move mouse to bottom border
-    QTest::mouseMove(view.viewport(), QPoint(200, 300));
+    QTest::mouseMove(view.viewport(), QPoint(layout.at(0).center().x(), 300));
     QCoreApplication::processEvents(QEventLoop::AllEvents, 10000);
     TRY_COMPARE(seriesSpy.count(), 0);
     TRY_COMPARE(setSpy1.count(), 0);
@@ -488,7 +554,7 @@ void tst_QHorizontalBarSeries::mousehovered()
 
 //=======================================================================
 // move mouse on top of set1
-    QTest::mouseMove(view.viewport(), QPoint(200,241));
+    QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint());
     TRY_COMPARE(seriesSpy.count(), 1);
     TRY_COMPARE(setSpy1.count(), 1);
     TRY_COMPARE(setSpy2.count(), 0);
@@ -504,7 +570,7 @@ void tst_QHorizontalBarSeries::mousehovered()
 
 //=======================================================================
 // move mouse from top of set1 to top of set2
-    QTest::mouseMove(view.viewport(), QPoint(200,221));
+    QTest::mouseMove(view.viewport(), layout.at(1).center().toPoint());
     TRY_COMPARE(seriesSpy.count(), 2);
     TRY_COMPARE(setSpy1.count(), 1);
     TRY_COMPARE(setSpy2.count(), 1);
@@ -531,7 +597,7 @@ void tst_QHorizontalBarSeries::mousehovered()
 
 //=======================================================================
 // move mouse from top of set2 to background
-    QTest::mouseMove(view.viewport(), QPoint(0,221));
+    QTest::mouseMove(view.viewport(), QPoint(0, layout.at(0).center().y()));
     TRY_COMPARE(seriesSpy.count(), 1);
     TRY_COMPARE(setSpy1.count(), 0);
     TRY_COMPARE(setSpy2.count(), 1);
diff --git a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp
index 9ac30e35..9fe84da6 100644
--- a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp
+++ b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp
@@ -112,6 +112,8 @@ void tst_QHorizontalPercentBarSeries::mouseclicked()
     *set2 << 10 << 10 << 10;
     series->append(set2);
 
+    QList<QBarSet*> barSets = series->barSets();
+
     QSignalSpy seriesSpy(series,SIGNAL(clicked(int, QBarSet*)));
 
     QChartView view(new QChart());
@@ -120,9 +122,40 @@ void tst_QHorizontalPercentBarSeries::mouseclicked()
     view.show();
     QTest::qWaitForWindowShown(&view);
 
+    // Calculate expected layout for bars
+    QRectF plotArea = view.chart()->plotArea();
+    qreal width = plotArea.width();
+    qreal height = plotArea.height();
+    qreal rangeY = 3;   // 3 values per set
+    qreal rangeX = 100;  // From 0 to 100 because of scaling to 100%
+    qreal scaleY = (height / rangeY);
+    qreal scaleX = (width / rangeX);
+
+    qreal setCount = series->count();
+    qreal domainMinY = -0.5;    // These come from internal domain used by barseries.
+    qreal domainMinX = 0;       // No access to domain from outside, so use hard coded values.
+    qreal rectHeight = scaleY * series->barWidth(); // On horizontal chart barWidth of the barseries means height of the rect.
+
+    QVector<QRectF> layout;
+
+    // 3 = count of values in set
+    // Note that rects in this vector will be interleaved (set1 bar0, set2 bar0, set1 bar1, set2 bar1, etc.)
+    for (int i = 0; i < 3; i++) {
+        qreal colSum = 20; // Sum of values in column (10 + 10 in our test case)
+        qreal percentage = (100 / colSum);
+        qreal xPos = -scaleX * domainMinX + plotArea.left();
+        for (int set = 0; set < setCount; set++) {
+            qreal yPos = (domainMinY +0.5 -i) * scaleY + plotArea.bottom() - rectHeight/2;
+            qreal rectWidth = barSets.at(set)->at(i) * percentage * scaleX;
+            QRectF rect(xPos, yPos - rectHeight, rectWidth, rectHeight);
+            layout.append(rect);
+            xPos += rectWidth;
+        }
+    }
+
 //====================================================================================
-// barset 1, category test1
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(115,231));
+// barset 1, bar 0
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -133,8 +166,8 @@ void tst_QHorizontalPercentBarSeries::mouseclicked()
     QVERIFY(seriesSpyArg.at(0).toInt() == 0);
 
 //====================================================================================
-// barset 1, category test2
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(115,150));
+// barset 1, bar 1
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -145,8 +178,8 @@ void tst_QHorizontalPercentBarSeries::mouseclicked()
     QVERIFY(seriesSpyArg.at(0).toInt() == 1);
 
 //====================================================================================
-// barset 1, category test3
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(115,69));
+// barset 1, bar 2
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -157,8 +190,8 @@ void tst_QHorizontalPercentBarSeries::mouseclicked()
     QVERIFY(seriesSpyArg.at(0).toInt() == 2);
 
 //====================================================================================
-// barset 2, category test1
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(285,230));
+// barset 2, bar 0
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -169,8 +202,8 @@ void tst_QHorizontalPercentBarSeries::mouseclicked()
     QVERIFY(seriesSpyArg.at(0).toInt() == 0);
 
 //====================================================================================
-// barset 2, category test2
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(285,150));
+// barset 2, bar 1
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -181,8 +214,8 @@ void tst_QHorizontalPercentBarSeries::mouseclicked()
     QVERIFY(seriesSpyArg.at(0).toInt() == 1);
 
 //====================================================================================
-// barset 2, category test3
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(285,69));
+// barset 2, bar 2
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -212,6 +245,8 @@ void tst_QHorizontalPercentBarSeries::mousehovered()
     *set2 << 10 << 10 << 10;
     series->append(set2);
 
+    QList<QBarSet*> barSets = series->barSets();
+
     QSignalSpy seriesSpy(series,SIGNAL(hovered(bool, QBarSet*)));
 
     QChartView view(new QChart());
@@ -223,15 +258,46 @@ void tst_QHorizontalPercentBarSeries::mousehovered()
     //this is hack since view does not get events otherwise
     view.setMouseTracking(true);
 
+    // Calculate expected layout for bars
+    QRectF plotArea = view.chart()->plotArea();
+    qreal width = plotArea.width();
+    qreal height = plotArea.height();
+    qreal rangeY = 3;   // 3 values per set
+    qreal rangeX = 100;  // From 0 to 100 because of scaling to 100%
+    qreal scaleY = (height / rangeY);
+    qreal scaleX = (width / rangeX);
+
+    qreal setCount = series->count();
+    qreal domainMinY = -0.5;    // These come from internal domain used by barseries.
+    qreal domainMinX = 0;       // No access to domain from outside, so use hard coded values.
+    qreal rectHeight = scaleY * series->barWidth(); // On horizontal chart barWidth of the barseries means height of the rect.
+
+    QVector<QRectF> layout;
+
+    // 3 = count of values in set
+    // Note that rects in this vector will be interleaved (set1 bar0, set2 bar0, set1 bar1, set2 bar1, etc.)
+    for (int i = 0; i < 3; i++) {
+        qreal colSum = 20; // Sum of values in column (10 + 10 in our test case)
+        qreal percentage = (100 / colSum);
+        qreal xPos = -scaleX * domainMinX + plotArea.left();
+        for (int set = 0; set < setCount; set++) {
+            qreal yPos = (domainMinY +0.5 -i) * scaleY + plotArea.bottom() - rectHeight/2;
+            qreal rectWidth = barSets.at(set)->at(i) * percentage * scaleX;
+            QRectF rect(xPos, yPos - rectHeight, rectWidth, rectHeight);
+            layout.append(rect);
+            xPos += rectWidth;
+        }
+    }
+
 //=======================================================================
 // move mouse to left border
-    QTest::mouseMove(view.viewport(), QPoint(0, 231));
+    QTest::mouseMove(view.viewport(), QPoint(0, layout.at(4).center().y()));
     QCoreApplication::processEvents(QEventLoop::AllEvents, 10000);
     TRY_COMPARE(seriesSpy.count(), 0);
 
 //=======================================================================
 // move mouse on top of set1
-    QTest::mouseMove(view.viewport(), QPoint(115,231));
+    QTest::mouseMove(view.viewport(), layout.at(4).center().toPoint());
     TRY_COMPARE(seriesSpy.count(), 1);
 
     QList<QVariant> seriesSpyArg = seriesSpy.takeFirst();
@@ -241,7 +307,7 @@ void tst_QHorizontalPercentBarSeries::mousehovered()
 
 //=======================================================================
 // move mouse from top of set1 to top of set2
-    QTest::mouseMove(view.viewport(), QPoint(285,231));
+    QTest::mouseMove(view.viewport(), layout.at(5).center().toPoint());
     TRY_COMPARE(seriesSpy.count(), 2);
 
     // should leave set1
@@ -258,7 +324,7 @@ void tst_QHorizontalPercentBarSeries::mousehovered()
 
 //=======================================================================
 // move mouse from top of set2 to background
-    QTest::mouseMove(view.viewport(), QPoint(285,300));
+    QTest::mouseMove(view.viewport(), QPoint(layout.at(5).center().x(), 0));
     TRY_COMPARE(seriesSpy.count(), 1);
 
     // should leave set2
diff --git a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp
index f7f1ff17..900d36a1 100644
--- a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp
+++ b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp
@@ -112,6 +112,8 @@ void tst_QHorizontalStackedBarSeries::mouseclicked()
     *set2 << 10 << 10 << 10;
     series->append(set2);
 
+    QList<QBarSet*> barSets = series->barSets();
+
     QSignalSpy seriesSpy(series,SIGNAL(clicked(int, QBarSet*)));
 
     QChartView view(new QChart());
@@ -120,9 +122,45 @@ void tst_QHorizontalStackedBarSeries::mouseclicked()
     view.show();
     QTest::qWaitForWindowShown(&view);
 
+    // Calculate expected layout for bars
+    QRectF plotArea = view.chart()->plotArea();
+    qreal width = plotArea.width();
+    qreal height = plotArea.height();
+    qreal rangeY = 3;   // 3 values per set
+    qreal rangeX = 20;  // From 0 to 20 because bars are stacked (this should be height of highest stack)
+    qreal scaleY = (height / rangeY);
+    qreal scaleX = (width / rangeX);
+
+    qreal setCount = series->count();
+    qreal domainMinY = -0.5;    // These come from internal domain used by barseries.
+    qreal domainMinX = 0;       // No access to domain from outside, so use hard coded values.
+    qreal rectHeight = scaleY * series->barWidth(); // On horizontal chart barWidth of the barseries means height of the rect.
+
+    QVector<QRectF> layout;
+
+    // 3 = count of values in set
+    // Note that rects in this vector will be interleaved (set1 bar0, set2 bar0, set1 bar1, set2 bar1, etc.)
+    for (int i = 0; i < 3; i++) {
+        qreal xMax = -scaleX * domainMinX + plotArea.left();
+        qreal xMin = -scaleX * domainMinX + plotArea.left();
+        for (int set = 0; set < setCount; set++) {
+            qreal yPos = (domainMinY +0.5 -i) * scaleY + plotArea.bottom() - rectHeight/2;
+            qreal rectWidth = barSets.at(set)->at(i) * scaleX;
+            if (rectWidth > 0) {
+                QRectF rect(xMax, yPos - rectHeight, rectWidth, rectHeight);
+                layout.append(rect);
+                xMax += rectWidth;
+            } else {
+                QRectF rect(xMin, yPos - rectHeight, rectWidth, rectHeight);
+                layout.append(rect);
+                xMin += rectWidth;
+            }
+        }
+    }
+
 //====================================================================================
-// barset 1, category test1
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(115,231));
+// barset 1, bar 0
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -133,8 +171,8 @@ void tst_QHorizontalStackedBarSeries::mouseclicked()
     QVERIFY(seriesSpyArg.at(0).toInt() == 0);
 
 //====================================================================================
-// barset 1, category test2
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(115,150));
+// barset 1, bar 1
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -145,8 +183,8 @@ void tst_QHorizontalStackedBarSeries::mouseclicked()
     QVERIFY(seriesSpyArg.at(0).toInt() == 1);
 
 //====================================================================================
-// barset 1, category test3
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(115,69));
+// barset 1, bar 2
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -157,8 +195,8 @@ void tst_QHorizontalStackedBarSeries::mouseclicked()
     QVERIFY(seriesSpyArg.at(0).toInt() == 2);
 
 //====================================================================================
-// barset 2, category test1
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(285,230));
+// barset 2, bar 0
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -169,8 +207,8 @@ void tst_QHorizontalStackedBarSeries::mouseclicked()
     QVERIFY(seriesSpyArg.at(0).toInt() == 0);
 
 //====================================================================================
-// barset 2, category test2
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(285,150));
+// barset 2, bar 1
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -181,8 +219,8 @@ void tst_QHorizontalStackedBarSeries::mouseclicked()
     QVERIFY(seriesSpyArg.at(0).toInt() == 1);
 
 //====================================================================================
-// barset 2, category test3
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(285,69));
+// barset 2, bar 2
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -212,6 +250,8 @@ void tst_QHorizontalStackedBarSeries::mousehovered()
     *set2 << 10 << 10 << 10;
     series->append(set2);
 
+    QList<QBarSet*> barSets = series->barSets();
+
     QSignalSpy seriesSpy(series,SIGNAL(hovered(bool, QBarSet*)));
 
     QChartView view(new QChart());
@@ -223,15 +263,51 @@ void tst_QHorizontalStackedBarSeries::mousehovered()
     //this is hack since view does not get events otherwise
     view.setMouseTracking(true);
 
+    // Calculate expected layout for bars
+    QRectF plotArea = view.chart()->plotArea();
+    qreal width = plotArea.width();
+    qreal height = plotArea.height();
+    qreal rangeY = 3;   // 3 values per set
+    qreal rangeX = 20;  // From 0 to 20 because bars are stacked (this should be height of highest stack)
+    qreal scaleY = (height / rangeY);
+    qreal scaleX = (width / rangeX);
+
+    qreal setCount = series->count();
+    qreal domainMinY = -0.5;    // These come from internal domain used by barseries.
+    qreal domainMinX = 0;       // No access to domain from outside, so use hard coded values.
+    qreal rectHeight = scaleY * series->barWidth(); // On horizontal chart barWidth of the barseries means height of the rect.
+
+    QVector<QRectF> layout;
+
+    // 3 = count of values in set
+    // Note that rects in this vector will be interleaved (set1 bar0, set2 bar0, set1 bar1, set2 bar1, etc.)
+    for (int i = 0; i < 3; i++) {
+        qreal xMax = -scaleX * domainMinX + plotArea.left();
+        qreal xMin = -scaleX * domainMinX + plotArea.left();
+        for (int set = 0; set < setCount; set++) {
+            qreal yPos = (domainMinY +0.5 -i) * scaleY + plotArea.bottom() - rectHeight/2;
+            qreal rectWidth = barSets.at(set)->at(i) * scaleX;
+            if (rectWidth > 0) {
+                QRectF rect(xMax, yPos - rectHeight, rectWidth, rectHeight);
+                layout.append(rect);
+                xMax += rectWidth;
+            } else {
+                QRectF rect(xMin, yPos - rectHeight, rectWidth, rectHeight);
+                layout.append(rect);
+                xMin += rectWidth;
+            }
+        }
+    }
+
 //=======================================================================
 // move mouse to left border
-    QTest::mouseMove(view.viewport(), QPoint(0, 231));
+    QTest::mouseMove(view.viewport(), QPoint(0, layout.at(4).center().y()));
     QCoreApplication::processEvents(QEventLoop::AllEvents, 10000);
     TRY_COMPARE(seriesSpy.count(), 0);
 
 //=======================================================================
 // move mouse on top of set1
-    QTest::mouseMove(view.viewport(), QPoint(115,231));
+    QTest::mouseMove(view.viewport(), layout.at(4).center().toPoint());
     TRY_COMPARE(seriesSpy.count(), 1);
 
     QList<QVariant> seriesSpyArg = seriesSpy.takeFirst();
@@ -241,7 +317,7 @@ void tst_QHorizontalStackedBarSeries::mousehovered()
 
 //=======================================================================
 // move mouse from top of set1 to top of set2
-    QTest::mouseMove(view.viewport(), QPoint(285,231));
+    QTest::mouseMove(view.viewport(), layout.at(5).center().toPoint());
     TRY_COMPARE(seriesSpy.count(), 2);
 
     // should leave set1
@@ -258,7 +334,7 @@ void tst_QHorizontalStackedBarSeries::mousehovered()
 
 //=======================================================================
 // move mouse from top of set2 to background
-    QTest::mouseMove(view.viewport(), QPoint(285,300));
+    QTest::mouseMove(view.viewport(), QPoint(layout.at(5).center().y(), 0));
     TRY_COMPARE(seriesSpy.count(), 1);
 
     // should leave set2
diff --git a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp
index 792e3d3a..3bc1fc63 100644
--- a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp
+++ b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp
@@ -112,6 +112,8 @@ void tst_QPercentBarSeries::mouseclicked()
     *set2 << 10 << 10 << 10;
     series->append(set2);
 
+    QList<QBarSet*> barSets = series->barSets();
+
     QSignalSpy seriesSpy(series,SIGNAL(clicked(int, QBarSet*)));
 
     QChartView view(new QChart());
@@ -120,9 +122,42 @@ void tst_QPercentBarSeries::mouseclicked()
     view.show();
     QTest::qWaitForWindowShown(&view);
 
+    // Calculate expected layout for bars
+    QRectF plotArea = view.chart()->plotArea();
+    qreal width = plotArea.width();
+    qreal height = plotArea.height();
+    qreal rangeY = 100; // From 0 to 100 because range is scaled to 100%
+    qreal rangeX = 3;   // 3 values per set
+    qreal scaleY = (height / rangeY);
+    qreal scaleX = (width / rangeX);
+
+    qreal setCount = series->count();
+    qreal domainMinY = 0;       // These come from internal domain used by barseries.
+    qreal domainMinX = -0.5;    // No access to domain from outside, so use hard coded values.
+    qreal rectWidth = scaleX * series->barWidth();
+
+    QVector<QRectF> layout;
+
+    // 3 = count of values in set
+    // Note that rects in this vector will be interleaved (set1 bar0, set2 bar0, set1 bar1, set2 bar1, etc.)
+    for (int i = 0; i < 3; i++) {
+        qreal colSum = 20; // Sum of values in column (10 + 10 in our test case)
+        qreal percentage = (100 / colSum);
+        qreal yPos = height + scaleY * domainMinY + plotArea.top();
+
+        for (int set = 0; set < setCount; set++) {
+            qreal xPos = (i - domainMinX) * scaleX + plotArea.left() - rectWidth/2;
+            qreal rectHeigth = barSets.at(set)->at(i) * percentage * scaleY;
+
+            QRectF rect(xPos, yPos-rectHeigth, rectWidth, rectHeigth);
+            layout.append(rect);
+            yPos -= rectHeigth;
+        }
+    }
+
 //====================================================================================
-// barset 1, category test1
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(86,211));
+// barset 1, bar 0
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -133,8 +168,8 @@ void tst_QPercentBarSeries::mouseclicked()
     QVERIFY(seriesSpyArg.at(0).toInt() == 0);
 
 //====================================================================================
-// barset 1, category test2
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(200,211));
+// barset 1, bar 1
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -145,8 +180,8 @@ void tst_QPercentBarSeries::mouseclicked()
     QVERIFY(seriesSpyArg.at(0).toInt() == 1);
 
 //====================================================================================
-// barset 1, category test3
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(314,211));
+// barset 1, bar 2
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -157,8 +192,8 @@ void tst_QPercentBarSeries::mouseclicked()
     QVERIFY(seriesSpyArg.at(0).toInt() == 2);
 
 //====================================================================================
-// barset 2, category test1
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(86,90));
+// barset 2, bar 0
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -169,8 +204,8 @@ void tst_QPercentBarSeries::mouseclicked()
     QVERIFY(seriesSpyArg.at(0).toInt() == 0);
 
 //====================================================================================
-// barset 2, category test2
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(200,90));
+// barset 2, bar 1
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -181,8 +216,8 @@ void tst_QPercentBarSeries::mouseclicked()
     QVERIFY(seriesSpyArg.at(0).toInt() == 1);
 
 //====================================================================================
-// barset 2, category test3
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(314,90));
+// barset 2, bar 2
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -212,6 +247,8 @@ void tst_QPercentBarSeries::mousehovered()
     *set2 << 10 << 10 << 10;
     series->append(set2);
 
+    QList<QBarSet*> barSets = series->barSets();
+
     QSignalSpy seriesSpy(series,SIGNAL(hovered(bool, QBarSet*)));
 
     QChartView view(new QChart());
@@ -223,15 +260,48 @@ void tst_QPercentBarSeries::mousehovered()
     //this is hack since view does not get events otherwise
     view.setMouseTracking(true);
 
+    // Calculate expected layout for bars
+    QRectF plotArea = view.chart()->plotArea();
+    qreal width = plotArea.width();
+    qreal height = plotArea.height();
+    qreal rangeY = 100;  // From 0 to 100 because range is scaled to 100%
+    qreal rangeX = 3; // 3 values per set
+    qreal scaleY = (height / rangeY);
+    qreal scaleX = (width / rangeX);
+
+    qreal setCount = series->count();
+    qreal domainMinY = 0;       // These come from internal domain used by barseries.
+    qreal domainMinX = -0.5;    // No access to domain from outside, so use hard coded values.
+    qreal rectWidth = scaleX * series->barWidth();
+
+    QVector<QRectF> layout;
+
+    // 3 = count of values in set
+    // Note that rects in this vector will be interleaved (set1 bar0, set2 bar0, set1 bar1, set2 bar1, etc.)
+    for (int i = 0; i < 3; i++) {
+        qreal colSum = 20; // Sum of values in column (10 + 10 in our test case)
+        qreal percentage = (100 / colSum);
+        qreal yPos = height + scaleY * domainMinY + plotArea.top();
+
+        for (int set = 0; set < setCount; set++) {
+            qreal xPos = (i - domainMinX) * scaleX + plotArea.left() - rectWidth/2;
+            qreal rectHeight = barSets.at(set)->at(i) * percentage * scaleY;
+
+            QRectF rect(xPos, yPos-rectHeight, rectWidth, rectHeight);
+            layout.append(rect);
+            yPos -= rectHeight;
+        }
+    }
+
 //=======================================================================
 // move mouse to left border
-    QTest::mouseMove(view.viewport(), QPoint(0, 211));
+    QTest::mouseMove(view.viewport(), QPoint(0, layout.at(0).center().y()));
     QCoreApplication::processEvents(QEventLoop::AllEvents, 10000);
     TRY_COMPARE(seriesSpy.count(), 0);
 
 //=======================================================================
 // move mouse on top of set1
-    QTest::mouseMove(view.viewport(), QPoint(86,211));
+    QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint());
     TRY_COMPARE(seriesSpy.count(), 1);
 
     QList<QVariant> seriesSpyArg = seriesSpy.takeFirst();
@@ -241,7 +311,7 @@ void tst_QPercentBarSeries::mousehovered()
 
 //=======================================================================
 // move mouse from top of set1 to top of set2
-    QTest::mouseMove(view.viewport(), QPoint(86,90));
+    QTest::mouseMove(view.viewport(), layout.at(1).center().toPoint());
     TRY_COMPARE(seriesSpy.count(), 2);
 
     // should leave set1
@@ -258,7 +328,7 @@ void tst_QPercentBarSeries::mousehovered()
 
 //=======================================================================
 // move mouse from top of set2 to background
-    QTest::mouseMove(view.viewport(), QPoint(86,0));
+    QTest::mouseMove(view.viewport(), QPoint(layout.at(1).center().x(), 0));
     TRY_COMPARE(seriesSpy.count(), 1);
 
     // should leave set2
diff --git a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp
index 91a69997..f77989d3 100644
--- a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp
+++ b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp
@@ -112,6 +112,8 @@ void tst_QStackedBarSeries::mouseclicked()
     *set2 << 10 << 10 << 10;
     series->append(set2);
 
+    QList<QBarSet*> barSets = series->barSets();
+
     QSignalSpy seriesSpy(series,SIGNAL(clicked(int, QBarSet*)));
 
     QChartView view(new QChart());
@@ -120,9 +122,45 @@ void tst_QStackedBarSeries::mouseclicked()
     view.show();
     QTest::qWaitForWindowShown(&view);
 
+    // Calculate expected layout for bars
+    QRectF plotArea = view.chart()->plotArea();
+    qreal width = plotArea.width();
+    qreal height = plotArea.height();
+    qreal rangeY = 20;  // From 0 to 20 because sets are stacked (this should be height of highest stack)
+    qreal rangeX = 3;   // 3 values per set
+    qreal scaleY = (height / rangeY);
+    qreal scaleX = (width / rangeX);
+
+    qreal setCount = series->count();
+    qreal domainMinY = 0;       // These come from internal domain used by barseries.
+    qreal domainMinX = -0.5;    // No access to domain from outside, so use hard coded values.
+    qreal rectWidth = scaleX * series->barWidth();
+
+    QVector<QRectF> layout;
+
+    // 3 = count of values in set
+    // Note that rects in this vector will be interleaved (set1 bar0, set2 bar0, set1 bar1, set2 bar1, etc.)
+    for (int i = 0; i < 3; i++) {
+        qreal yMax = height + scaleY * domainMinY + plotArea.top();
+        qreal yMin = height + scaleY * domainMinY + plotArea.top();
+        for (int set = 0; set < setCount; set++) {
+            qreal xPos = (i - domainMinX) * scaleX + plotArea.left() - rectWidth/2;
+            qreal rectHeight = barSets.at(set)->at(i) * scaleY;
+            if (rectHeight < 0) {
+                QRectF rect(xPos, yMax-rectHeight, rectWidth, rectHeight);
+                layout.append(rect);
+                yMax -= rectHeight;
+            } else {
+                QRectF rect(xPos, yMin-rectHeight, rectWidth, rectHeight);
+                layout.append(rect);
+                yMin -= rectHeight;
+            }
+        }
+    }
+
 //====================================================================================
-// barset 1, category test1
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(86,211));
+// barset 1, bar 0
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(0).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -133,8 +171,8 @@ void tst_QStackedBarSeries::mouseclicked()
     QVERIFY(seriesSpyArg.at(0).toInt() == 0);
 
 //====================================================================================
-// barset 1, category test2
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(200,211));
+// barset 1, bar 1
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(2).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -145,8 +183,8 @@ void tst_QStackedBarSeries::mouseclicked()
     QVERIFY(seriesSpyArg.at(0).toInt() == 1);
 
 //====================================================================================
-// barset 1, category test3
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(314,211));
+// barset 1, bar 2
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(4).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -157,8 +195,8 @@ void tst_QStackedBarSeries::mouseclicked()
     QVERIFY(seriesSpyArg.at(0).toInt() == 2);
 
 //====================================================================================
-// barset 2, category test1
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(86,90));
+// barset 2, bar 0
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(1).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -169,8 +207,8 @@ void tst_QStackedBarSeries::mouseclicked()
     QVERIFY(seriesSpyArg.at(0).toInt() == 0);
 
 //====================================================================================
-// barset 2, category test2
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(200,90));
+// barset 2, bar 1
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(3).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -181,8 +219,8 @@ void tst_QStackedBarSeries::mouseclicked()
     QVERIFY(seriesSpyArg.at(0).toInt() == 1);
 
 //====================================================================================
-// barset 2, category test3
-    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(314,90));
+// barset 2, bar 2
+    QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, layout.at(5).center().toPoint());
     QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
 
     QCOMPARE(seriesSpy.count(), 1);
@@ -212,6 +250,8 @@ void tst_QStackedBarSeries::mousehovered()
     *set2 << 10 << 10 << 10;
     series->append(set2);
 
+    QList<QBarSet*> barSets = series->barSets();
+
     QSignalSpy seriesSpy(series,SIGNAL(hovered(bool, QBarSet*)));
 
     QChartView view(new QChart());
@@ -223,15 +263,52 @@ void tst_QStackedBarSeries::mousehovered()
     //this is hack since view does not get events otherwise
     view.setMouseTracking(true);
 
+    // Calculate expected layout for bars
+    QRectF plotArea = view.chart()->plotArea();
+    qreal width = plotArea.width();
+    qreal height = plotArea.height();
+    qreal rangeY = 20;  // From 0 to 20 because sets are stacked (this should be height of highest stack)
+    qreal rangeX = 3;   // 3 values per set
+    qreal scaleY = (height / rangeY);
+    qreal scaleX = (width / rangeX);
+
+    qreal setCount = series->count();
+    qreal domainMinY = 0;       // These come from internal domain used by barseries.
+    qreal domainMinX = -0.5;    // No access to domain from outside, so use hard coded values.
+    qreal rectWidth = scaleX * series->barWidth();
+
+    QVector<QRectF> layout;
+
+    // 3 = count of values in set
+    // Note that rects in this vector will be interleaved (set1 bar0, set2 bar0, set1 bar1, set2 bar1, etc.)
+    for (int i = 0; i < 3; i++) {
+        qreal yMax = height + scaleY * domainMinY + plotArea.top();
+        qreal yMin = height + scaleY * domainMinY + plotArea.top();
+        for (int set = 0; set < setCount; set++) {
+            qreal xPos = (i - domainMinX) * scaleX + plotArea.left() - rectWidth/2;
+            qreal rectHeight = barSets.at(set)->at(i) * scaleY;
+
+            if (rectHeight < 0) {
+                QRectF rect(xPos, yMax-rectHeight, rectWidth, rectHeight);
+                layout.append(rect);
+                yMax -= rectHeight;
+            } else {
+                QRectF rect(xPos, yMin-rectHeight, rectWidth, rectHeight);
+                layout.append(rect);
+                yMin -= rectHeight;
+            }
+        }
+    }
+
 //=======================================================================
 // move mouse to left border
-    QTest::mouseMove(view.viewport(), QPoint(0, 211));
+    QTest::mouseMove(view.viewport(), QPoint(0, layout.at(0).center().y()));
     QCoreApplication::processEvents(QEventLoop::AllEvents, 10000);
     TRY_COMPARE(seriesSpy.count(), 0);
 
 //=======================================================================
 // move mouse on top of set1
-    QTest::mouseMove(view.viewport(), QPoint(86,211));
+    QTest::mouseMove(view.viewport(), layout.at(0).center().toPoint());
     TRY_COMPARE(seriesSpy.count(), 1);
 
     QList<QVariant> seriesSpyArg = seriesSpy.takeFirst();
@@ -241,7 +318,7 @@ void tst_QStackedBarSeries::mousehovered()
 
 //=======================================================================
 // move mouse from top of set1 to top of set2
-    QTest::mouseMove(view.viewport(), QPoint(86,90));
+    QTest::mouseMove(view.viewport(), layout.at(1).center().toPoint());
     TRY_COMPARE(seriesSpy.count(), 2);
 
     // should leave set1
@@ -258,7 +335,7 @@ void tst_QStackedBarSeries::mousehovered()
 
 //=======================================================================
 // move mouse from top of set2 to background
-    QTest::mouseMove(view.viewport(), QPoint(86,0));
+    QTest::mouseMove(view.viewport(), QPoint(layout.at(1).center().x(), 0));
     TRY_COMPARE(seriesSpy.count(), 1);
 
     // should leave set2