Merge lp:~michihenning/storage-framework/metadata-keys into lp:storage-framework/devel
- metadata-keys
- Merge into devel
| Status: | Merged |
|---|---|
| Approved by: | James Henstridge |
| Approved revision: | 92 |
| Merged at revision: | 84 |
| Proposed branch: | lp:~michihenning/storage-framework/metadata-keys |
| Merge into: | lp:storage-framework/devel |
| Prerequisite: | lp:~michihenning/storage-framework/specify-metadata |
| Diff against target: |
1147 lines (+500/-115) 18 files modified
CMakeLists.txt (+1/-1) debian/changelog (+1/-0) demo/provider_test/provider-test.cpp (+5/-5) include/unity/storage/common.h (+19/-0) include/unity/storage/internal/metadata_keys.h (+22/-15) include/unity/storage/qt/Downloader.h (+1/-1) include/unity/storage/qt/Item.h (+1/-3) include/unity/storage/qt/MetadataKeys.h.THIS (+37/-0) include/unity/storage/qt/internal/ItemImpl.h (+1/-2) src/qt/Item.cpp (+5/-10) src/qt/client/internal/remote_client/FileImpl.cpp (+2/-2) src/qt/client/internal/remote_client/ItemImpl.cpp (+3/-3) src/qt/client/internal/remote_client/validate.cpp (+14/-9) src/qt/internal/ItemImpl.cpp (+14/-14) src/qt/internal/validate.cpp (+43/-31) tests/remote-client-v1/MockProvider.cpp (+5/-5) tests/remote-client/MockProvider.cpp (+123/-14) tests/remote-client/remote-client_test.cpp (+203/-0) |
| To merge this branch: | bzr merge lp:~michihenning/storage-framework/metadata-keys |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| unity-api-1-bot | continuous-integration | Approve | |
| James Henstridge | Approve | ||
|
Review via email:
|
|||
Commit message
Moved metadata key definitions into common.h and move metadata_keys.h to include/
Added commonly supported metadata keys.
Removed free and used space methods (they are metadata now).
No metadata validation for roots because Dropbox can't support that.
Description of the change
Moved metadata key definitions into common.h and move metadata_keys.h to include/
Added commonly supported metadata keys.
Removed free and used space methods (they are metadata now).
No metadata validation for roots because Dropbox can't support that.
| unity-api-1-bot (unity-api-1-bot) wrote : | # |
- 88. By Michi Henning
-
Updated changelog. Bumped API version.
- 89. By Michi Henning
-
Server-side API version back to 1. Updated changelog accordingly.
| unity-api-1-bot (unity-api-1-bot) wrote : | # |
PASSED: Continuous integration, rev:87
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| unity-api-1-bot (unity-api-1-bot) wrote : | # |
PASSED: Continuous integration, rev:89
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 90. By Michi Henning
-
Merged dependent branch.
| unity-api-1-bot (unity-api-1-bot) wrote : | # |
FAILED: Continuous integration, rev:90
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 91. By Michi Henning
-
Merged dependent branch.
| unity-api-1-bot (unity-api-1-bot) wrote : | # |
PASSED: Continuous integration, rev:91
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 92. By Michi Henning
-
Relaxed validation of etag so it applies only to files.
| unity-api-1-bot (unity-api-1-bot) wrote : | # |
PASSED: Continuous integration, rev:92
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Preview Diff
| 1 | === modified file 'CMakeLists.txt' | |||
| 2 | --- CMakeLists.txt 2016-09-29 11:37:05 +0000 | |||
| 3 | +++ CMakeLists.txt 2016-11-02 06:07:10 +0000 | |||
| 4 | @@ -8,7 +8,7 @@ | |||
| 5 | 8 | project(storage-framework VERSION "0.2" LANGUAGES C CXX) | 8 | project(storage-framework VERSION "0.2" LANGUAGES C CXX) |
| 6 | 9 | 9 | ||
| 7 | 10 | # These variables should be incremented when we wish to create a new | 10 | # These variables should be incremented when we wish to create a new |
| 9 | 11 | # source incompatible version of the the library where users of the | 11 | # source incompatible version of the library where users of the |
| 10 | 12 | # old API will not compile against the new one. It is not | 12 | # old API will not compile against the new one. It is not |
| 11 | 13 | # necessary to increment this for ABI breaks that are source compatible. | 13 | # necessary to increment this for ABI breaks that are source compatible. |
| 12 | 14 | set(SF_CLIENT_API_VERSION "2") | 14 | set(SF_CLIENT_API_VERSION "2") |
| 13 | 15 | 15 | ||
| 14 | === modified file 'debian/changelog' | |||
| 15 | --- debian/changelog 2016-09-21 04:41:06 +0000 | |||
| 16 | +++ debian/changelog 2016-11-02 06:07:10 +0000 | |||
| 17 | @@ -2,6 +2,7 @@ | |||
| 18 | 2 | 2 | ||
| 19 | 3 | [ Michi Henning ] | 3 | [ Michi Henning ] |
| 20 | 4 | * Added v2 of the client-side API. | 4 | * Added v2 of the client-side API. |
| 21 | 5 | * Updated server-side API to tell the provider which metadata to return. | ||
| 22 | 5 | 6 | ||
| 23 | 6 | -- Michi Henning <michi.henning@canonical.com> Wed, 21 Sep 2016 14:36:15 +1000 | 7 | -- Michi Henning <michi.henning@canonical.com> Wed, 21 Sep 2016 14:36:15 +1000 |
| 24 | 7 | 8 | ||
| 25 | 8 | 9 | ||
| 26 | === modified file 'demo/provider_test/provider-test.cpp' | |||
| 27 | --- demo/provider_test/provider-test.cpp 2016-11-02 06:07:10 +0000 | |||
| 28 | +++ demo/provider_test/provider-test.cpp 2016-11-02 06:07:10 +0000 | |||
| 29 | @@ -16,9 +16,9 @@ | |||
| 30 | 16 | * Authors: James Henstridge <james.henstridge@canonical.com> | 16 | * Authors: James Henstridge <james.henstridge@canonical.com> |
| 31 | 17 | */ | 17 | */ |
| 32 | 18 | 18 | ||
| 33 | 19 | #include <unity/storage/common.h> | ||
| 34 | 19 | #include <unity/storage/provider/DownloadJob.h> | 20 | #include <unity/storage/provider/DownloadJob.h> |
| 35 | 20 | #include <unity/storage/provider/Exceptions.h> | 21 | #include <unity/storage/provider/Exceptions.h> |
| 36 | 21 | #include <unity/storage/provider/metadata_keys.h> | ||
| 37 | 22 | #include <unity/storage/provider/ProviderBase.h> | 22 | #include <unity/storage/provider/ProviderBase.h> |
| 38 | 23 | #include <unity/storage/provider/Server.h> | 23 | #include <unity/storage/provider/Server.h> |
| 39 | 24 | #include <unity/storage/provider/TempfileUploadJob.h> | 24 | #include <unity/storage/provider/TempfileUploadJob.h> |
| 40 | @@ -128,7 +128,7 @@ | |||
| 41 | 128 | { | 128 | { |
| 42 | 129 | { | 129 | { |
| 43 | 130 | "child_id", { "root_id" }, "Child", "etag", ItemType::file, | 130 | "child_id", { "root_id" }, "Child", "etag", ItemType::file, |
| 45 | 131 | { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } | 131 | { { metadata::SIZE_IN_BYTES, 0 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } |
| 46 | 132 | } | 132 | } |
| 47 | 133 | }; | 133 | }; |
| 48 | 134 | boost::promise<tuple<ItemList,string>> p; | 134 | boost::promise<tuple<ItemList,string>> p; |
| 49 | @@ -154,7 +154,7 @@ | |||
| 50 | 154 | ItemList children = | 154 | ItemList children = |
| 51 | 155 | { | 155 | { |
| 52 | 156 | { "child_id", { "root_id" }, "Child", "etag", ItemType::file, | 156 | { "child_id", { "root_id" }, "Child", "etag", ItemType::file, |
| 54 | 157 | { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } } | 157 | { { metadata::SIZE_IN_BYTES, 0 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } } |
| 55 | 158 | }; | 158 | }; |
| 56 | 159 | return make_ready_future<ItemList>(children); | 159 | return make_ready_future<ItemList>(children); |
| 57 | 160 | } | 160 | } |
| 58 | @@ -175,7 +175,7 @@ | |||
| 59 | 175 | Item metadata | 175 | Item metadata |
| 60 | 176 | { | 176 | { |
| 61 | 177 | "child_id", { "root_id" }, "Child", "etag", ItemType::file, | 177 | "child_id", { "root_id" }, "Child", "etag", ItemType::file, |
| 63 | 178 | { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } | 178 | { { metadata::SIZE_IN_BYTES, 0 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } |
| 64 | 179 | }; | 179 | }; |
| 65 | 180 | return make_ready_future<Item>(metadata); | 180 | return make_ready_future<Item>(metadata); |
| 66 | 181 | } | 181 | } |
| 67 | @@ -289,7 +289,7 @@ | |||
| 68 | 289 | Item metadata | 289 | Item metadata |
| 69 | 290 | { | 290 | { |
| 70 | 291 | "some_id", { "root_id" }, "some_upload", "etag", ItemType::file, | 291 | "some_id", { "root_id" }, "some_upload", "etag", ItemType::file, |
| 72 | 292 | { { SIZE_IN_BYTES, 10 }, { LAST_MODIFIED_TIME, "2011-04-05T14:30:10.005Z" } } | 292 | { { metadata::SIZE_IN_BYTES, 10 }, { metadata::LAST_MODIFIED_TIME, "2011-04-05T14:30:10.005Z" } } |
| 73 | 293 | }; | 293 | }; |
| 74 | 294 | return make_ready_future(metadata); | 294 | return make_ready_future(metadata); |
| 75 | 295 | } | 295 | } |
| 76 | 296 | 296 | ||
| 77 | === modified file 'include/unity/storage/common.h' | |||
| 78 | --- include/unity/storage/common.h 2016-07-12 02:22:05 +0000 | |||
| 79 | +++ include/unity/storage/common.h 2016-11-02 06:07:10 +0000 | |||
| 80 | @@ -37,5 +37,24 @@ | |||
| 81 | 37 | overwrite, | 37 | overwrite, |
| 82 | 38 | }; | 38 | }; |
| 83 | 39 | 39 | ||
| 84 | 40 | namespace metadata | ||
| 85 | 41 | { | ||
| 86 | 42 | |||
| 87 | 43 | static char constexpr SIZE_IN_BYTES[] = "size_in_bytes"; // int64_t, >= 0 | ||
| 88 | 44 | static char constexpr CREATION_TIME[] = "creation_time"; // String, ISO 8601 format | ||
| 89 | 45 | static char constexpr LAST_MODIFIED_TIME[] = "last_modified_time"; // String, ISO 8601 format | ||
| 90 | 46 | static char constexpr CHILD_COUNT[] = "child_count"; // int64_t, >= 0 | ||
| 91 | 47 | static char constexpr DESCRIPTION[] = "description"; // String | ||
| 92 | 48 | static char constexpr DISPLAY_NAME[] = "display_name"; // String | ||
| 93 | 49 | static char constexpr FREE_SPACE_BYTES[] = "free_space_bytes"; // int64_t, >= 0 | ||
| 94 | 50 | static char constexpr USED_SPACE_BYTES[] = "used_space_bytes"; // int64_t, >= 0 | ||
| 95 | 51 | static char constexpr CONTENT_TYPE[] = "content_type"; // String | ||
| 96 | 52 | static char constexpr WRITABLE[] = "writable"; // Bool | ||
| 97 | 53 | static char constexpr MD5[] = "md5"; // String | ||
| 98 | 54 | static char constexpr DOWNLOAD_URL[] = "download_url"; // String | ||
| 99 | 55 | |||
| 100 | 56 | static char constexpr ALL[] = "__ALL__"; | ||
| 101 | 57 | |||
| 102 | 58 | } // namespace metadata | ||
| 103 | 40 | } // namespace storage | 59 | } // namespace storage |
| 104 | 41 | } // namespace unity | 60 | } // namespace unity |
| 105 | 42 | 61 | ||
| 106 | === renamed file 'include/unity/storage/provider/metadata_keys.h' => 'include/unity/storage/internal/metadata_keys.h' | |||
| 107 | --- include/unity/storage/provider/metadata_keys.h 2016-08-09 02:25:13 +0000 | |||
| 108 | +++ include/unity/storage/internal/metadata_keys.h 2016-11-02 06:07:10 +0000 | |||
| 109 | @@ -18,28 +18,35 @@ | |||
| 110 | 18 | 18 | ||
| 111 | 19 | #pragma once | 19 | #pragma once |
| 112 | 20 | 20 | ||
| 113 | 21 | #include <unity/storage/common.h> | ||
| 114 | 22 | |||
| 115 | 21 | #include <unordered_map> | 23 | #include <unordered_map> |
| 116 | 22 | 24 | ||
| 117 | 23 | namespace unity | 25 | namespace unity |
| 118 | 24 | { | 26 | { |
| 119 | 25 | namespace storage | 27 | namespace storage |
| 120 | 26 | { | 28 | { |
| 135 | 27 | namespace provider | 29 | namespace metadata |
| 136 | 28 | { | 30 | { |
| 137 | 29 | 31 | ||
| 138 | 30 | static char constexpr SIZE_IN_BYTES[] = "size_in_bytes"; // int64_t, >= 0 | 32 | enum class MetadataType { non_zero_pos_int64, iso_8601_date_time, string, boolean }; |
| 139 | 31 | static char constexpr CREATION_TIME[] = "creation_time"; // String, ISO 8601 format | 33 | |
| 140 | 32 | static char constexpr LAST_MODIFIED_TIME[] = "last_modified_time"; // String, ISO 8601 format | 34 | static std::unordered_map<std::string, MetadataType> const known_metadata = |
| 141 | 33 | 35 | { | |
| 142 | 34 | enum class MetadataType { int64, iso_8601_date_time }; | 36 | { metadata::SIZE_IN_BYTES, MetadataType::non_zero_pos_int64 }, |
| 143 | 35 | 37 | { metadata::CREATION_TIME, MetadataType::iso_8601_date_time }, | |
| 144 | 36 | static std::unordered_map<std::string, MetadataType> known_metadata = | 38 | { metadata::LAST_MODIFIED_TIME, MetadataType::iso_8601_date_time }, |
| 145 | 37 | { | 39 | { metadata::CHILD_COUNT, MetadataType::non_zero_pos_int64 }, |
| 146 | 38 | { SIZE_IN_BYTES, MetadataType::int64 }, | 40 | { metadata::DESCRIPTION, MetadataType::string }, |
| 147 | 39 | { CREATION_TIME, MetadataType::iso_8601_date_time }, | 41 | { metadata::DISPLAY_NAME, MetadataType::string }, |
| 148 | 40 | { LAST_MODIFIED_TIME, MetadataType::iso_8601_date_time } | 42 | { metadata::FREE_SPACE_BYTES, MetadataType::non_zero_pos_int64 }, |
| 149 | 43 | { metadata::USED_SPACE_BYTES, MetadataType::non_zero_pos_int64 }, | ||
| 150 | 44 | { metadata::CONTENT_TYPE, MetadataType::string }, | ||
| 151 | 45 | { metadata::WRITABLE, MetadataType::boolean }, | ||
| 152 | 46 | { metadata::MD5, MetadataType::string }, | ||
| 153 | 47 | { metadata::DOWNLOAD_URL, MetadataType::string } | ||
| 154 | 41 | }; | 48 | }; |
| 155 | 42 | 49 | ||
| 157 | 43 | } // namespace provider | 50 | } // namespace metadata |
| 158 | 44 | } // namespace storage | 51 | } // namespace storage |
| 159 | 45 | } // namespace unity | 52 | } // namespace unity |
| 160 | 46 | 53 | ||
| 161 | === modified file 'include/unity/storage/qt/Downloader.h' | |||
| 162 | --- include/unity/storage/qt/Downloader.h 2016-10-12 05:25:20 +0000 | |||
| 163 | +++ include/unity/storage/qt/Downloader.h 2016-11-02 06:07:10 +0000 | |||
| 164 | @@ -54,7 +54,7 @@ | |||
| 165 | 54 | bool isValid() const; // Not nice, hides QLocalSocket::isValid() | 54 | bool isValid() const; // Not nice, hides QLocalSocket::isValid() |
| 166 | 55 | Status status() const; | 55 | Status status() const; |
| 167 | 56 | StorageError error() const; // Not nice, hides QLocalSocket::error() | 56 | StorageError error() const; // Not nice, hides QLocalSocket::error() |
| 169 | 57 | Item item() const; // TODO: Should we keep this? | 57 | Item item() const; |
| 170 | 58 | 58 | ||
| 171 | 59 | Q_INVOKABLE void finishDownload(); | 59 | Q_INVOKABLE void finishDownload(); |
| 172 | 60 | Q_INVOKABLE void cancel(); | 60 | Q_INVOKABLE void cancel(); |
| 173 | 61 | 61 | ||
| 174 | === modified file 'include/unity/storage/qt/Item.h' | |||
| 175 | --- include/unity/storage/qt/Item.h 2016-11-02 06:07:10 +0000 | |||
| 176 | +++ include/unity/storage/qt/Item.h 2016-11-02 06:07:10 +0000 | |||
| 177 | @@ -94,6 +94,7 @@ | |||
| 178 | 94 | QString etag() const; | 94 | QString etag() const; |
| 179 | 95 | Type type() const; | 95 | Type type() const; |
| 180 | 96 | QVariantMap metadata() const; | 96 | QVariantMap metadata() const; |
| 181 | 97 | qint64 sizeInBytes() const; | ||
| 182 | 97 | QDateTime lastModifiedTime() const; | 98 | QDateTime lastModifiedTime() const; |
| 183 | 98 | QStringList parentIds() const; | 99 | QStringList parentIds() const; |
| 184 | 99 | 100 | ||
| 185 | @@ -120,9 +121,6 @@ | |||
| 186 | 120 | QString const& contentType, | 121 | QString const& contentType, |
| 187 | 121 | QStringList const& keys = QStringList()) const; | 122 | QStringList const& keys = QStringList()) const; |
| 188 | 122 | 123 | ||
| 189 | 123 | Q_INVOKABLE IntJob* freeSpaceBytes() const; | ||
| 190 | 124 | Q_INVOKABLE IntJob* usedSpaceBytes() const; | ||
| 191 | 125 | |||
| 192 | 126 | bool operator==(Item const&) const; | 124 | bool operator==(Item const&) const; |
| 193 | 127 | bool operator!=(Item const&) const; | 125 | bool operator!=(Item const&) const; |
| 194 | 128 | bool operator<(Item const&) const; | 126 | bool operator<(Item const&) const; |
| 195 | 129 | 127 | ||
| 196 | === added file 'include/unity/storage/qt/MetadataKeys.h.THIS' | |||
| 197 | --- include/unity/storage/qt/MetadataKeys.h.THIS 1970-01-01 00:00:00 +0000 | |||
| 198 | +++ include/unity/storage/qt/MetadataKeys.h.THIS 2016-11-02 06:07:10 +0000 | |||
| 199 | @@ -0,0 +1,37 @@ | |||
| 200 | 1 | /* | ||
| 201 | 2 | * Copyright (C) 2016 Canonical Ltd | ||
| 202 | 3 | * | ||
| 203 | 4 | * This program is free software: you can redistribute it and/or modify | ||
| 204 | 5 | * it under the terms of the GNU Lesser General Public License version 3 as | ||
| 205 | 6 | * published by the Free Software Foundation. | ||
| 206 | 7 | * | ||
| 207 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 208 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 209 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 210 | 11 | * GNU Lesser General Public License for more details. | ||
| 211 | 12 | * | ||
| 212 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 213 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 214 | 15 | * | ||
| 215 | 16 | * Authors: Michi Henning <michi.henning@canonical.com> | ||
| 216 | 17 | */ | ||
| 217 | 18 | |||
| 218 | 19 | #pragma once | ||
| 219 | 20 | |||
| 220 | 21 | #include <unity/storage/common.h> | ||
| 221 | 22 | |||
| 222 | 23 | #include <QList> | ||
| 223 | 24 | #include <QString> | ||
| 224 | 25 | |||
| 225 | 26 | namespace unity | ||
| 226 | 27 | { | ||
| 227 | 28 | namespace storage | ||
| 228 | 29 | { | ||
| 229 | 30 | namespace qt | ||
| 230 | 31 | { | ||
| 231 | 32 | |||
| 232 | 33 | static QStringList const ALL_METADATA = { metadata::ALL }; | ||
| 233 | 34 | |||
| 234 | 35 | } // namespace qt | ||
| 235 | 36 | } // namespace storage | ||
| 236 | 37 | } // namespace unity | ||
| 237 | 0 | 38 | ||
| 238 | === modified file 'include/unity/storage/qt/internal/ItemImpl.h' | |||
| 239 | --- include/unity/storage/qt/internal/ItemImpl.h 2016-11-02 06:07:10 +0000 | |||
| 240 | +++ include/unity/storage/qt/internal/ItemImpl.h 2016-11-02 06:07:10 +0000 | |||
| 241 | @@ -55,6 +55,7 @@ | |||
| 242 | 55 | QString etag() const; | 55 | QString etag() const; |
| 243 | 56 | Item::Type type() const; | 56 | Item::Type type() const; |
| 244 | 57 | QVariantMap metadata() const; | 57 | QVariantMap metadata() const; |
| 245 | 58 | qint64 sizeInBytes() const; | ||
| 246 | 58 | QDateTime lastModifiedTime() const; | 59 | QDateTime lastModifiedTime() const; |
| 247 | 59 | QList<QString> parentIds() const; | 60 | QList<QString> parentIds() const; |
| 248 | 60 | 61 | ||
| 249 | @@ -73,8 +74,6 @@ | |||
| 250 | 73 | qint64 sizeInBytes, | 74 | qint64 sizeInBytes, |
| 251 | 74 | QString const& contentType, | 75 | QString const& contentType, |
| 252 | 75 | QStringList const& keys) const; | 76 | QStringList const& keys) const; |
| 253 | 76 | IntJob* freeSpaceBytes() const; | ||
| 254 | 77 | IntJob* usedSpaceBytes() const; | ||
| 255 | 78 | 77 | ||
| 256 | 79 | bool operator==(ItemImpl const&) const; | 78 | bool operator==(ItemImpl const&) const; |
| 257 | 80 | bool operator!=(ItemImpl const&) const; | 79 | bool operator!=(ItemImpl const&) const; |
| 258 | 81 | 80 | ||
| 259 | === modified file 'src/qt/Item.cpp' | |||
| 260 | --- src/qt/Item.cpp 2016-11-02 06:07:10 +0000 | |||
| 261 | +++ src/qt/Item.cpp 2016-11-02 06:07:10 +0000 | |||
| 262 | @@ -107,6 +107,11 @@ | |||
| 263 | 107 | return p_->metadata(); | 107 | return p_->metadata(); |
| 264 | 108 | } | 108 | } |
| 265 | 109 | 109 | ||
| 266 | 110 | qint64 Item::sizeInBytes() const | ||
| 267 | 111 | { | ||
| 268 | 112 | return p_->sizeInBytes(); | ||
| 269 | 113 | } | ||
| 270 | 114 | |||
| 271 | 110 | QDateTime Item::lastModifiedTime() const | 115 | QDateTime Item::lastModifiedTime() const |
| 272 | 111 | { | 116 | { |
| 273 | 112 | return p_->lastModifiedTime(); | 117 | return p_->lastModifiedTime(); |
| 274 | @@ -171,16 +176,6 @@ | |||
| 275 | 171 | return p_->createFile(name, policy, sizeInBytes, contentType, keys); | 176 | return p_->createFile(name, policy, sizeInBytes, contentType, keys); |
| 276 | 172 | } | 177 | } |
| 277 | 173 | 178 | ||
| 278 | 174 | IntJob* Item::freeSpaceBytes() const | ||
| 279 | 175 | { | ||
| 280 | 176 | return p_->freeSpaceBytes(); | ||
| 281 | 177 | } | ||
| 282 | 178 | |||
| 283 | 179 | IntJob* Item::usedSpaceBytes() const | ||
| 284 | 180 | { | ||
| 285 | 181 | return p_->usedSpaceBytes(); | ||
| 286 | 182 | } | ||
| 287 | 183 | |||
| 288 | 184 | bool Item::operator==(Item const& other) const | 179 | bool Item::operator==(Item const& other) const |
| 289 | 185 | { | 180 | { |
| 290 | 186 | return p_->operator==(*other.p_); | 181 | return p_->operator==(*other.p_); |
| 291 | 187 | 182 | ||
| 292 | === modified file 'src/qt/client/internal/remote_client/FileImpl.cpp' | |||
| 293 | --- src/qt/client/internal/remote_client/FileImpl.cpp 2016-11-02 06:07:10 +0000 | |||
| 294 | +++ src/qt/client/internal/remote_client/FileImpl.cpp 2016-11-02 06:07:10 +0000 | |||
| 295 | @@ -19,7 +19,7 @@ | |||
| 296 | 19 | #include <unity/storage/qt/client/internal/remote_client/FileImpl.h> | 19 | #include <unity/storage/qt/client/internal/remote_client/FileImpl.h> |
| 297 | 20 | 20 | ||
| 298 | 21 | #include "ProviderInterface.h" | 21 | #include "ProviderInterface.h" |
| 300 | 22 | #include <unity/storage/provider/metadata_keys.h> | 22 | #include <unity/storage/common.h> |
| 301 | 23 | #include <unity/storage/qt/client/File.h> | 23 | #include <unity/storage/qt/client/File.h> |
| 302 | 24 | #include <unity/storage/qt/client/internal/remote_client/Handler.h> | 24 | #include <unity/storage/qt/client/internal/remote_client/Handler.h> |
| 303 | 25 | #include <unity/storage/qt/client/internal/remote_client/DownloaderImpl.h> | 25 | #include <unity/storage/qt/client/internal/remote_client/DownloaderImpl.h> |
| 304 | @@ -51,7 +51,7 @@ | |||
| 305 | 51 | int64_t FileImpl::size() const | 51 | int64_t FileImpl::size() const |
| 306 | 52 | { | 52 | { |
| 307 | 53 | throw_if_destroyed("File::size()"); | 53 | throw_if_destroyed("File::size()"); |
| 309 | 54 | return md_.metadata.value(provider::SIZE_IN_BYTES).toLongLong(); | 54 | return md_.metadata.value(metadata::SIZE_IN_BYTES).toLongLong(); |
| 310 | 55 | } | 55 | } |
| 311 | 56 | 56 | ||
| 312 | 57 | QFuture<shared_ptr<Uploader>> FileImpl::create_uploader(ConflictPolicy policy, int64_t size) | 57 | QFuture<shared_ptr<Uploader>> FileImpl::create_uploader(ConflictPolicy policy, int64_t size) |
| 313 | 58 | 58 | ||
| 314 | === modified file 'src/qt/client/internal/remote_client/ItemImpl.cpp' | |||
| 315 | --- src/qt/client/internal/remote_client/ItemImpl.cpp 2016-11-02 06:07:10 +0000 | |||
| 316 | +++ src/qt/client/internal/remote_client/ItemImpl.cpp 2016-11-02 06:07:10 +0000 | |||
| 317 | @@ -19,7 +19,7 @@ | |||
| 318 | 19 | #include <unity/storage/qt/client/internal/remote_client/ItemImpl.h> | 19 | #include <unity/storage/qt/client/internal/remote_client/ItemImpl.h> |
| 319 | 20 | 20 | ||
| 320 | 21 | #include "ProviderInterface.h" | 21 | #include "ProviderInterface.h" |
| 322 | 22 | #include <unity/storage/provider/metadata_keys.h> | 22 | #include <unity/storage/common.h> |
| 323 | 23 | #include <unity/storage/qt/client/Account.h> | 23 | #include <unity/storage/qt/client/Account.h> |
| 324 | 24 | #include <unity/storage/qt/client/internal/remote_client/AccountImpl.h> | 24 | #include <unity/storage/qt/client/internal/remote_client/AccountImpl.h> |
| 325 | 25 | #include <unity/storage/qt/client/internal/remote_client/FileImpl.h> | 25 | #include <unity/storage/qt/client/internal/remote_client/FileImpl.h> |
| 326 | @@ -72,7 +72,7 @@ | |||
| 327 | 72 | QDateTime ItemImpl::last_modified_time() const | 72 | QDateTime ItemImpl::last_modified_time() const |
| 328 | 73 | { | 73 | { |
| 329 | 74 | throw_if_destroyed("Item::last_modified_time()"); | 74 | throw_if_destroyed("Item::last_modified_time()"); |
| 331 | 75 | return QDateTime::fromString(md_.metadata.value(provider::LAST_MODIFIED_TIME).toString(), Qt::ISODate); | 75 | return QDateTime::fromString(md_.metadata.value(metadata::LAST_MODIFIED_TIME).toString(), Qt::ISODate); |
| 332 | 76 | } | 76 | } |
| 333 | 77 | 77 | ||
| 334 | 78 | QFuture<shared_ptr<Item>> ItemImpl::copy(shared_ptr<Folder> const& new_parent, QString const& new_name) | 78 | QFuture<shared_ptr<Item>> ItemImpl::copy(shared_ptr<Folder> const& new_parent, QString const& new_name) |
| 335 | @@ -254,7 +254,7 @@ | |||
| 336 | 254 | QDateTime ItemImpl::creation_time() const | 254 | QDateTime ItemImpl::creation_time() const |
| 337 | 255 | { | 255 | { |
| 338 | 256 | throw_if_destroyed("Item::creation_time()"); | 256 | throw_if_destroyed("Item::creation_time()"); |
| 340 | 257 | return QDateTime::fromString(md_.metadata.value(provider::CREATION_TIME).toString(), Qt::ISODate); | 257 | return QDateTime::fromString(md_.metadata.value(metadata::CREATION_TIME).toString(), Qt::ISODate); |
| 341 | 258 | } | 258 | } |
| 342 | 259 | 259 | ||
| 343 | 260 | MetadataMap ItemImpl::native_metadata() const | 260 | MetadataMap ItemImpl::native_metadata() const |
| 344 | 261 | 261 | ||
| 345 | === modified file 'src/qt/client/internal/remote_client/validate.cpp' | |||
| 346 | --- src/qt/client/internal/remote_client/validate.cpp 2016-09-28 10:08:40 +0000 | |||
| 347 | +++ src/qt/client/internal/remote_client/validate.cpp 2016-11-02 06:07:10 +0000 | |||
| 348 | @@ -18,7 +18,7 @@ | |||
| 349 | 18 | 18 | ||
| 350 | 19 | #include <unity/storage/internal/ItemMetadata.h> | 19 | #include <unity/storage/internal/ItemMetadata.h> |
| 351 | 20 | 20 | ||
| 353 | 21 | #include <unity/storage/provider/metadata_keys.h> | 21 | #include <unity/storage/internal/metadata_keys.h> |
| 354 | 22 | #include <unity/storage/qt/client/Exceptions.h> | 22 | #include <unity/storage/qt/client/Exceptions.h> |
| 355 | 23 | 23 | ||
| 356 | 24 | #include <QDateTime> | 24 | #include <QDateTime> |
| 357 | @@ -48,9 +48,9 @@ | |||
| 358 | 48 | 48 | ||
| 359 | 49 | void validate_type_and_value(QString const& prefix, | 49 | void validate_type_and_value(QString const& prefix, |
| 360 | 50 | QMapIterator<QString, QVariant> actual, | 50 | QMapIterator<QString, QVariant> actual, |
| 362 | 51 | unordered_map<string, provider::MetadataType>::const_iterator known) | 51 | unordered_map<string, metadata::MetadataType>::const_iterator known) |
| 363 | 52 | { | 52 | { |
| 365 | 53 | using namespace unity::storage::provider; | 53 | using namespace unity::storage::metadata; |
| 366 | 54 | 54 | ||
| 367 | 55 | switch (known->second) | 55 | switch (known->second) |
| 368 | 56 | { | 56 | { |
| 369 | @@ -75,7 +75,7 @@ | |||
| 370 | 75 | } | 75 | } |
| 371 | 76 | break; | 76 | break; |
| 372 | 77 | } | 77 | } |
| 374 | 78 | case MetadataType::int64: | 78 | case MetadataType::non_zero_pos_int64: |
| 375 | 79 | { | 79 | { |
| 376 | 80 | if (actual.value().type() != QVariant::LongLong) | 80 | if (actual.value().type() != QVariant::LongLong) |
| 377 | 81 | { | 81 | { |
| 378 | @@ -84,6 +84,11 @@ | |||
| 379 | 84 | } | 84 | } |
| 380 | 85 | break; | 85 | break; |
| 381 | 86 | } | 86 | } |
| 382 | 87 | case MetadataType::string: | ||
| 383 | 88 | case MetadataType::boolean: | ||
| 384 | 89 | { | ||
| 385 | 90 | break; | ||
| 386 | 91 | } | ||
| 387 | 87 | default: | 92 | default: |
| 388 | 88 | { | 93 | { |
| 389 | 89 | abort(); // Impossible. // LCOV_EXCL_LINE | 94 | abort(); // Impossible. // LCOV_EXCL_LINE |
| 390 | @@ -95,7 +100,7 @@ | |||
| 391 | 95 | 100 | ||
| 392 | 96 | void validate(QString const& method, ItemMetadata const& md) | 101 | void validate(QString const& method, ItemMetadata const& md) |
| 393 | 97 | { | 102 | { |
| 395 | 98 | using namespace unity::storage::provider; | 103 | using namespace unity::storage::metadata; |
| 396 | 99 | 104 | ||
| 397 | 100 | QString prefix = method + ": received invalid metadata from server: "; | 105 | QString prefix = method + ": received invalid metadata from server: "; |
| 398 | 101 | 106 | ||
| 399 | @@ -150,13 +155,13 @@ | |||
| 400 | 150 | // Sanity check metadata to make sure that mandatory fields are present. | 155 | // Sanity check metadata to make sure that mandatory fields are present. |
| 401 | 151 | if (md.type == ItemType::file) | 156 | if (md.type == ItemType::file) |
| 402 | 152 | { | 157 | { |
| 404 | 153 | if (!md.metadata.contains(SIZE_IN_BYTES)) | 158 | if (!md.metadata.contains(metadata::SIZE_IN_BYTES)) |
| 405 | 154 | { | 159 | { |
| 407 | 155 | throw LocalCommsException(prefix + "missing key " + SIZE_IN_BYTES + " in metadata for " + md.item_id); | 160 | throw LocalCommsException(prefix + "missing key " + metadata::SIZE_IN_BYTES + " in metadata for " + md.item_id); |
| 408 | 156 | } | 161 | } |
| 410 | 157 | if (!md.metadata.contains(LAST_MODIFIED_TIME)) | 162 | if (!md.metadata.contains(metadata::LAST_MODIFIED_TIME)) |
| 411 | 158 | { | 163 | { |
| 413 | 159 | throw LocalCommsException(prefix + "missing key " + LAST_MODIFIED_TIME + " in metadata for " + md.item_id); | 164 | throw LocalCommsException(prefix + "missing key " + metadata::LAST_MODIFIED_TIME + " in metadata for " + md.item_id); |
| 414 | 160 | } | 165 | } |
| 415 | 161 | } | 166 | } |
| 416 | 162 | } | 167 | } |
| 417 | 163 | 168 | ||
| 418 | === modified file 'src/qt/internal/ItemImpl.cpp' | |||
| 419 | --- src/qt/internal/ItemImpl.cpp 2016-11-02 06:07:10 +0000 | |||
| 420 | +++ src/qt/internal/ItemImpl.cpp 2016-11-02 06:07:10 +0000 | |||
| 421 | @@ -19,7 +19,7 @@ | |||
| 422 | 19 | #include <unity/storage/qt/internal/ItemImpl.h> | 19 | #include <unity/storage/qt/internal/ItemImpl.h> |
| 423 | 20 | 20 | ||
| 424 | 21 | #include "ProviderInterface.h" | 21 | #include "ProviderInterface.h" |
| 426 | 22 | #include <unity/storage/provider/metadata_keys.h> | 22 | #include <unity/storage/common.h> |
| 427 | 23 | #include <unity/storage/qt/internal/DownloaderImpl.h> | 23 | #include <unity/storage/qt/internal/DownloaderImpl.h> |
| 428 | 24 | #include <unity/storage/qt/internal/ItemJobImpl.h> | 24 | #include <unity/storage/qt/internal/ItemJobImpl.h> |
| 429 | 25 | #include <unity/storage/qt/internal/ItemListJobImpl.h> | 25 | #include <unity/storage/qt/internal/ItemListJobImpl.h> |
| 430 | @@ -96,13 +96,23 @@ | |||
| 431 | 96 | 96 | ||
| 432 | 97 | QVariantMap ItemImpl::metadata() const | 97 | QVariantMap ItemImpl::metadata() const |
| 433 | 98 | { | 98 | { |
| 436 | 99 | // TODO: Need to agree on metadata representation. | 99 | return is_valid_ ? md_.metadata : QVariantMap(); |
| 437 | 100 | return is_valid_ ? QVariantMap() : QVariantMap(); | 100 | } |
| 438 | 101 | |||
| 439 | 102 | qint64 ItemImpl::sizeInBytes() const | ||
| 440 | 103 | { | ||
| 441 | 104 | if (!is_valid_ || md_.type != ItemType::file) | ||
| 442 | 105 | { | ||
| 443 | 106 | return 0; | ||
| 444 | 107 | } | ||
| 445 | 108 | auto variant = md_.metadata.value(metadata::SIZE_IN_BYTES); | ||
| 446 | 109 | assert(variant.isValid()); | ||
| 447 | 110 | return variant.toLongLong(); | ||
| 448 | 101 | } | 111 | } |
| 449 | 102 | 112 | ||
| 450 | 103 | QDateTime ItemImpl::lastModifiedTime() const | 113 | QDateTime ItemImpl::lastModifiedTime() const |
| 451 | 104 | { | 114 | { |
| 453 | 105 | return is_valid_ ? QDateTime::fromString(md_.metadata.value(provider::LAST_MODIFIED_TIME).toString(), Qt::ISODate) | 115 | return is_valid_ ? QDateTime::fromString(md_.metadata.value(metadata::LAST_MODIFIED_TIME).toString(), Qt::ISODate) |
| 454 | 106 | : QDateTime(); | 116 | : QDateTime(); |
| 455 | 107 | } | 117 | } |
| 456 | 108 | 118 | ||
| 457 | @@ -425,16 +435,6 @@ | |||
| 458 | 425 | return UploaderImpl::make_job(This, method, reply, validate, policy, sizeInBytes); | 435 | return UploaderImpl::make_job(This, method, reply, validate, policy, sizeInBytes); |
| 459 | 426 | } | 436 | } |
| 460 | 427 | 437 | ||
| 461 | 428 | IntJob* ItemImpl::freeSpaceBytes() const | ||
| 462 | 429 | { | ||
| 463 | 430 | return nullptr; // TODO | ||
| 464 | 431 | } | ||
| 465 | 432 | |||
| 466 | 433 | IntJob* ItemImpl::usedSpaceBytes() const | ||
| 467 | 434 | { | ||
| 468 | 435 | return nullptr; // TODO | ||
| 469 | 436 | } | ||
| 470 | 437 | |||
| 471 | 438 | bool ItemImpl::operator==(ItemImpl const& other) const | 438 | bool ItemImpl::operator==(ItemImpl const& other) const |
| 472 | 439 | { | 439 | { |
| 473 | 440 | if (is_valid_) | 440 | if (is_valid_) |
| 474 | 441 | 441 | ||
| 475 | === modified file 'src/qt/internal/validate.cpp' | |||
| 476 | --- src/qt/internal/validate.cpp 2016-09-16 06:25:08 +0000 | |||
| 477 | +++ src/qt/internal/validate.cpp 2016-11-02 06:07:10 +0000 | |||
| 478 | @@ -19,7 +19,7 @@ | |||
| 479 | 19 | #include <unity/storage/qt/internal/validate.h> | 19 | #include <unity/storage/qt/internal/validate.h> |
| 480 | 20 | 20 | ||
| 481 | 21 | #include <unity/storage/internal/ItemMetadata.h> | 21 | #include <unity/storage/internal/ItemMetadata.h> |
| 483 | 22 | #include <unity/storage/provider/metadata_keys.h> | 22 | #include <unity/storage/internal/metadata_keys.h> |
| 484 | 23 | #include <unity/storage/qt/internal/StorageErrorImpl.h> | 23 | #include <unity/storage/qt/internal/StorageErrorImpl.h> |
| 485 | 24 | 24 | ||
| 486 | 25 | #include <QDateTime> | 25 | #include <QDateTime> |
| 487 | @@ -45,9 +45,9 @@ | |||
| 488 | 45 | 45 | ||
| 489 | 46 | void validate_type_and_value(QString const& prefix, | 46 | void validate_type_and_value(QString const& prefix, |
| 490 | 47 | QMapIterator<QString, QVariant> actual, | 47 | QMapIterator<QString, QVariant> actual, |
| 492 | 48 | unordered_map<string, provider::MetadataType>::const_iterator known) | 48 | unordered_map<string, metadata::MetadataType>::const_iterator known) |
| 493 | 49 | { | 49 | { |
| 495 | 50 | using namespace unity::storage::provider; | 50 | using namespace unity::storage::metadata; |
| 496 | 51 | 51 | ||
| 497 | 52 | switch (known->second) | 52 | switch (known->second) |
| 498 | 53 | { | 53 | { |
| 499 | @@ -55,7 +55,7 @@ | |||
| 500 | 55 | { | 55 | { |
| 501 | 56 | if (actual.value().type() != QVariant::String) | 56 | if (actual.value().type() != QVariant::String) |
| 502 | 57 | { | 57 | { |
| 504 | 58 | QString msg = prefix + actual.key() + ": expected value of type String, but received value of type " | 58 | QString msg = prefix + actual.key() + ": expected value of type QString, but received value of type " |
| 505 | 59 | + actual.value().typeName(); | 59 | + actual.value().typeName(); |
| 506 | 60 | throw StorageErrorImpl::local_comms_error(msg); | 60 | throw StorageErrorImpl::local_comms_error(msg); |
| 507 | 61 | } | 61 | } |
| 508 | @@ -75,14 +75,26 @@ | |||
| 509 | 75 | } | 75 | } |
| 510 | 76 | break; | 76 | break; |
| 511 | 77 | } | 77 | } |
| 520 | 78 | case MetadataType::int64: | 78 | case MetadataType::non_zero_pos_int64: |
| 521 | 79 | { | 79 | { |
| 522 | 80 | if (actual.value().type() != QVariant::LongLong) | 80 | auto variant = actual.value(); |
| 523 | 81 | { | 81 | if (variant.type() != QVariant::LongLong) |
| 524 | 82 | QString msg = prefix + actual.key() + ": expected value of type LongLong, but received value of type " | 82 | { |
| 525 | 83 | + actual.value().typeName(); | 83 | QString msg = prefix + actual.key() + ": expected value of type qlonglong, but received value of type " |
| 526 | 84 | throw StorageErrorImpl::local_comms_error(msg); | 84 | + variant.typeName(); |
| 527 | 85 | } | 85 | throw StorageErrorImpl::local_comms_error(msg); |
| 528 | 86 | } | ||
| 529 | 87 | qint64 val = variant.toLongLong(); | ||
| 530 | 88 | if (val < 0) | ||
| 531 | 89 | { | ||
| 532 | 90 | QString msg = prefix + actual.key() + ": expected value >= 0, but received " + QString::number(val); | ||
| 533 | 91 | throw StorageErrorImpl::local_comms_error(msg); | ||
| 534 | 92 | } | ||
| 535 | 93 | break; | ||
| 536 | 94 | } | ||
| 537 | 95 | case MetadataType::string: | ||
| 538 | 96 | case MetadataType::boolean: | ||
| 539 | 97 | { | ||
| 540 | 86 | break; | 98 | break; |
| 541 | 87 | } | 99 | } |
| 542 | 88 | default: | 100 | default: |
| 543 | @@ -96,7 +108,7 @@ | |||
| 544 | 96 | 108 | ||
| 545 | 97 | void validate(QString const& method, ItemMetadata const& md) | 109 | void validate(QString const& method, ItemMetadata const& md) |
| 546 | 98 | { | 110 | { |
| 548 | 99 | using namespace unity::storage::provider; | 111 | using namespace unity::storage::metadata; |
| 549 | 100 | 112 | ||
| 550 | 101 | QString prefix = method + ": received invalid metadata from provider: "; | 113 | QString prefix = method + ": received invalid metadata from provider: "; |
| 551 | 102 | 114 | ||
| 552 | @@ -121,15 +133,18 @@ | |||
| 553 | 121 | } | 133 | } |
| 554 | 122 | if (md.type == ItemType::root && !md.parent_ids.isEmpty()) | 134 | if (md.type == ItemType::root && !md.parent_ids.isEmpty()) |
| 555 | 123 | { | 135 | { |
| 565 | 124 | throw StorageErrorImpl::local_comms_error(prefix + "metadata: parent_ids of root must be empty"); | 136 | throw StorageErrorImpl::local_comms_error(prefix + "parent_ids of root must be empty"); |
| 566 | 125 | } | 137 | } |
| 567 | 126 | if (md.name.isEmpty()) | 138 | if (md.type != ItemType::root) // Dropbox does not support metadata for roots. |
| 568 | 127 | { | 139 | { |
| 569 | 128 | throw StorageErrorImpl::local_comms_error(prefix + "name cannot be empty"); | 140 | if (md.name.isEmpty()) |
| 570 | 129 | } | 141 | { |
| 571 | 130 | if (md.etag.isEmpty()) | 142 | throw StorageErrorImpl::local_comms_error(prefix + "name cannot be empty"); |
| 572 | 131 | { | 143 | } |
| 573 | 132 | throw StorageErrorImpl::local_comms_error(prefix + "etag cannot be empty"); | 144 | } |
| 574 | 145 | if (md.type == ItemType::file && md.etag.isEmpty()) // WebDav doesn't do etag for folders. | ||
| 575 | 146 | { | ||
| 576 | 147 | throw StorageErrorImpl::local_comms_error(prefix + "etag of a file cannot be empty"); | ||
| 577 | 133 | } | 148 | } |
| 578 | 134 | 149 | ||
| 579 | 135 | // Sanity check metadata to make sure only known metadata keys appear. | 150 | // Sanity check metadata to make sure only known metadata keys appear. |
| 580 | @@ -140,7 +155,7 @@ | |||
| 581 | 140 | auto known = known_metadata.find(actual.key().toStdString()); | 155 | auto known = known_metadata.find(actual.key().toStdString()); |
| 582 | 141 | if (known == known_metadata.end()) | 156 | if (known == known_metadata.end()) |
| 583 | 142 | { | 157 | { |
| 585 | 143 | qWarning() << prefix << "unknown metadata key:" << actual.key(); | 158 | qWarning().noquote().nospace() << prefix << "unknown metadata key: \"" << actual.key() << "\""; |
| 586 | 144 | } | 159 | } |
| 587 | 145 | else | 160 | else |
| 588 | 146 | { | 161 | { |
| 589 | @@ -151,14 +166,11 @@ | |||
| 590 | 151 | // Sanity check metadata to make sure that mandatory fields are present. | 166 | // Sanity check metadata to make sure that mandatory fields are present. |
| 591 | 152 | if (md.type == ItemType::file) | 167 | if (md.type == ItemType::file) |
| 592 | 153 | { | 168 | { |
| 601 | 154 | if (!md.metadata.contains(SIZE_IN_BYTES)) | 169 | if (!md.metadata.contains(metadata::SIZE_IN_BYTES) || |
| 602 | 155 | { | 170 | !md.metadata.contains(metadata::LAST_MODIFIED_TIME)) |
| 603 | 156 | QString msg = prefix + "missing key " + SIZE_IN_BYTES + " in metadata for " + md.item_id; | 171 | { |
| 604 | 157 | throw StorageErrorImpl::local_comms_error(msg); | 172 | QString msg = prefix + "missing key \"" + metadata::SIZE_IN_BYTES + "\" " |
| 605 | 158 | } | 173 | "in metadata for \"" + md.item_id + "\""; |
| 598 | 159 | if (!md.metadata.contains(LAST_MODIFIED_TIME)) | ||
| 599 | 160 | { | ||
| 600 | 161 | QString msg = prefix + "missing key " + LAST_MODIFIED_TIME + " in metadata for " + md.item_id; | ||
| 606 | 162 | throw StorageErrorImpl::local_comms_error(msg); | 174 | throw StorageErrorImpl::local_comms_error(msg); |
| 607 | 163 | } | 175 | } |
| 608 | 164 | } | 176 | } |
| 609 | 165 | 177 | ||
| 610 | === modified file 'tests/remote-client-v1/MockProvider.cpp' | |||
| 611 | --- tests/remote-client-v1/MockProvider.cpp 2016-11-02 06:07:10 +0000 | |||
| 612 | +++ tests/remote-client-v1/MockProvider.cpp 2016-11-02 06:07:10 +0000 | |||
| 613 | @@ -18,8 +18,8 @@ | |||
| 614 | 18 | 18 | ||
| 615 | 19 | #include "MockProvider.h" | 19 | #include "MockProvider.h" |
| 616 | 20 | 20 | ||
| 617 | 21 | #include <unity/storage/internal/metadata_keys.h> | ||
| 618 | 21 | #include <unity/storage/provider/Exceptions.h> | 22 | #include <unity/storage/provider/Exceptions.h> |
| 619 | 22 | #include <unity/storage/provider/metadata_keys.h> | ||
| 620 | 23 | 23 | ||
| 621 | 24 | #include <boost/thread.hpp> | 24 | #include <boost/thread.hpp> |
| 622 | 25 | #include <boost/thread/future.hpp> | 25 | #include <boost/thread/future.hpp> |
| 623 | @@ -71,7 +71,7 @@ | |||
| 624 | 71 | { | 71 | { |
| 625 | 72 | { | 72 | { |
| 626 | 73 | "child_id", { "root_id" }, "Child", "etag", ItemType::file, | 73 | "child_id", { "root_id" }, "Child", "etag", ItemType::file, |
| 628 | 74 | { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } | 74 | { { metadata::SIZE_IN_BYTES, 0 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } |
| 629 | 75 | } | 75 | } |
| 630 | 76 | }; | 76 | }; |
| 631 | 77 | boost::promise<tuple<ItemList,string>> p; | 77 | boost::promise<tuple<ItemList,string>> p; |
| 632 | @@ -95,7 +95,7 @@ | |||
| 633 | 95 | ItemList children = | 95 | ItemList children = |
| 634 | 96 | { | 96 | { |
| 635 | 97 | { "child_id", { "root_id" }, "Child", "etag", ItemType::file, | 97 | { "child_id", { "root_id" }, "Child", "etag", ItemType::file, |
| 637 | 98 | { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } } | 98 | { { metadata::SIZE_IN_BYTES, 0 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } } |
| 638 | 99 | }; | 99 | }; |
| 639 | 100 | return make_ready_future<ItemList>(children); | 100 | return make_ready_future<ItemList>(children); |
| 640 | 101 | } | 101 | } |
| 641 | @@ -112,7 +112,7 @@ | |||
| 642 | 112 | Item metadata | 112 | Item metadata |
| 643 | 113 | { | 113 | { |
| 644 | 114 | "child_id", { "root_id" }, "Child", "etag", ItemType::file, | 114 | "child_id", { "root_id" }, "Child", "etag", ItemType::file, |
| 646 | 115 | { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } | 115 | { { metadata::SIZE_IN_BYTES, 0 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } |
| 647 | 116 | }; | 116 | }; |
| 648 | 117 | return make_ready_future<Item>(metadata); | 117 | return make_ready_future<Item>(metadata); |
| 649 | 118 | } | 118 | } |
| 650 | @@ -209,7 +209,7 @@ | |||
| 651 | 209 | Item metadata | 209 | Item metadata |
| 652 | 210 | { | 210 | { |
| 653 | 211 | "some_id", { "root_id" }, "some_upload", "etag", ItemType::file, | 211 | "some_id", { "root_id" }, "some_upload", "etag", ItemType::file, |
| 655 | 212 | { { SIZE_IN_BYTES, 10 }, { LAST_MODIFIED_TIME, "2011-04-05T14:30:10.005Z" } } | 212 | { { metadata::SIZE_IN_BYTES, 10 }, { metadata::LAST_MODIFIED_TIME, "2011-04-05T14:30:10.005Z" } } |
| 656 | 213 | }; | 213 | }; |
| 657 | 214 | return make_ready_future(metadata); | 214 | return make_ready_future(metadata); |
| 658 | 215 | } | 215 | } |
| 659 | 216 | 216 | ||
| 660 | === modified file 'tests/remote-client/MockProvider.cpp' | |||
| 661 | --- tests/remote-client/MockProvider.cpp 2016-11-02 06:07:10 +0000 | |||
| 662 | +++ tests/remote-client/MockProvider.cpp 2016-11-02 06:07:10 +0000 | |||
| 663 | @@ -18,8 +18,8 @@ | |||
| 664 | 18 | 18 | ||
| 665 | 19 | #include "MockProvider.h" | 19 | #include "MockProvider.h" |
| 666 | 20 | 20 | ||
| 667 | 21 | #include <unity/storage/internal/metadata_keys.h> | ||
| 668 | 21 | #include <unity/storage/provider/Exceptions.h> | 22 | #include <unity/storage/provider/Exceptions.h> |
| 669 | 22 | #include <unity/storage/provider/metadata_keys.h> | ||
| 670 | 23 | 23 | ||
| 671 | 24 | #include <boost/thread.hpp> | 24 | #include <boost/thread.hpp> |
| 672 | 25 | #include <boost/thread/future.hpp> | 25 | #include <boost/thread/future.hpp> |
| 673 | @@ -96,7 +96,7 @@ | |||
| 674 | 96 | { | 96 | { |
| 675 | 97 | { | 97 | { |
| 676 | 98 | "child_id", { "root_id" }, "Child", "etag", ItemType::root, | 98 | "child_id", { "root_id" }, "Child", "etag", ItemType::root, |
| 678 | 99 | { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } | 99 | { { metadata::SIZE_IN_BYTES, 0 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } |
| 679 | 100 | } | 100 | } |
| 680 | 101 | }; | 101 | }; |
| 681 | 102 | boost::promise<tuple<ItemList,string>> p; | 102 | boost::promise<tuple<ItemList,string>> p; |
| 682 | @@ -114,7 +114,7 @@ | |||
| 683 | 114 | { | 114 | { |
| 684 | 115 | { | 115 | { |
| 685 | 116 | "child_id", { "root_id" }, "Child", "etag", ItemType::file, | 116 | "child_id", { "root_id" }, "Child", "etag", ItemType::file, |
| 687 | 117 | { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } | 117 | { { metadata::SIZE_IN_BYTES, 0 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } |
| 688 | 118 | } | 118 | } |
| 689 | 119 | }; | 119 | }; |
| 690 | 120 | } | 120 | } |
| 691 | @@ -125,7 +125,7 @@ | |||
| 692 | 125 | { | 125 | { |
| 693 | 126 | { | 126 | { |
| 694 | 127 | "child2_id", { "root_id" }, "Child2", "etag", ItemType::file, | 127 | "child2_id", { "root_id" }, "Child2", "etag", ItemType::file, |
| 696 | 128 | { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } | 128 | { { metadata::SIZE_IN_BYTES, 0 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } |
| 697 | 129 | } | 129 | } |
| 698 | 130 | }; | 130 | }; |
| 699 | 131 | } | 131 | } |
| 700 | @@ -147,7 +147,7 @@ | |||
| 701 | 147 | { | 147 | { |
| 702 | 148 | { | 148 | { |
| 703 | 149 | "child_id", { "root_id" }, "Child", "etag", ItemType::file, | 149 | "child_id", { "root_id" }, "Child", "etag", ItemType::file, |
| 705 | 150 | { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } | 150 | { { metadata::SIZE_IN_BYTES, 0 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } |
| 706 | 151 | } | 151 | } |
| 707 | 152 | }; | 152 | }; |
| 708 | 153 | boost::promise<tuple<ItemList,string>> p; | 153 | boost::promise<tuple<ItemList,string>> p; |
| 709 | @@ -171,7 +171,7 @@ | |||
| 710 | 171 | ItemList children = | 171 | ItemList children = |
| 711 | 172 | { | 172 | { |
| 712 | 173 | { "child_id", { "root_id" }, "Child", "etag", ItemType::file, | 173 | { "child_id", { "root_id" }, "Child", "etag", ItemType::file, |
| 714 | 174 | { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } } | 174 | { { metadata::SIZE_IN_BYTES, 0 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } } |
| 715 | 175 | }; | 175 | }; |
| 716 | 176 | return make_ready_future<ItemList>(children); | 176 | return make_ready_future<ItemList>(children); |
| 717 | 177 | } | 177 | } |
| 718 | @@ -216,24 +216,133 @@ | |||
| 719 | 216 | return make_ready_future<Item>(metadata); | 216 | return make_ready_future<Item>(metadata); |
| 720 | 217 | } | 217 | } |
| 721 | 218 | } | 218 | } |
| 722 | 219 | if (cmd_ == "root_with_parent") | ||
| 723 | 220 | { | ||
| 724 | 221 | Item metadata{"root_id", { "this shouldn't be here" }, "Root", "etag", ItemType::root, {}}; | ||
| 725 | 222 | return make_ready_future<Item>(metadata); | ||
| 726 | 223 | } | ||
| 727 | 219 | Item metadata{"root_id", {}, "Root", "etag", ItemType::root, {}}; | 224 | Item metadata{"root_id", {}, "Root", "etag", ItemType::root, {}}; |
| 728 | 220 | return make_ready_future<Item>(metadata); | 225 | return make_ready_future<Item>(metadata); |
| 729 | 221 | } | 226 | } |
| 730 | 222 | if (item_id == "child_id") | 227 | if (item_id == "child_id") |
| 731 | 223 | { | 228 | { |
| 732 | 229 | if (cmd_ == "no_parents") | ||
| 733 | 230 | { | ||
| 734 | 231 | Item metadata | ||
| 735 | 232 | { | ||
| 736 | 233 | "child_id", {}, "Child", "etag", ItemType::file, | ||
| 737 | 234 | { { metadata::SIZE_IN_BYTES, 0 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } | ||
| 738 | 235 | }; | ||
| 739 | 236 | return make_ready_future<Item>(metadata); | ||
| 740 | 237 | } | ||
| 741 | 238 | if (cmd_ == "empty_name") | ||
| 742 | 239 | { | ||
| 743 | 240 | Item metadata | ||
| 744 | 241 | { | ||
| 745 | 242 | "child_id", { "root_id" }, "", "etag", ItemType::file, | ||
| 746 | 243 | { { metadata::SIZE_IN_BYTES, 0 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } | ||
| 747 | 244 | }; | ||
| 748 | 245 | return make_ready_future<Item>(metadata); | ||
| 749 | 246 | } | ||
| 750 | 247 | if (cmd_ == "empty_etag") | ||
| 751 | 248 | { | ||
| 752 | 249 | Item metadata | ||
| 753 | 250 | { | ||
| 754 | 251 | "child_id", { "root_id" }, "Child", "", ItemType::file, | ||
| 755 | 252 | { { metadata::SIZE_IN_BYTES, 0 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } | ||
| 756 | 253 | }; | ||
| 757 | 254 | return make_ready_future<Item>(metadata); | ||
| 758 | 255 | } | ||
| 759 | 256 | if (cmd_ == "unknown_key") | ||
| 760 | 257 | { | ||
| 761 | 258 | Item metadata | ||
| 762 | 259 | { | ||
| 763 | 260 | "child_id", { "root_id" }, "Child", "etag", ItemType::file, | ||
| 764 | 261 | { { metadata::SIZE_IN_BYTES, 0 }, | ||
| 765 | 262 | { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" }, | ||
| 766 | 263 | { metadata::DESCRIPTION, "child test file" }, // For coverage | ||
| 767 | 264 | { metadata::WRITABLE, true }, // For coverage | ||
| 768 | 265 | { "unknown_key", "" } | ||
| 769 | 266 | } | ||
| 770 | 267 | }; | ||
| 771 | 268 | return make_ready_future<Item>(metadata); | ||
| 772 | 269 | } | ||
| 773 | 270 | if (cmd_ == "missing_key") | ||
| 774 | 271 | { | ||
| 775 | 272 | Item metadata | ||
| 776 | 273 | { | ||
| 777 | 274 | "child_id", { "root_id" }, "Child", "etag", ItemType::file, | ||
| 778 | 275 | { { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } | ||
| 779 | 276 | }; | ||
| 780 | 277 | return make_ready_future<Item>(metadata); | ||
| 781 | 278 | } | ||
| 782 | 279 | if (cmd_ == "wrong_type_for_time") | ||
| 783 | 280 | { | ||
| 784 | 281 | Item metadata | ||
| 785 | 282 | { | ||
| 786 | 283 | "child_id", { "root_id" }, "Child", "etag", ItemType::file, | ||
| 787 | 284 | { { metadata::SIZE_IN_BYTES, 10 }, { metadata::LAST_MODIFIED_TIME, true } } | ||
| 788 | 285 | }; | ||
| 789 | 286 | return make_ready_future<Item>(metadata); | ||
| 790 | 287 | } | ||
| 791 | 288 | if (cmd_ == "bad_parse_for_time") | ||
| 792 | 289 | { | ||
| 793 | 290 | Item metadata | ||
| 794 | 291 | { | ||
| 795 | 292 | "child_id", { "root_id" }, "Child", "etag", ItemType::file, | ||
| 796 | 293 | { { metadata::SIZE_IN_BYTES, 10 }, { metadata::LAST_MODIFIED_TIME, "xyz" } } | ||
| 797 | 294 | }; | ||
| 798 | 295 | return make_ready_future<Item>(metadata); | ||
| 799 | 296 | } | ||
| 800 | 297 | if (cmd_ == "missing_timezone") | ||
| 801 | 298 | { | ||
| 802 | 299 | Item metadata | ||
| 803 | 300 | { | ||
| 804 | 301 | "child_id", { "root_id" }, "Child", "etag", ItemType::file, | ||
| 805 | 302 | { { metadata::SIZE_IN_BYTES, 0 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30" } } | ||
| 806 | 303 | }; | ||
| 807 | 304 | return make_ready_future<Item>(metadata); | ||
| 808 | 305 | } | ||
| 809 | 306 | if (cmd_ == "wrong_type_for_size") | ||
| 810 | 307 | { | ||
| 811 | 308 | Item metadata | ||
| 812 | 309 | { | ||
| 813 | 310 | "child_id", { "root_id" }, "Child", "etag", ItemType::file, | ||
| 814 | 311 | { { metadata::SIZE_IN_BYTES, "10" }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } | ||
| 815 | 312 | }; | ||
| 816 | 313 | return make_ready_future<Item>(metadata); | ||
| 817 | 314 | } | ||
| 818 | 315 | if (cmd_ == "negative_size") | ||
| 819 | 316 | { | ||
| 820 | 317 | Item metadata | ||
| 821 | 318 | { | ||
| 822 | 319 | "child_id", { "root_id" }, "Child", "etag", ItemType::file, | ||
| 823 | 320 | { { metadata::SIZE_IN_BYTES, -1 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } | ||
| 824 | 321 | }; | ||
| 825 | 322 | return make_ready_future<Item>(metadata); | ||
| 826 | 323 | } | ||
| 827 | 324 | if (cmd_ == "empty_parent") | ||
| 828 | 325 | { | ||
| 829 | 326 | Item metadata | ||
| 830 | 327 | { | ||
| 831 | 328 | "child_id", { "" }, "Child", "etag", ItemType::file, | ||
| 832 | 329 | { { metadata::SIZE_IN_BYTES, 0 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } | ||
| 833 | 330 | }; | ||
| 834 | 331 | return make_ready_future<Item>(metadata); | ||
| 835 | 332 | } | ||
| 836 | 224 | if (cmd_ == "two_parents" || cmd_ == "two_parents_throw") | 333 | if (cmd_ == "two_parents" || cmd_ == "two_parents_throw") |
| 837 | 225 | { | 334 | { |
| 838 | 226 | Item metadata | 335 | Item metadata |
| 839 | 227 | { | 336 | { |
| 840 | 228 | "child_id", { "root_id", "child_folder_id" }, "Child", "etag", ItemType::file, | 337 | "child_id", { "root_id", "child_folder_id" }, "Child", "etag", ItemType::file, |
| 842 | 229 | { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } | 338 | { { metadata::SIZE_IN_BYTES, 0 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } |
| 843 | 230 | }; | 339 | }; |
| 844 | 231 | return make_ready_future<Item>(metadata); | 340 | return make_ready_future<Item>(metadata); |
| 845 | 232 | } | 341 | } |
| 846 | 233 | Item metadata | 342 | Item metadata |
| 847 | 234 | { | 343 | { |
| 848 | 235 | "child_id", { "root_id" }, "Child", "etag", ItemType::file, | 344 | "child_id", { "root_id" }, "Child", "etag", ItemType::file, |
| 850 | 236 | { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } | 345 | { { metadata::SIZE_IN_BYTES, 10 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } |
| 851 | 237 | }; | 346 | }; |
| 852 | 238 | return make_ready_future<Item>(metadata); | 347 | return make_ready_future<Item>(metadata); |
| 853 | 239 | } | 348 | } |
| 854 | @@ -335,7 +444,7 @@ | |||
| 855 | 335 | Item metadata | 444 | Item metadata |
| 856 | 336 | { | 445 | { |
| 857 | 337 | "root_id", { new_parent_id }, new_name, "etag", ItemType::root, | 446 | "root_id", { new_parent_id }, new_name, "etag", ItemType::root, |
| 859 | 338 | { { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } | 447 | { { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } |
| 860 | 339 | }; | 448 | }; |
| 861 | 340 | return make_ready_future(metadata); | 449 | return make_ready_future(metadata); |
| 862 | 341 | } | 450 | } |
| 863 | @@ -344,14 +453,14 @@ | |||
| 864 | 344 | Item metadata | 453 | Item metadata |
| 865 | 345 | { | 454 | { |
| 866 | 346 | item_id, { new_parent_id }, new_name, "etag", ItemType::folder, | 455 | item_id, { new_parent_id }, new_name, "etag", ItemType::folder, |
| 868 | 347 | { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } | 456 | { { metadata::SIZE_IN_BYTES, 0 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } |
| 869 | 348 | }; | 457 | }; |
| 870 | 349 | return make_ready_future(metadata); | 458 | return make_ready_future(metadata); |
| 871 | 350 | } | 459 | } |
| 872 | 351 | Item metadata | 460 | Item metadata |
| 873 | 352 | { | 461 | { |
| 874 | 353 | item_id, { new_parent_id }, new_name, "etag", ItemType::file, | 462 | item_id, { new_parent_id }, new_name, "etag", ItemType::file, |
| 876 | 354 | { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } | 463 | { { metadata::SIZE_IN_BYTES, 0 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } |
| 877 | 355 | }; | 464 | }; |
| 878 | 356 | return make_ready_future(metadata); | 465 | return make_ready_future(metadata); |
| 879 | 357 | } | 466 | } |
| 880 | @@ -365,14 +474,14 @@ | |||
| 881 | 365 | Item metadata | 474 | Item metadata |
| 882 | 366 | { | 475 | { |
| 883 | 367 | "new_item_id", { new_parent_id }, new_name, "etag", ItemType::folder, | 476 | "new_item_id", { new_parent_id }, new_name, "etag", ItemType::folder, |
| 885 | 368 | { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } | 477 | { { metadata::SIZE_IN_BYTES, 0 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } |
| 886 | 369 | }; | 478 | }; |
| 887 | 370 | return make_ready_future(metadata); | 479 | return make_ready_future(metadata); |
| 888 | 371 | } | 480 | } |
| 889 | 372 | Item metadata | 481 | Item metadata |
| 890 | 373 | { | 482 | { |
| 891 | 374 | "new_item_id", { new_parent_id }, new_name, "etag", ItemType::file, | 483 | "new_item_id", { new_parent_id }, new_name, "etag", ItemType::file, |
| 893 | 375 | { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } | 484 | { { metadata::SIZE_IN_BYTES, 0 }, { metadata::LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } |
| 894 | 376 | }; | 485 | }; |
| 895 | 377 | return make_ready_future(metadata); | 486 | return make_ready_future(metadata); |
| 896 | 378 | } | 487 | } |
| 897 | @@ -416,7 +525,7 @@ | |||
| 898 | 416 | Item metadata | 525 | Item metadata |
| 899 | 417 | { | 526 | { |
| 900 | 418 | "child_id", { "root_id" }, "some_upload", "etag", ItemType::file, | 527 | "child_id", { "root_id" }, "some_upload", "etag", ItemType::file, |
| 902 | 419 | { { SIZE_IN_BYTES, 10 }, { LAST_MODIFIED_TIME, "2011-04-05T14:30:10.005Z" } } | 528 | { { metadata::SIZE_IN_BYTES, 10 }, { metadata::LAST_MODIFIED_TIME, "2011-04-05T14:30:10.005Z" } } |
| 903 | 420 | }; | 529 | }; |
| 904 | 421 | return make_ready_future(metadata); | 530 | return make_ready_future(metadata); |
| 905 | 422 | } | 531 | } |
| 906 | 423 | 532 | ||
| 907 | === modified file 'tests/remote-client/remote-client_test.cpp' | |||
| 908 | --- tests/remote-client/remote-client_test.cpp 2016-10-17 13:01:16 +0000 | |||
| 909 | +++ tests/remote-client/remote-client_test.cpp 2016-11-02 06:07:10 +0000 | |||
| 910 | @@ -66,6 +66,7 @@ | |||
| 911 | 66 | class ItemTest : public RemoteClientTest {}; | 66 | class ItemTest : public RemoteClientTest {}; |
| 912 | 67 | class ListTest : public RemoteClientTest {}; | 67 | class ListTest : public RemoteClientTest {}; |
| 913 | 68 | class LookupTest : public RemoteClientTest {}; | 68 | class LookupTest : public RemoteClientTest {}; |
| 914 | 69 | class MetadataTest : public RemoteClientTest {}; | ||
| 915 | 69 | class MoveTest : public RemoteClientTest {}; | 70 | class MoveTest : public RemoteClientTest {}; |
| 916 | 70 | class ParentsTest : public RemoteClientTest {}; | 71 | class ParentsTest : public RemoteClientTest {}; |
| 917 | 71 | class RootsTest : public RemoteClientTest {}; | 72 | class RootsTest : public RemoteClientTest {}; |
| 918 | @@ -345,6 +346,8 @@ | |||
| 919 | 345 | EXPECT_EQ(AccountsJob::Status::Finished, j->status()); | 346 | EXPECT_EQ(AccountsJob::Status::Finished, j->status()); |
| 920 | 346 | EXPECT_EQ(StorageError::Type::NoError, j->error().type()); | 347 | EXPECT_EQ(StorageError::Type::NoError, j->error().type()); |
| 921 | 347 | 348 | ||
| 922 | 349 | EXPECT_TRUE(runtime_->connection().isConnected()); // Just for coverage. | ||
| 923 | 350 | |||
| 924 | 348 | auto accounts = j->accounts(); | 351 | auto accounts = j->accounts(); |
| 925 | 349 | 352 | ||
| 926 | 350 | // We don't check the contents of accounts here because we are using the real online accounts manager | 353 | // We don't check the contents of accounts here because we are using the real online accounts manager |
| 927 | @@ -635,6 +638,203 @@ | |||
| 928 | 635 | EXPECT_EQ("no_such_id", j->error().itemId()); | 638 | EXPECT_EQ("no_such_id", j->error().itemId()); |
| 929 | 636 | } | 639 | } |
| 930 | 637 | 640 | ||
| 931 | 641 | TEST_F(MetadataTest, basic) | ||
| 932 | 642 | { | ||
| 933 | 643 | set_provider(unique_ptr<provider::ProviderBase>(new MockProvider())); | ||
| 934 | 644 | |||
| 935 | 645 | { | ||
| 936 | 646 | Item i; | ||
| 937 | 647 | EXPECT_EQ(0, i.metadata().size()); | ||
| 938 | 648 | } | ||
| 939 | 649 | |||
| 940 | 650 | { | ||
| 941 | 651 | unique_ptr<ItemJob> j(acc_.get("root_id")); | ||
| 942 | 652 | |||
| 943 | 653 | QSignalSpy spy(j.get(), &ItemJob::statusChanged); | ||
| 944 | 654 | spy.wait(SIGNAL_WAIT_TIME); | ||
| 945 | 655 | |||
| 946 | 656 | EXPECT_EQ(0, j->item().sizeInBytes()); | ||
| 947 | 657 | EXPECT_EQ(0, j->item().metadata().size()); | ||
| 948 | 658 | } | ||
| 949 | 659 | |||
| 950 | 660 | { | ||
| 951 | 661 | unique_ptr<ItemJob> j(acc_.get("child_id")); | ||
| 952 | 662 | |||
| 953 | 663 | QSignalSpy spy(j.get(), &ItemJob::statusChanged); | ||
| 954 | 664 | spy.wait(SIGNAL_WAIT_TIME); | ||
| 955 | 665 | |||
| 956 | 666 | EXPECT_EQ(10, j->item().sizeInBytes()); | ||
| 957 | 667 | EXPECT_EQ(2, j->item().metadata().size()); | ||
| 958 | 668 | } | ||
| 959 | 669 | } | ||
| 960 | 670 | |||
| 961 | 671 | TEST_F(MetadataTest, no_parents) | ||
| 962 | 672 | { | ||
| 963 | 673 | set_provider(unique_ptr<provider::ProviderBase>(new MockProvider("no_parents"))); | ||
| 964 | 674 | |||
| 965 | 675 | unique_ptr<ItemJob> j(acc_.get("child_id")); | ||
| 966 | 676 | |||
| 967 | 677 | QSignalSpy spy(j.get(), &ItemJob::statusChanged); | ||
| 968 | 678 | spy.wait(SIGNAL_WAIT_TIME); | ||
| 969 | 679 | |||
| 970 | 680 | EXPECT_EQ(ItemJob::Status::Error, j->status()); | ||
| 971 | 681 | EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider: " | ||
| 972 | 682 | "file or folder must have at least one parent ID", j->error().errorString()); | ||
| 973 | 683 | } | ||
| 974 | 684 | |||
| 975 | 685 | TEST_F(MetadataTest, empty_parent) | ||
| 976 | 686 | { | ||
| 977 | 687 | set_provider(unique_ptr<provider::ProviderBase>(new MockProvider("empty_parent"))); | ||
| 978 | 688 | |||
| 979 | 689 | unique_ptr<ItemJob> j(acc_.get("child_id")); | ||
| 980 | 690 | |||
| 981 | 691 | QSignalSpy spy(j.get(), &ItemJob::statusChanged); | ||
| 982 | 692 | spy.wait(SIGNAL_WAIT_TIME); | ||
| 983 | 693 | |||
| 984 | 694 | EXPECT_EQ(ItemJob::Status::Error, j->status()); | ||
| 985 | 695 | EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider: " | ||
| 986 | 696 | "parent_id of file or folder cannot be empty", j->error().errorString()); | ||
| 987 | 697 | } | ||
| 988 | 698 | |||
| 989 | 699 | TEST_F(MetadataTest, root_with_parent) | ||
| 990 | 700 | { | ||
| 991 | 701 | set_provider(unique_ptr<provider::ProviderBase>(new MockProvider("root_with_parent"))); | ||
| 992 | 702 | |||
| 993 | 703 | unique_ptr<ItemJob> j(acc_.get("root_id")); | ||
| 994 | 704 | |||
| 995 | 705 | QSignalSpy spy(j.get(), &ItemJob::statusChanged); | ||
| 996 | 706 | spy.wait(SIGNAL_WAIT_TIME); | ||
| 997 | 707 | |||
| 998 | 708 | EXPECT_EQ(ItemJob::Status::Error, j->status()); | ||
| 999 | 709 | EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider: " | ||
| 1000 | 710 | "parent_ids of root must be empty", j->error().errorString()); | ||
| 1001 | 711 | } | ||
| 1002 | 712 | |||
| 1003 | 713 | TEST_F(MetadataTest, empty_name) | ||
| 1004 | 714 | { | ||
| 1005 | 715 | set_provider(unique_ptr<provider::ProviderBase>(new MockProvider("empty_name"))); | ||
| 1006 | 716 | |||
| 1007 | 717 | unique_ptr<ItemJob> j(acc_.get("child_id")); | ||
| 1008 | 718 | |||
| 1009 | 719 | QSignalSpy spy(j.get(), &ItemJob::statusChanged); | ||
| 1010 | 720 | spy.wait(SIGNAL_WAIT_TIME); | ||
| 1011 | 721 | |||
| 1012 | 722 | EXPECT_EQ(ItemJob::Status::Error, j->status()); | ||
| 1013 | 723 | EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider: " | ||
| 1014 | 724 | "name cannot be empty", j->error().errorString()); | ||
| 1015 | 725 | } | ||
| 1016 | 726 | |||
| 1017 | 727 | TEST_F(MetadataTest, empty_etag) | ||
| 1018 | 728 | { | ||
| 1019 | 729 | set_provider(unique_ptr<provider::ProviderBase>(new MockProvider("empty_etag"))); | ||
| 1020 | 730 | |||
| 1021 | 731 | unique_ptr<ItemJob> j(acc_.get("child_id")); | ||
| 1022 | 732 | |||
| 1023 | 733 | QSignalSpy spy(j.get(), &ItemJob::statusChanged); | ||
| 1024 | 734 | spy.wait(SIGNAL_WAIT_TIME); | ||
| 1025 | 735 | |||
| 1026 | 736 | EXPECT_EQ(ItemJob::Status::Error, j->status()); | ||
| 1027 | 737 | EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider: " | ||
| 1028 | 738 | "etag of a file cannot be empty", j->error().errorString()); | ||
| 1029 | 739 | } | ||
| 1030 | 740 | |||
| 1031 | 741 | TEST_F(MetadataTest, unknown_key) | ||
| 1032 | 742 | { | ||
| 1033 | 743 | set_provider(unique_ptr<provider::ProviderBase>(new MockProvider("unknown_key"))); | ||
| 1034 | 744 | |||
| 1035 | 745 | unique_ptr<ItemJob> j(acc_.get("child_id")); | ||
| 1036 | 746 | |||
| 1037 | 747 | QSignalSpy spy(j.get(), &ItemJob::statusChanged); | ||
| 1038 | 748 | spy.wait(SIGNAL_WAIT_TIME); | ||
| 1039 | 749 | |||
| 1040 | 750 | // We only emit a warning for unknown keys. | ||
| 1041 | 751 | EXPECT_EQ(ItemJob::Status::Finished, j->status()); | ||
| 1042 | 752 | } | ||
| 1043 | 753 | |||
| 1044 | 754 | TEST_F(MetadataTest, missing_size) | ||
| 1045 | 755 | { | ||
| 1046 | 756 | set_provider(unique_ptr<provider::ProviderBase>(new MockProvider("missing_key"))); | ||
| 1047 | 757 | |||
| 1048 | 758 | unique_ptr<ItemJob> j(acc_.get("child_id")); | ||
| 1049 | 759 | |||
| 1050 | 760 | QSignalSpy spy(j.get(), &ItemJob::statusChanged); | ||
| 1051 | 761 | spy.wait(SIGNAL_WAIT_TIME); | ||
| 1052 | 762 | |||
| 1053 | 763 | EXPECT_EQ(ItemJob::Status::Error, j->status()); | ||
| 1054 | 764 | EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider: " | ||
| 1055 | 765 | "missing key \"size_in_bytes\" in metadata for \"child_id\"", j->error().errorString()); | ||
| 1056 | 766 | } | ||
| 1057 | 767 | |||
| 1058 | 768 | TEST_F(MetadataTest, wrong_type_for_time) | ||
| 1059 | 769 | { | ||
| 1060 | 770 | set_provider(unique_ptr<provider::ProviderBase>(new MockProvider("wrong_type_for_time"))); | ||
| 1061 | 771 | |||
| 1062 | 772 | unique_ptr<ItemJob> j(acc_.get("child_id")); | ||
| 1063 | 773 | |||
| 1064 | 774 | QSignalSpy spy(j.get(), &ItemJob::statusChanged); | ||
| 1065 | 775 | spy.wait(SIGNAL_WAIT_TIME); | ||
| 1066 | 776 | |||
| 1067 | 777 | EXPECT_EQ(ItemJob::Status::Error, j->status()); | ||
| 1068 | 778 | EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider: last_modified_time: " | ||
| 1069 | 779 | "expected value of type QString, but received value of type qlonglong", j->error().errorString()); | ||
| 1070 | 780 | } | ||
| 1071 | 781 | |||
| 1072 | 782 | TEST_F(MetadataTest, bad_parse_for_time) | ||
| 1073 | 783 | { | ||
| 1074 | 784 | set_provider(unique_ptr<provider::ProviderBase>(new MockProvider("bad_parse_for_time"))); | ||
| 1075 | 785 | |||
| 1076 | 786 | unique_ptr<ItemJob> j(acc_.get("child_id")); | ||
| 1077 | 787 | |||
| 1078 | 788 | QSignalSpy spy(j.get(), &ItemJob::statusChanged); | ||
| 1079 | 789 | spy.wait(SIGNAL_WAIT_TIME); | ||
| 1080 | 790 | |||
| 1081 | 791 | EXPECT_EQ(ItemJob::Status::Error, j->status()); | ||
| 1082 | 792 | EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider: last_modified_time: " | ||
| 1083 | 793 | "value \"xyz\" does not parse as ISO-8601 date", j->error().errorString()); | ||
| 1084 | 794 | } | ||
| 1085 | 795 | |||
| 1086 | 796 | TEST_F(MetadataTest, missing_timezone) | ||
| 1087 | 797 | { | ||
| 1088 | 798 | set_provider(unique_ptr<provider::ProviderBase>(new MockProvider("missing_timezone"))); | ||
| 1089 | 799 | |||
| 1090 | 800 | unique_ptr<ItemJob> j(acc_.get("child_id")); | ||
| 1091 | 801 | |||
| 1092 | 802 | QSignalSpy spy(j.get(), &ItemJob::statusChanged); | ||
| 1093 | 803 | spy.wait(SIGNAL_WAIT_TIME); | ||
| 1094 | 804 | |||
| 1095 | 805 | EXPECT_EQ(ItemJob::Status::Error, j->status()); | ||
| 1096 | 806 | EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider: last_modified_time: " | ||
| 1097 | 807 | "value \"2007-04-05T14:30\" lacks a time zone specification", j->error().errorString()); | ||
| 1098 | 808 | } | ||
| 1099 | 809 | |||
| 1100 | 810 | TEST_F(MetadataTest, wrong_type_for_size) | ||
| 1101 | 811 | { | ||
| 1102 | 812 | set_provider(unique_ptr<provider::ProviderBase>(new MockProvider("wrong_type_for_size"))); | ||
| 1103 | 813 | |||
| 1104 | 814 | unique_ptr<ItemJob> j(acc_.get("child_id")); | ||
| 1105 | 815 | |||
| 1106 | 816 | QSignalSpy spy(j.get(), &ItemJob::statusChanged); | ||
| 1107 | 817 | spy.wait(SIGNAL_WAIT_TIME); | ||
| 1108 | 818 | |||
| 1109 | 819 | EXPECT_EQ(ItemJob::Status::Error, j->status()); | ||
| 1110 | 820 | EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider: size_in_bytes: " | ||
| 1111 | 821 | "expected value of type qlonglong, but received value of type QString", j->error().errorString()); | ||
| 1112 | 822 | } | ||
| 1113 | 823 | |||
| 1114 | 824 | TEST_F(MetadataTest, negative_size) | ||
| 1115 | 825 | { | ||
| 1116 | 826 | set_provider(unique_ptr<provider::ProviderBase>(new MockProvider("negative_size"))); | ||
| 1117 | 827 | |||
| 1118 | 828 | unique_ptr<ItemJob> j(acc_.get("child_id")); | ||
| 1119 | 829 | |||
| 1120 | 830 | QSignalSpy spy(j.get(), &ItemJob::statusChanged); | ||
| 1121 | 831 | spy.wait(SIGNAL_WAIT_TIME); | ||
| 1122 | 832 | |||
| 1123 | 833 | EXPECT_EQ(ItemJob::Status::Error, j->status()); | ||
| 1124 | 834 | EXPECT_EQ("LocalCommsError: Account::get(): received invalid metadata from provider: size_in_bytes: " | ||
| 1125 | 835 | "expected value >= 0, but received -1", j->error().errorString()); | ||
| 1126 | 836 | } | ||
| 1127 | 837 | |||
| 1128 | 638 | TEST_F(DeleteTest, basic) | 838 | TEST_F(DeleteTest, basic) |
| 1129 | 639 | { | 839 | { |
| 1130 | 640 | set_provider(unique_ptr<provider::ProviderBase>(new MockProvider)); | 840 | set_provider(unique_ptr<provider::ProviderBase>(new MockProvider)); |
| 1131 | @@ -817,6 +1017,8 @@ | |||
| 1132 | 817 | EXPECT_EQ("", i.name()); | 1017 | EXPECT_EQ("", i.name()); |
| 1133 | 818 | EXPECT_EQ("", i.etag()); | 1018 | EXPECT_EQ("", i.etag()); |
| 1134 | 819 | EXPECT_EQ(Item::Type::File, i.type()); | 1019 | EXPECT_EQ(Item::Type::File, i.type()); |
| 1135 | 1020 | EXPECT_EQ(0, i.metadata().size()); | ||
| 1136 | 1021 | EXPECT_EQ(0, i.sizeInBytes()); | ||
| 1137 | 820 | auto mtime = i.lastModifiedTime(); | 1022 | auto mtime = i.lastModifiedTime(); |
| 1138 | 821 | EXPECT_FALSE(mtime.isValid()); | 1023 | EXPECT_FALSE(mtime.isValid()); |
| 1139 | 822 | auto pids = i.parentIds(); | 1024 | auto pids = i.parentIds(); |
| 1140 | @@ -834,6 +1036,7 @@ | |||
| 1141 | 834 | EXPECT_TRUE(i.isValid()); | 1036 | EXPECT_TRUE(i.isValid()); |
| 1142 | 835 | EXPECT_EQ("child_id", i.itemId()); | 1037 | EXPECT_EQ("child_id", i.itemId()); |
| 1143 | 836 | EXPECT_EQ("Child", i.name()); | 1038 | EXPECT_EQ("Child", i.name()); |
| 1144 | 1039 | EXPECT_EQ(10, i.sizeInBytes()); | ||
| 1145 | 837 | EXPECT_TRUE(i.account().isValid()); | 1040 | EXPECT_TRUE(i.account().isValid()); |
| 1146 | 838 | EXPECT_EQ("etag", i.etag()); | 1041 | EXPECT_EQ("etag", i.etag()); |
| 1147 | 839 | EXPECT_EQ(Item::Type::File, i.type()); | 1042 | EXPECT_EQ(Item::Type::File, i.type()); |
PASSED: Continuous integration, rev:85
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/