diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-01-21 14:25:41 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-01-27 07:23:05 +0100 |
| commit | 4f45cb18669af8e11cfab6dc546e275b05ff4ab9 (patch) | |
| tree | a2138a9c249315653b9e930a565e2eeef57c3cc5 /tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp | |
| parent | d8d9c4fbb6047b59b98108d6e3221206aa926ccd (diff) | |
| download | qtlocation-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/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp')
| -rw-r--r-- | tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp b/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp index 07519713..8c55e0de 100644 --- a/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp +++ b/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp @@ -353,10 +353,11 @@ private slots: void debug() { QFETCH(QGeoSatelliteInfo, info); + QFETCH(int, nextValue); QFETCH(QByteArray, debugString); qInstallMessageHandler(tst_qgeosatelliteinfo_messageHandler); - qDebug() << info; + qDebug() << info << nextValue; qInstallMessageHandler(0); QCOMPARE(QString(tst_qgeosatelliteinfo_debug), QString(debugString)); } @@ -364,42 +365,43 @@ private slots: void debug_data() { QTest::addColumn<QGeoSatelliteInfo>("info"); + QTest::addColumn<int>("nextValue"); QTest::addColumn<QByteArray>("debugString"); QGeoSatelliteInfo info; - QTest::newRow("uninitialized") << info - << QByteArray("QGeoSatelliteInfo(system=0, satId=-1, signal-strength=-1)"); + QTest::newRow("uninitialized") << info << 45 + << QByteArray("QGeoSatelliteInfo(system=0, satId=-1, signal-strength=-1) 45"); info = QGeoSatelliteInfo(); info.setSignalStrength(1); - QTest::newRow("with SignalStrength") << info - << QByteArray("QGeoSatelliteInfo(system=0, satId=-1, signal-strength=1)"); + QTest::newRow("with SignalStrength") << info << 60 + << QByteArray("QGeoSatelliteInfo(system=0, satId=-1, signal-strength=1) 60"); info = QGeoSatelliteInfo(); info.setSatelliteIdentifier(1); - QTest::newRow("with SatelliteIdentifier") << info - << QByteArray("QGeoSatelliteInfo(system=0, satId=1, signal-strength=-1)"); + QTest::newRow("with SatelliteIdentifier") << info << -1 + << QByteArray("QGeoSatelliteInfo(system=0, satId=1, signal-strength=-1) -1"); info = QGeoSatelliteInfo(); info.setSatelliteSystem(QGeoSatelliteInfo::GPS); - QTest::newRow("with System GPS") << info - << QByteArray("QGeoSatelliteInfo(system=1, satId=-1, signal-strength=-1)"); + QTest::newRow("with System GPS") << info << 1 + << QByteArray("QGeoSatelliteInfo(system=1, satId=-1, signal-strength=-1) 1"); info = QGeoSatelliteInfo(); info.setSatelliteSystem(QGeoSatelliteInfo::GLONASS); - QTest::newRow("with System GLONASS") << info - << QByteArray("QGeoSatelliteInfo(system=2, satId=-1, signal-strength=-1)"); + QTest::newRow("with System GLONASS") << info << 56 + << QByteArray("QGeoSatelliteInfo(system=2, satId=-1, signal-strength=-1) 56"); info = QGeoSatelliteInfo(); info.setAttribute(QGeoSatelliteInfo::Elevation, 1.1); - QTest::newRow("with Elevation") << info - << QByteArray("QGeoSatelliteInfo(system=0, satId=-1, signal-strength=-1, Elevation=1.1)"); + QTest::newRow("with Elevation") << info << 0 + << QByteArray("QGeoSatelliteInfo(system=0, satId=-1, signal-strength=-1, Elevation=1.1) 0"); info = QGeoSatelliteInfo(); info.setAttribute(QGeoSatelliteInfo::Azimuth, 1.1); - QTest::newRow("with Azimuth") << info - << QByteArray("QGeoSatelliteInfo(system=0, satId=-1, signal-strength=-1, Azimuth=1.1)"); + QTest::newRow("with Azimuth") << info << 45 + << QByteArray("QGeoSatelliteInfo(system=0, satId=-1, signal-strength=-1, Azimuth=1.1) 45"); } }; |