summaryrefslogtreecommitdiff
path: root/tests/auto/qgeocoordinate
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@theqtcompany.com>2015-01-21 14:25:41 +0100
committerAlex Blasche <alexander.blasche@theqtcompany.com>2015-01-27 07:23:05 +0100
commit4f45cb18669af8e11cfab6dc546e275b05ff4ab9 (patch)
treea2138a9c249315653b9e930a565e2eeef57c3cc5 /tests/auto/qgeocoordinate
parentd8d9c4fbb6047b59b98108d6e3221206aa926ccd (diff)
downloadqtlocation-4f45cb18669af8e11cfab6dc546e275b05ff4ab9.tar.gz
Ensure QtPositioning value types don't change QDebug spacing policy
Change-Id: I1a98df26582957b0df136e98acf5d2754fe45295 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'tests/auto/qgeocoordinate')
-rw-r--r--tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp21
1 files changed, 12 insertions, 9 deletions
diff --git a/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp b/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp
index 0c960c21..1e069c9e 100644
--- a/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp
+++ b/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp
@@ -879,10 +879,11 @@ private slots:
void debug()
{
QFETCH(QGeoCoordinate, c);
+ QFETCH(int, nextValue);
QFETCH(QByteArray, debugString);
qInstallMessageHandler(tst_qgeocoordinate_messageHandler);
- qDebug() << c;
+ qDebug() << c << nextValue;
qInstallMessageHandler(0);
QCOMPARE(tst_qgeocoordinate_debug, debugString);
}
@@ -890,17 +891,19 @@ private slots:
void debug_data()
{
QTest::addColumn<QGeoCoordinate>("c");
+ QTest::addColumn<int>("nextValue");
QTest::addColumn<QByteArray>("debugString");
- QTest::newRow("uninitialized") << QGeoCoordinate()
- << QByteArray("QGeoCoordinate(?, ?)");
- QTest::newRow("initialized without altitude") << BRISBANE
- << (QString("QGeoCoordinate(%1, %2)").arg(BRISBANE.latitude())
+
+ QTest::newRow("uninitialized") << QGeoCoordinate() << 45
+ << QByteArray("QGeoCoordinate(?, ?) 45");
+ QTest::newRow("initialized without altitude") << BRISBANE << 45
+ << (QString("QGeoCoordinate(%1, %2) 45").arg(BRISBANE.latitude())
.arg(BRISBANE.longitude())).toLatin1();
- QTest::newRow("invalid initialization") << QGeoCoordinate(-100,-200)
- << QByteArray("QGeoCoordinate(?, ?)");
- QTest::newRow("initialized with altitude") << QGeoCoordinate(1,2,3)
- << QByteArray("QGeoCoordinate(1, 2, 3)");
+ QTest::newRow("invalid initialization") << QGeoCoordinate(-100,-200) << 45
+ << QByteArray("QGeoCoordinate(?, ?) 45");
+ QTest::newRow("initialized with altitude") << QGeoCoordinate(1,2,3) << 45
+ << QByteArray("QGeoCoordinate(1, 2, 3) 45");
}
};