aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2016-10-18 17:27:13 +0200
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2016-10-18 17:27:13 +0200
commit3def677b32e7cf1916de2cdf6be01a7a0cc43d68 (patch)
treeecbc895a635fb05c9a31f85c70e9c217226e65f6 /tests
parent3bd198ee6bdaec2fefff032098b2442b0160c961 (diff)
downloadqmenumodel-3def677b32e7cf1916de2cdf6be01a7a0cc43d68.tar.gz
qmenumodel-3def677b32e7cf1916de2cdf6be01a7a0cc43d68.tar.bz2
qmenumodel-3def677b32e7cf1916de2cdf6be01a7a0cc43d68.zip
Converter: use builders and c++ facilities for schema conversions
Diffstat (limited to 'tests')
-rw-r--r--tests/client/convertertest.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/client/convertertest.cpp b/tests/client/convertertest.cpp
index 32d6091..5a9367f 100644
--- a/tests/client/convertertest.cpp
+++ b/tests/client/convertertest.cpp
@@ -295,38 +295,38 @@ private Q_SLOTS:
void testSchemaConvert()
{
// convert to integer
- compareWithSchema(QVariant::fromValue<int>(1), "i");
- compareWithSchema(QVariant::fromValue<double>(1.1), "i");
+ QVERIFY(compareWithSchema(QVariant::fromValue<int>(1), "i"));
+ QVERIFY(compareWithSchema(QVariant::fromValue<double>(1.1), "i"));
// convert to integer
- compareWithSchema(QVariant::fromValue<bool>(true), "b");
- compareWithSchema(QVariant::fromValue<int>(1), "b");
+ QVERIFY(compareWithSchema(QVariant::fromValue<bool>(true), "b"));
+ QVERIFY(compareWithSchema(QVariant::fromValue<int>(1), "b"));
// convert to double
- compareWithSchema(QVariant::fromValue<double>(1.0), "d");
- compareWithSchema(QVariant::fromValue<int>(1), "d");
+ QVERIFY(compareWithSchema(QVariant::fromValue<double>(1.0), "d"));
+ QVERIFY(compareWithSchema(QVariant::fromValue<int>(1), "d"));
// convert to string
- compareWithSchema(QVariant::fromValue<int>(1), "s");
- compareWithSchema(QVariant::fromValue<double>(1.1), "s");
+ QVERIFY(compareWithSchema(QVariant::fromValue<int>(1), "s"));
+ QVERIFY(compareWithSchema(QVariant::fromValue<double>(1.1), "s"));
// convert to tuple
- compareWithSchema(QVariantList() << QVariant::fromValue<bool>(true) << QVariant::fromValue<int>(1) << QVariant::fromValue<int>(1) << QVariant::fromValue<QString>("test1"), "(bdis)");
+ QVERIFY(compareWithSchema(QVariantList() << QVariant::fromValue<bool>(true) << QVariant::fromValue<int>(1) << QVariant::fromValue<int>(1) << QVariant::fromValue<QString>("test1"), "(bdis)"));
// convert to array
- compareWithSchema(QVariantList() << QVariant::fromValue<int>(1) << QVariant::fromValue<int>(1), "ad");
- compareWithSchema(QVariantList() << QVariant::fromValue<QString>("test1") << QVariant::fromValue<QString>("test2"), "as");
+ QVERIFY(compareWithSchema(QVariantList() << QVariant::fromValue<int>(1) << QVariant::fromValue<int>(1), "ad"));
+ QVERIFY(compareWithSchema(QVariantList() << QVariant::fromValue<QString>("test1") << QVariant::fromValue<QString>("test2"), "as"));
// convert to array of tuple
QVariantList si1(QVariantList() << QVariant::fromValue<QString>("test1") << QVariant::fromValue<int>(1));
QVariantList si2(QVariantList() << QVariant::fromValue<QString>("test1") << QVariant::fromValue<int>(1));
- compareWithSchema(QVariantList() << QVariant::fromValue(si1) << QVariant::fromValue(si2), "a(sd)");
+ QVERIFY(compareWithSchema(QVariantList() << QVariant::fromValue(si1) << QVariant::fromValue(si2), "a(sd)"));
// convert to vardict
QVariantMap map;
map["test1"] = QVariant::fromValue<int>(1);
map["test2"] = QVariant::fromValue<double>(1);
- compareWithSchema(map, "a{sv}");
+ QVERIFY(compareWithSchema(map, "a{sv}"));
}
};