diff options
author | Aaron McCarthy <aaron.mccarthy@jollamobile.com> | 2014-07-17 12:08:30 +1000 |
---|---|---|
committer | Aaron McCarthy <mccarthy.aaron@gmail.com> | 2014-07-21 02:12:30 +0200 |
commit | 4bdf3bc386d8ace566633ae56505b9875764b16a (patch) | |
tree | 9a13360f8960523f880ffdd8d8810f52582a4c52 /tests/auto/maptype/tst_maptype.cpp | |
parent | f2e3523e3fcec83845a0ec73ff682367202a84f6 (diff) | |
download | qtlocation-4bdf3bc386d8ace566633ae56505b9875764b16a.tar.gz |
Add night property to MapType.
Similar to the mobile property this property allows applications to
determine if the tile set is optimized for night time use.
Change-Id: Ibaaffe6f745d90817b5938f493742fb019be0312
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'tests/auto/maptype/tst_maptype.cpp')
-rw-r--r-- | tests/auto/maptype/tst_maptype.cpp | 140 |
1 files changed, 73 insertions, 67 deletions
diff --git a/tests/auto/maptype/tst_maptype.cpp b/tests/auto/maptype/tst_maptype.cpp index 82f90579..0c0c9fad 100644 --- a/tests/auto/maptype/tst_maptype.cpp +++ b/tests/auto/maptype/tst_maptype.cpp @@ -46,6 +46,8 @@ QT_USE_NAMESPACE +Q_DECLARE_METATYPE(QGeoMapType) + class tst_MapType : public QObject { Q_OBJECT @@ -55,92 +57,96 @@ public: private Q_SLOTS: void constructorTest(); - void styleTest(); - void nameTest(); - void descTest(); - void mobileTest(); - void mapIdTest(); void comparison(); + void comparison_data(); }; tst_MapType::tst_MapType() {} void tst_MapType::constructorTest() { - QGeoMapType *testObjPtr = new QGeoMapType(QGeoMapType::StreetMap, "street name", "street desc", false, 0); + QGeoMapType *testObjPtr = new QGeoMapType(QGeoMapType::StreetMap, QStringLiteral("street map"), + QStringLiteral("map description"), true, true, 1); QVERIFY(testObjPtr); + QCOMPARE(testObjPtr->style(), QGeoMapType::StreetMap); + QCOMPARE(testObjPtr->name(), QStringLiteral("street map")); + QCOMPARE(testObjPtr->description(), QStringLiteral("map description")); + QVERIFY(testObjPtr->mobile()); + QVERIFY(testObjPtr->night()); + QCOMPARE(testObjPtr->mapId(), 1); delete testObjPtr; testObjPtr = new QGeoMapType(); - QVERIFY2(testObjPtr->style() == QGeoMapType::NoMap, "Wrong default value"); - QVERIFY2(testObjPtr->name() == "", "Wrong default value"); - QVERIFY2(testObjPtr->description() == "", "Wrong default value"); - QVERIFY2(testObjPtr->mobile() == false, "Wrong default value"); - QVERIFY2(testObjPtr->mapId() == 0, "Wrong default value"); + QCOMPARE(testObjPtr->style(), QGeoMapType::NoMap); + QVERIFY2(testObjPtr->name().isEmpty(), "Wrong default value"); + QVERIFY2(testObjPtr->description().isEmpty(), "Wrong default value"); + QVERIFY2(!testObjPtr->mobile(), "Wrong default value"); + QVERIFY2(!testObjPtr->night(), "Wrong default value"); + QCOMPARE(testObjPtr->mapId(), 0); delete testObjPtr; } -void tst_MapType::styleTest() -{ - QGeoMapType testObj = QGeoMapType(QGeoMapType::StreetMap, "street name", "street desc", false, 0); - QVERIFY2(testObj.style() == QGeoMapType::StreetMap, "Wrong value returned"); -} - -void tst_MapType::nameTest() -{ - QGeoMapType testObj = QGeoMapType(QGeoMapType::StreetMap, "street name", "street desc", false, 0); - QVERIFY2(testObj.name() == "street name", "Wrong value returned"); -} - -void tst_MapType::descTest() +void tst_MapType::comparison_data() { - QGeoMapType testObj = QGeoMapType(QGeoMapType::StreetMap, "street name", "street desc", false, 0); - QVERIFY2(testObj.description() == "street desc", "Wrong value returned"); -} - -void tst_MapType::mobileTest() -{ - QGeoMapType testObj = QGeoMapType(QGeoMapType::StreetMap, "mobile street name", "mobile street desc", true, 0); - QVERIFY2(testObj.mobile() == true, "Wrong value returned"); -} - -void tst_MapType::mapIdTest() -{ - QGeoMapType testObj = QGeoMapType(QGeoMapType::StreetMap, "mobile street name", "mobile street desc", true, 42); - QVERIFY2(testObj.mapId() == 42, "Wrong value returned"); + QTest::addColumn<QGeoMapType>("type1"); + QTest::addColumn<QGeoMapType>("type2"); + QTest::addColumn<bool>("expected"); + + QTest::newRow("null") << QGeoMapType() << QGeoMapType() << true; + + QTest::newRow("equal") << QGeoMapType(QGeoMapType::StreetMap, QStringLiteral("street name"), + QStringLiteral("street desc"), false, false, 42) + << QGeoMapType(QGeoMapType::StreetMap, QStringLiteral("street name"), + QStringLiteral("street desc"), false, false, 42) + << true; + + QTest::newRow("style") << QGeoMapType(QGeoMapType::StreetMap, QStringLiteral("street name"), + QStringLiteral("street desc"), false, false, 42) + << QGeoMapType(QGeoMapType::TerrainMap, QStringLiteral("street name"), + QStringLiteral("street desc"), false, false, 42) + << false; + + QTest::newRow("name") << QGeoMapType(QGeoMapType::StreetMap, QStringLiteral("street name"), + QStringLiteral("street desc"), false, false, 42) + << QGeoMapType(QGeoMapType::StreetMap, QStringLiteral("different name"), + QStringLiteral("street desc"), false, false, 42) + << false; + + QTest::newRow("description") << QGeoMapType(QGeoMapType::StreetMap, + QStringLiteral("street name"), + QStringLiteral("street desc"), false, false, 42) + << QGeoMapType(QGeoMapType::StreetMap, + QStringLiteral("street name"), + QStringLiteral("different desc"), false, false, 42) + << false; + + QTest::newRow("mobile") << QGeoMapType(QGeoMapType::StreetMap, QStringLiteral("street name"), + QStringLiteral("street desc"), false, false, 42) + << QGeoMapType(QGeoMapType::StreetMap, QStringLiteral("street name"), + QStringLiteral("street desc"), true, false, 42) + << false; + + QTest::newRow("night") << QGeoMapType(QGeoMapType::StreetMap, QStringLiteral("street name"), + QStringLiteral("street desc"), false, false, 42) + << QGeoMapType(QGeoMapType::StreetMap, QStringLiteral("street name"), + QStringLiteral("street desc"), false, true, 42) + << false; + + QTest::newRow("id") << QGeoMapType(QGeoMapType::StreetMap, QStringLiteral("street name"), + QStringLiteral("street desc"), false, false, 42) + << QGeoMapType(QGeoMapType::StreetMap, QStringLiteral("street name"), + QStringLiteral("street desc"), false, false, 99) + << false; } void tst_MapType::comparison() { - // TODO Tried using data function but couldn't make QFETCH work - QGeoMapType t1 = QGeoMapType(QGeoMapType::StreetMap, "street name", "street desc", false, 42); - QGeoMapType t2 = QGeoMapType(QGeoMapType::StreetMap, "street name", "street desc", false, 42); - QCOMPARE(t1 == t2, true); - QCOMPARE(t1 != t2, false); - - t1 = QGeoMapType(); - t2 = QGeoMapType(); - QCOMPARE(t1 == t2, true); - - t1 = QGeoMapType(QGeoMapType::StreetMap, "street name", "street desc", false, 42); - t2 = QGeoMapType(QGeoMapType::TerrainMap, "street name", "street desc", false, 42); - QCOMPARE(t1 == t2, false); - - t1 = QGeoMapType(QGeoMapType::StreetMap, "street name", "street desc", false, 42); - t2 = QGeoMapType(QGeoMapType::StreetMap, "different name", "street desc", false, 42); - QCOMPARE(t1 == t2, false); - - t1 = QGeoMapType(QGeoMapType::StreetMap, "street name", "street desc", false, 42); - t2 = QGeoMapType(QGeoMapType::StreetMap, "street name", "different desc", false, 42); - QCOMPARE(t1 == t2, false); - - t1 = QGeoMapType(QGeoMapType::StreetMap, "street name", "street desc", false, 42); - t2 = QGeoMapType(QGeoMapType::StreetMap, "street name", "street desc", true, 42); - QCOMPARE(t1 == t2, false); - - t1 = QGeoMapType(QGeoMapType::StreetMap, "street name", "street desc", false, 42); - t2 = QGeoMapType(QGeoMapType::StreetMap, "street name", "street desc", false, 99); - QCOMPARE(t1 == t2, false); + QFETCH(QGeoMapType, type1); + QFETCH(QGeoMapType, type2); + QFETCH(bool, expected); + + QCOMPARE(type1 == type2, expected); + QCOMPARE(type1 != type2, !expected); } QTEST_APPLESS_MAIN(tst_MapType) |