From ab53d7df7636c064fa7c542a3b9a4e29364426b3 2012-07-03 13:56:54 From: sauimone Date: 2012-07-03 13:56:54 Subject: [PATCH] removing groupedbartest --- diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 6cc18aa..774ab87 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -3,7 +3,7 @@ } TEMPLATE = subdirs -SUBDIRS += qchartview qchart qlineseries qbarset qbarseries qstackedbarseries qpercentbarseries qpieslice qpieseries qpiemodelmapper qsplineseries qscatterseries qxymodelmapper qbarmodelmapper #qgroupedbarseries +SUBDIRS += qchartview qchart qlineseries qbarset qbarseries qstackedbarseries qpercentbarseries qpieslice qpieseries qpiemodelmapper qsplineseries qscatterseries qxymodelmapper qbarmodelmapper test_private:{ SUBDIRS += domain chartdataset diff --git a/tests/auto/qbarseries/tst_qbarseries.cpp b/tests/auto/qbarseries/tst_qbarseries.cpp index 3ae6576..a40526c 100644 --- a/tests/auto/qbarseries/tst_qbarseries.cpp +++ b/tests/auto/qbarseries/tst_qbarseries.cpp @@ -338,7 +338,7 @@ void tst_QBarSeries::mouseclicked() //==================================================================================== // barset 1, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(102,142)); + QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(95,143)); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -356,7 +356,7 @@ void tst_QBarSeries::mouseclicked() //==================================================================================== // barset 1, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(186,142)); + QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(187,143)); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -374,7 +374,7 @@ void tst_QBarSeries::mouseclicked() //==================================================================================== // barset 1, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(271,142)); + QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(280,143)); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -392,7 +392,7 @@ void tst_QBarSeries::mouseclicked() //==================================================================================== // barset 2, bar 0 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(127,142)); + QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(118,143)); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -410,7 +410,7 @@ void tst_QBarSeries::mouseclicked() //==================================================================================== // barset 2, bar 1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(212,142)); + QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(210,143)); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -428,7 +428,7 @@ void tst_QBarSeries::mouseclicked() //==================================================================================== // barset 2, bar 2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(296,142)); + QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(303,143)); QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); QCOMPARE(seriesSpy.count(), 1); @@ -477,7 +477,8 @@ void tst_QBarSeries::mousehovered() //======================================================================= // move mouse to left border - QTest::mouseMove(view.viewport(), QPoint(0, 142)); + qDebug() << "move mouse to left border"; + QTest::mouseMove(view.viewport(), QPoint(0, 143)); QCoreApplication::processEvents(QEventLoop::AllEvents, 10000); TRY_COMPARE(seriesSpy.count(), 0); TRY_COMPARE(setSpy1.count(), 0); @@ -485,7 +486,8 @@ void tst_QBarSeries::mousehovered() //======================================================================= // move mouse on top of set1 - QTest::mouseMove(view.viewport(), QPoint(102,142)); + qDebug() << "move mouse on top of set1"; + QTest::mouseMove(view.viewport(), QPoint(95,143)); TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(setSpy1.count(), 1); TRY_COMPARE(setSpy2.count(), 0); @@ -501,7 +503,8 @@ void tst_QBarSeries::mousehovered() //======================================================================= // move mouse from top of set1 to top of set2 - QTest::mouseMove(view.viewport(), QPoint(127,142)); + qDebug() << "move mouse from top of set1 to top of set2"; + QTest::mouseMove(view.viewport(), QPoint(118,143)); TRY_COMPARE(seriesSpy.count(), 2); TRY_COMPARE(setSpy1.count(), 1); TRY_COMPARE(setSpy2.count(), 1); @@ -528,7 +531,9 @@ void tst_QBarSeries::mousehovered() //======================================================================= // move mouse from top of set2 to background - QTest::mouseMove(view.viewport(), QPoint(127,0)); + qDebug() << "move mouse from top of set2 to background"; + + QTest::mouseMove(view.viewport(), QPoint(118,0)); TRY_COMPARE(seriesSpy.count(), 1); TRY_COMPARE(setSpy1.count(), 0); TRY_COMPARE(setSpy2.count(), 1); diff --git a/tests/auto/qgroupedbarseries/qgroupedbarseries.pro b/tests/auto/qgroupedbarseries/qgroupedbarseries.pro deleted file mode 100644 index 7a29c19..0000000 --- a/tests/auto/qgroupedbarseries/qgroupedbarseries.pro +++ /dev/null @@ -1,4 +0,0 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} -SOURCES += tst_qgroupedbarseries.cpp diff --git a/tests/auto/qgroupedbarseries/tst_qgroupedbarseries.cpp b/tests/auto/qgroupedbarseries/tst_qgroupedbarseries.cpp deleted file mode 100644 index e5ccfa8..0000000 --- a/tests/auto/qgroupedbarseries/tst_qgroupedbarseries.cpp +++ /dev/null @@ -1,277 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com -** -** This file is part of the Qt Commercial Charts Add-on. -** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. -** -** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include -#include "tst_definitions.h" - -QTCOMMERCIALCHART_USE_NAMESPACE - -Q_DECLARE_METATYPE(QBarSet*) - -class tst_QGroupedBarSeries : public QObject -{ - Q_OBJECT - -public slots: - void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); - -private slots: - void qgroupedbarseries_data(); - void qgroupedbarseries(); - void type_data(); - void type(); - void mouseclicked_data(); - void mouseclicked(); - void mousehovered_data(); - void mousehovered(); - -private: - QBarSeries* m_barseries; -}; - -void tst_QGroupedBarSeries::initTestCase() -{ - qRegisterMetaType("QBarSet*"); -} - -void tst_QGroupedBarSeries::cleanupTestCase() -{ -} - -void tst_QGroupedBarSeries::init() -{ - m_barseries = new QBarSeries(); -} - -void tst_QGroupedBarSeries::cleanup() -{ - delete m_barseries; - m_barseries = 0; -} - -void tst_QGroupedBarSeries::qgroupedbarseries_data() -{ -} - -void tst_QGroupedBarSeries::qgroupedbarseries() -{ - QBarSeries *barseries = new QBarSeries(); - QVERIFY(barseries != 0); -} - -void tst_QGroupedBarSeries::type_data() -{ - -} - -void tst_QGroupedBarSeries::type() -{ - QVERIFY(m_barseries->type() == QAbstractSeries::SeriesTypeBar); -} - -void tst_QGroupedBarSeries::mouseclicked_data() -{ - -} - -void tst_QGroupedBarSeries::mouseclicked() -{ - QBarSeries* series = new QBarSeries(); - - QBarSet* set1 = new QBarSet(QString("set 1")); - *set1 << 10 << 10 << 10; - series->append(set1); - - QBarSet* set2 = new QBarSet(QString("set 2")); - *set2 << 10 << 10 << 10; - series->append(set2); - - QSignalSpy seriesSpy(series,SIGNAL(clicked(int, QBarSet*))); - - QChartView view(new QChart()); - view.resize(400,300); - view.chart()->addSeries(series); - view.show(); - QTest::qWaitForWindowShown(&view); - -//==================================================================================== -// barset 1, category test1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(95,143)); - QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - - QCOMPARE(seriesSpy.count(), 1); - - QList seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Int); - QVERIFY(seriesSpyArg.at(0).toInt() == 0); - -//==================================================================================== -// barset 1, category test2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(187,143)); - QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - - QCOMPARE(seriesSpy.count(), 1); - - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Int); - QVERIFY(seriesSpyArg.at(0).toInt() == 1); - -//==================================================================================== -// barset 1, category test3 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(280,143)); - QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - - QCOMPARE(seriesSpy.count(), 1); - - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Int); - QVERIFY(seriesSpyArg.at(0).toInt() == 2); - -//==================================================================================== -// barset 2, category test1 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(118,143)); - QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - - QCOMPARE(seriesSpy.count(), 1); - - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Int); - QVERIFY(seriesSpyArg.at(0).toInt() == 0); - -//==================================================================================== -// barset 2, category test2 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(210,143)); - QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - - QCOMPARE(seriesSpy.count(), 1); - - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Int); - QVERIFY(seriesSpyArg.at(0).toInt() == 1); - -//==================================================================================== -// barset 2, category test3 - QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(303,143)); - QCoreApplication::processEvents(QEventLoop::AllEvents, 1000); - - QCOMPARE(seriesSpy.count(), 1); - - seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set2); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Int); - QVERIFY(seriesSpyArg.at(0).toInt() == 2); -} - -void tst_QGroupedBarSeries::mousehovered_data() -{ - -} - -void tst_QGroupedBarSeries::mousehovered() -{ - QBarSeries* series = new QBarSeries(); - - QBarSet* set1 = new QBarSet(QString("set 1")); - *set1 << 10 << 10 << 10; - series->append(set1); - - QBarSet* set2 = new QBarSet(QString("set 2")); - *set2 << 10 << 10 << 10; - series->append(set2); - - QSignalSpy seriesSpy(series,SIGNAL(hovered(bool, QBarSet*))); - - QChartView view(new QChart()); - view.resize(400,300); - view.chart()->addSeries(series); - view.show(); - QTest::qWaitForWindowShown(&view); - - //this is hack since view does not get events otherwise - view.setMouseTracking(true); - -//======================================================================= -// move mouse to left border - qDebug() << "move mouse to left border"; - QTest::mouseMove(view.viewport(), QPoint(0, 143)); - QCoreApplication::processEvents(QEventLoop::AllEvents, 10000); - TRY_COMPARE(seriesSpy.count(), 0); - -//======================================================================= -// move mouse on top of set1 - qDebug() << "move mouse on top of set1"; - QTest::mouseMove(view.viewport(), QPoint(95,143)); - TRY_COMPARE(seriesSpy.count(), 1); - - QList seriesSpyArg = seriesSpy.takeFirst(); - QCOMPARE(qvariant_cast(seriesSpyArg.at(1)), set1); - QVERIFY(seriesSpyArg.at(0).type() == QVariant::Bool); - QVERIFY(seriesSpyArg.at(0).toBool() == true); - -//======================================================================= -// move mouse from top of set1 to top of set2 - qDebug() << "move mouse from top of set1 to top of set2"; - QTest::mouseMove(view.viewport(), QPoint(118,143)); - TRY_COMPARE(seriesSpy.count(), 2); - - // 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); - - // 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); - -//======================================================================= -// move mouse from top of set2 to background - qDebug() << "move mouse from top of set2 to background"; - - QTest::mouseMove(view.viewport(), QPoint(118,0)); - TRY_COMPARE(seriesSpy.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); -} - -QTEST_MAIN(tst_QGroupedBarSeries) - -#include "tst_qgroupedbarseries.moc" -