diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2017-11-17 21:53:54 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2017-11-22 11:59:08 +0000 |
| commit | 0a202e4c29251d00d9fcca2dbef6820434695bf2 (patch) | |
| tree | 3595f3f9c94e1f68f19d2c348bab82764d41a037 /tests/auto/utils | |
| parent | 6044b84e1411a76b12a422159ab255cc03b3b41f (diff) | |
SettingsAccessor: Use optional as return value of findIssues
Change-Id: Ib7ef8ec408f812a71735939514d98cf8755d292b
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'tests/auto/utils')
| -rw-r--r-- | tests/auto/utils/settings/tst_settings.cpp | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/tests/auto/utils/settings/tst_settings.cpp b/tests/auto/utils/settings/tst_settings.cpp index cdc824d4d8..f926cdf2ef 100644 --- a/tests/auto/utils/settings/tst_settings.cpp +++ b/tests/auto/utils/settings/tst_settings.cpp @@ -473,11 +473,9 @@ void tst_SettingsAccessor::findIssues_ok() const QVariantMap data = versionedMap(6, TESTACCESSOR_DEFAULT_ID); const Utils::FileName path = Utils::FileName::fromString("/foo/bar.user"); - const Utils::SettingsAccessor::IssueInfo info = accessor.findIssues(data, path); + const Utils::optional<Utils::SettingsAccessor::IssueInfo> info = accessor.findIssues(data, path); - QVERIFY(info.title.isEmpty()); - QVERIFY(info.message.isEmpty()); - QVERIFY(info.buttons.isEmpty()); + QVERIFY(!info); } void tst_SettingsAccessor::findIssues_emptyData() @@ -486,11 +484,9 @@ void tst_SettingsAccessor::findIssues_emptyData() const QVariantMap data; const Utils::FileName path = Utils::FileName::fromString("/foo/bar.user"); - const Utils::SettingsAccessor::IssueInfo info = accessor.findIssues(data, path); + const Utils::optional<Utils::SettingsAccessor::IssueInfo> info = accessor.findIssues(data, path); - QVERIFY(!info.title.isEmpty()); - QVERIFY(!info.message.isEmpty()); - QVERIFY(!info.buttons.isEmpty()); + QVERIFY(info); } void tst_SettingsAccessor::findIssues_tooNew() @@ -499,11 +495,9 @@ void tst_SettingsAccessor::findIssues_tooNew() const QVariantMap data = versionedMap(42, TESTACCESSOR_DEFAULT_ID); const Utils::FileName path = Utils::FileName::fromString("/foo/bar.user"); - const Utils::SettingsAccessor::IssueInfo info = accessor.findIssues(data, path); + const Utils::optional<Utils::SettingsAccessor::IssueInfo> info = accessor.findIssues(data, path); - QVERIFY(!info.title.isEmpty()); - QVERIFY(!info.message.isEmpty()); - QVERIFY(!info.buttons.isEmpty()); + QVERIFY(info); } void tst_SettingsAccessor::findIssues_tooOld() @@ -512,11 +506,9 @@ void tst_SettingsAccessor::findIssues_tooOld() const QVariantMap data = versionedMap(2, TESTACCESSOR_DEFAULT_ID); const Utils::FileName path = Utils::FileName::fromString("/foo/bar.user"); - const Utils::SettingsAccessor::IssueInfo info = accessor.findIssues(data, path); + const Utils::optional<Utils::SettingsAccessor::IssueInfo> info = accessor.findIssues(data, path); - QVERIFY(!info.title.isEmpty()); - QVERIFY(!info.message.isEmpty()); - QVERIFY(!info.buttons.isEmpty()); + QVERIFY(info); } void tst_SettingsAccessor::findIssues_wrongId() @@ -525,11 +517,9 @@ void tst_SettingsAccessor::findIssues_wrongId() const QVariantMap data = versionedMap(6, "foo"); const Utils::FileName path = Utils::FileName::fromString("/foo/bar.user"); - const Utils::SettingsAccessor::IssueInfo info = accessor.findIssues(data, path); + const Utils::optional<Utils::SettingsAccessor::IssueInfo> info = accessor.findIssues(data, path); - QVERIFY(!info.title.isEmpty()); - QVERIFY(!info.message.isEmpty()); - QVERIFY(!info.buttons.isEmpty()); + QVERIFY(info); } void tst_SettingsAccessor::findIssues_nonDefaultPath() @@ -538,11 +528,9 @@ void tst_SettingsAccessor::findIssues_nonDefaultPath() const QVariantMap data = versionedMap(6, TESTACCESSOR_DEFAULT_ID); const Utils::FileName path = Utils::FileName::fromString("/foo/bar.user.foobar"); - const Utils::SettingsAccessor::IssueInfo info = accessor.findIssues(data, path); + const Utils::optional<Utils::SettingsAccessor::IssueInfo> info = accessor.findIssues(data, path); - QVERIFY(!info.title.isEmpty()); - QVERIFY(!info.message.isEmpty()); - QVERIFY(!info.buttons.isEmpty()); + QVERIFY(info); } QTEST_MAIN(tst_SettingsAccessor) |