diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2017-12-11 11:30:01 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2018-01-15 14:28:01 +0000 |
| commit | 21e7e9ea3bf613b14d94c0642e37e57164c1d6bd (patch) | |
| tree | 2226124d0a12a14bf779b6abb62b8d78e2c601b9 /tests | |
| parent | f33ef0e80b08fee47ac89758321c1114ae754f48 (diff) | |
Settingsaccessor: Extract file access and error reporting
Move file access and error reporting out of SettingsAccessor and into
BasicSettingsAccessor.
Change-Id: If6cc9157c1a532f117c48b929c05f55d89a339eb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/utils/settings/tst_settings.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/tests/auto/utils/settings/tst_settings.cpp b/tests/auto/utils/settings/tst_settings.cpp index 292c9d8bbc..43809e7aef 100644 --- a/tests/auto/utils/settings/tst_settings.cpp +++ b/tests/auto/utils/settings/tst_settings.cpp @@ -72,10 +72,8 @@ class BasicTestSettingsAccessor : public Utils::SettingsAccessor public: BasicTestSettingsAccessor(const Utils::FileName &baseName = Utils::FileName::fromString("/foo/bar"), const QByteArray &id = QByteArray(TESTACCESSOR_DEFAULT_ID)) : - Utils::SettingsAccessor(baseName, "TestData") + Utils::SettingsAccessor(baseName, "TestData", TESTACCESSOR_DN, TESTACCESSOR_APPLICATION_DN) { - setDisplayName(TESTACCESSOR_DN); - setApplicationDisplayName(TESTACCESSOR_APPLICATION_DN); setSettingsId(id); } }; @@ -486,7 +484,7 @@ void tst_SettingsAccessor::findIssues_ok() const QVariantMap data = versionedMap(6, TESTACCESSOR_DEFAULT_ID); const Utils::FileName path = Utils::FileName::fromString("/foo/baz.user"); - const Utils::optional<Utils::SettingsAccessor::IssueInfo> info = accessor.findIssues(data, path); + const Utils::optional<Utils::SettingsAccessor::Issue> info = accessor.findIssues(data, path); QVERIFY(!info); } @@ -497,7 +495,7 @@ void tst_SettingsAccessor::findIssues_emptyData() const QVariantMap data; const Utils::FileName path = Utils::FileName::fromString("/foo/bar.user"); - const Utils::optional<Utils::SettingsAccessor::IssueInfo> info = accessor.findIssues(data, path); + const Utils::optional<Utils::SettingsAccessor::Issue> info = accessor.findIssues(data, path); QVERIFY(bool(info)); } @@ -508,7 +506,7 @@ 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::optional<Utils::SettingsAccessor::IssueInfo> info = accessor.findIssues(data, path); + const Utils::optional<Utils::SettingsAccessor::Issue> info = accessor.findIssues(data, path); QVERIFY(bool(info)); } @@ -519,7 +517,7 @@ 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::optional<Utils::SettingsAccessor::IssueInfo> info = accessor.findIssues(data, path); + const Utils::optional<Utils::SettingsAccessor::Issue> info = accessor.findIssues(data, path); QVERIFY(bool(info)); } @@ -530,7 +528,7 @@ void tst_SettingsAccessor::findIssues_wrongId() const QVariantMap data = versionedMap(6, "foo"); const Utils::FileName path = Utils::FileName::fromString("/foo/bar.user"); - const Utils::optional<Utils::SettingsAccessor::IssueInfo> info = accessor.findIssues(data, path); + const Utils::optional<Utils::SettingsAccessor::Issue> info = accessor.findIssues(data, path); QVERIFY(bool(info)); } @@ -541,7 +539,7 @@ 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::optional<Utils::SettingsAccessor::IssueInfo> info = accessor.findIssues(data, path); + const Utils::optional<Utils::SettingsAccessor::Issue> info = accessor.findIssues(data, path); QVERIFY(bool(info)); } |