##// END OF EJS Templates
Revert previous change to LineChartItem...
Revert previous change to LineChartItem The m_points private member in LineChartItem is needed after all. If the points from XYChart are used, the old line is not properly cleared with animations. The variable is now renamed to reduce confusion. Change-Id: I35fcb708017d1a423a6e42eb1721c0b332a3a995 Task-number: QTRD-3489 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

File last commit:

r2776:bc1f6aa59d42
r2818:d27e6a35ae04
Show More
tst_definitions.h
98 lines | 3.0 KiB | text/x-c | CLexer
/ tests / auto / inc / tst_definitions.h
Tero Ahola
Auto tests involving signal spys to wait before comparisons
r1109 /****************************************************************************
**
Titta Heikkala
Copyright header changes...
r2776 ** Copyright (C) 2015 The Qt Company Ltd
Tero Ahola
Auto tests involving signal spys to wait before comparisons
r1109 ** All rights reserved.
Titta Heikkala
Copyright header changes...
r2776 ** For any questions to The Qt Company, please use contact form at http://qt.io
Tero Ahola
Auto tests involving signal spys to wait before comparisons
r1109 **
Titta Heikkala
Updated license headers...
r2740 ** This file is part of the Qt Charts module.
Tero Ahola
Auto tests involving signal spys to wait before comparisons
r1109 **
Titta Heikkala
Updated license headers...
r2740 ** Licensees holding valid commercial license for Qt may use this file in
** accordance with the Qt License Agreement provided with the Software
** or, alternatively, in accordance with the terms contained in a written
Titta Heikkala
Copyright header changes...
r2776 ** agreement between you and The Qt Company.
Tero Ahola
Auto tests involving signal spys to wait before comparisons
r1109 **
** If you have questions regarding the use of this file, please use
Titta Heikkala
Updated license headers...
r2740 ** contact form at http://qt.io
Tero Ahola
Auto tests involving signal spys to wait before comparisons
r1109 **
****************************************************************************/
#ifndef TST_DEFINITIONS_H
#define TST_DEFINITIONS_H
Titta Heikkala
Qt Charts project file structure change...
r2712 #include <QtCharts/qpolarchart.h>
Tero Ahola
Auto tests involving signal spys to wait before comparisons
r1109 #include <QtTest/QtTest>
Titta Heikkala
Fix include syntax...
r2714 #include <QtWidgets/QPushButton>
Tero Ahola
Auto tests involving signal spys to wait before comparisons
r1109
Christian Kandeler
Fix compilation with namespaced Qt....
r2774 QT_BEGIN_NAMESPACE
Jani Honkonen
Fix deprecation errors from Qt5
r2241 namespace QTest
{
// This was deprecated in Qt5. This is a small hack for the sake of compatibility.
inline static bool qWaitForWindowShown(QWidget *window)
{
return QTest::qWaitForWindowExposed(window);
}
}
Christian Kandeler
Fix compilation with namespaced Qt....
r2774 QT_END_NAMESPACE
Jani Honkonen
Fix deprecation errors from Qt5
r2241
Tero Ahola
Auto tests involving signal spys to wait before comparisons
r1109 #define TRY_COMPARE(actual, expected) { \
do { \
const int timeout(1000); \
const int waitStep(30); \
/* always wait before comparing to catch possible extra signals */ \
QTest::qWait(waitStep); \
Tero Ahola
Fixed an issue with domain auto occasionally failing
r1111 for (int time(0); (actual != expected) && (time < timeout); time += waitStep) \
Tero Ahola
Auto tests involving signal spys to wait before comparisons
r1109 QTest::qWait(waitStep); \
QCOMPARE(actual, expected); \
} while (0); \
}
Jani Honkonen
Try to make bamboo skip tests that it cannot run
r2062 // Some bamboo clients have trouble passing mouse events to the test application.
// This can be used to skip those tests so that they don't show up as a failure
// in the test report.
Tero Ahola
Qt5 build fix, QSKIP has only one parameter
r2367 #define SKIP_IF_CANNOT_TEST_MOUSE_EVENTS() { \
do { \
QPushButton b; \
b.resize(100, 100); \
b.show(); \
QTest::qWaitForWindowShown(&b); \
QSignalSpy spy(&b, SIGNAL(clicked())); \
QTest::mouseClick(&b, Qt::LeftButton, 0, b.rect().center()); \
if (spy.count() == 0) \
QSKIP("Cannot test mouse events in this environment"); \
} while (0); \
}
Miikka Heikkinen
Add Polar chart support...
r2483
#define SKIP_ON_POLAR() { \
if (isPolarTest()) \
QSKIP("Test not supported by polar chart"); \
}
#define SKIP_ON_CARTESIAN() { \
if (!isPolarTest()) \
QSKIP("Test not supported by cartesian chart"); \
}
Jani Honkonen
Try to make bamboo skip tests that it cannot run
r2062
Miikka Heikkinen
Add Polar chart support...
r2483 static inline bool isPolarTest()
{
static bool isPolar = false;
static bool polarEnvChecked = false;
if (!polarEnvChecked) {
isPolar = !(qgetenv("TEST_POLAR_CHART").isEmpty());
polarEnvChecked = true;
if (isPolar)
qDebug() << "TEST_POLAR_CHART found -> Testing polar chart!";
}
return isPolar;
}
Titta Heikkala
Qt Charts project file structure change...
r2712 static inline QtCharts::QChart *newQChartOrQPolarChart()
Miikka Heikkinen
Add Polar chart support...
r2483 {
if (isPolarTest())
Titta Heikkala
Qt Charts project file structure change...
r2712 return new QtCharts::QPolarChart();
Miikka Heikkinen
Add Polar chart support...
r2483 else
Titta Heikkala
Qt Charts project file structure change...
r2712 return new QtCharts::QChart();
Miikka Heikkinen
Add Polar chart support...
r2483 }
Tero Ahola
Auto tests involving signal spys to wait before comparisons
r1109 #endif // TST_DEFINITIONS_H