Merge lp:~jamesh/storage-framework/provider-testing-api into lp:storage-framework/devel
- provider-testing-api
- Merge into devel
Proposed by
James Henstridge
| Status: | Merged |
|---|---|
| Approved by: | Michi Henning |
| Approved revision: | 50 |
| Merged at revision: | 49 |
| Proposed branch: | lp:~jamesh/storage-framework/provider-testing-api |
| Merge into: | lp:storage-framework/devel |
| Diff against target: |
814 lines (+467/-128) 17 files modified
include/unity/storage/internal/dbusmarshal.h (+44/-0) include/unity/storage/provider/CMakeLists.txt (+2/-0) include/unity/storage/provider/internal/TestServerImpl.h (+64/-0) include/unity/storage/provider/testing/CMakeLists.txt (+5/-0) include/unity/storage/provider/testing/TestServer.h (+68/-0) include/unity/storage/qt/client/internal/remote_client/dbusmarshal.h (+1/-20) src/internal/CMakeLists.txt (+4/-0) src/internal/dbusmarshal.cpp (+113/-0) src/provider/CMakeLists.txt (+2/-0) src/provider/internal/TestServerImpl.cpp (+82/-0) src/provider/testing/TestServer.cpp (+61/-0) src/qt/client/CMakeLists.txt (+2/-1) src/qt/client/internal/remote_client/RuntimeImpl.cpp (+2/-1) src/qt/client/internal/remote_client/dbusmarshal.cpp (+0/-83) tests/provider-ProviderInterface/CMakeLists.txt (+3/-5) tests/provider-ProviderInterface/ProviderInterface_test.cpp (+8/-17) tests/provider-ProviderInterface/TestProvider.h (+6/-1) |
| To merge this branch: | bzr merge lp:~jamesh/storage-framework/provider-testing-api |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| unity-api-1-bot | continuous-integration | Approve | |
| Michi Henning (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Add unity::
Description of the change
Add a unity::
It takes a ProviderBase instance, OnlineAccounts:
Using this code let me remove the use of internal symbols in the ProviderInterface test.
While the rest of storage-
I had thought about moving creation of the second QDBusConnection inside TestServer (so we'd take the session bus address as an argument instead), but we've still got the OnlineAccounts instance to deal with. Since this is in the testing namespace, perhaps that is okay.
To post a comment you must log in.
Revision history for this message
| unity-api-1-bot (unity-api-1-bot) wrote : | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| unity-api-1-bot (unity-api-1-bot) wrote : | # |
FAILED: Continuous integration, rev:48
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
- 49. By James Henstridge
-
Merge from devel, fixing conflict.
- 50. By James Henstridge
-
Move QDBusArgument marshalling code for ItemMetadata to
storage-framework- common- internal library: while local-client doesn't
explicitly need it, it was already linking to QtDBus, so it doesn't
really matter.
Revision history for this message
| Michi Henning (michihenning) wrote : | # |
Looks good, thank you!
review:
Approve
Revision history for this message
| unity-api-1-bot (unity-api-1-bot) wrote : | # |
PASSED: Continuous integration, rev:50
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
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:/
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === added file 'include/unity/storage/internal/dbusmarshal.h' | |||
| 2 | --- include/unity/storage/internal/dbusmarshal.h 1970-01-01 00:00:00 +0000 | |||
| 3 | +++ include/unity/storage/internal/dbusmarshal.h 2016-08-11 06:54:57 +0000 | |||
| 4 | @@ -0,0 +1,44 @@ | |||
| 5 | 1 | /* | ||
| 6 | 2 | * Copyright (C) 2016 Canonical Ltd | ||
| 7 | 3 | * | ||
| 8 | 4 | * This program is free software: you can redistribute it and/or modify | ||
| 9 | 5 | * it under the terms of the GNU Lesser General Public License version 3 as | ||
| 10 | 6 | * published by the Free Software Foundation. | ||
| 11 | 7 | * | ||
| 12 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 13 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 15 | 11 | * GNU Lesser General Public License for more details. | ||
| 16 | 12 | * | ||
| 17 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 18 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 19 | 15 | * | ||
| 20 | 16 | * Authors: Michi Henning <michi.henning@canonical.com> | ||
| 21 | 17 | */ | ||
| 22 | 18 | |||
| 23 | 19 | #pragma once | ||
| 24 | 20 | |||
| 25 | 21 | #include <unity/storage/internal/ItemMetadata.h> | ||
| 26 | 22 | |||
| 27 | 23 | #include <QDBusArgument> | ||
| 28 | 24 | #include <QMetaType> | ||
| 29 | 25 | |||
| 30 | 26 | namespace unity | ||
| 31 | 27 | { | ||
| 32 | 28 | namespace storage | ||
| 33 | 29 | { | ||
| 34 | 30 | namespace internal | ||
| 35 | 31 | { | ||
| 36 | 32 | |||
| 37 | 33 | QDBusArgument& operator<<(QDBusArgument& argument, ItemMetadata const& metadata); | ||
| 38 | 34 | QDBusArgument const& operator>>(QDBusArgument const& argument, ItemMetadata& metadata); | ||
| 39 | 35 | |||
| 40 | 36 | QDBusArgument& operator<<(QDBusArgument& argument, QList<ItemMetadata> const& md_list); | ||
| 41 | 37 | QDBusArgument const& operator>>(QDBusArgument const& argument, QList<ItemMetadata>& md_list); | ||
| 42 | 38 | |||
| 43 | 39 | } // namespace internal | ||
| 44 | 40 | } // storage | ||
| 45 | 41 | } // unity | ||
| 46 | 42 | |||
| 47 | 43 | Q_DECLARE_METATYPE(unity::storage::internal::ItemMetadata) | ||
| 48 | 44 | Q_DECLARE_METATYPE(QList<unity::storage::internal::ItemMetadata>) | ||
| 49 | 0 | 45 | ||
| 50 | === modified file 'include/unity/storage/provider/CMakeLists.txt' | |||
| 51 | --- include/unity/storage/provider/CMakeLists.txt 2016-07-11 03:28:40 +0000 | |||
| 52 | +++ include/unity/storage/provider/CMakeLists.txt 2016-08-11 06:54:57 +0000 | |||
| 53 | @@ -3,3 +3,5 @@ | |||
| 54 | 3 | 3 | ||
| 55 | 4 | install(FILES ${provider_headers} | 4 | install(FILES ${provider_headers} |
| 56 | 5 | DESTINATION ${provider_base_includedir}/${includeprefix}) | 5 | DESTINATION ${provider_base_includedir}/${includeprefix}) |
| 57 | 6 | |||
| 58 | 7 | add_subdirectory(testing) | ||
| 59 | 6 | 8 | ||
| 60 | === added file 'include/unity/storage/provider/internal/TestServerImpl.h' | |||
| 61 | --- include/unity/storage/provider/internal/TestServerImpl.h 1970-01-01 00:00:00 +0000 | |||
| 62 | +++ include/unity/storage/provider/internal/TestServerImpl.h 2016-08-11 06:54:57 +0000 | |||
| 63 | @@ -0,0 +1,64 @@ | |||
| 64 | 1 | /* | ||
| 65 | 2 | * Copyright (C) 2016 Canonical Ltd | ||
| 66 | 3 | * | ||
| 67 | 4 | * This program is free software: you can redistribute it and/or modify | ||
| 68 | 5 | * it under the terms of the GNU Lesser General Public License version 3 as | ||
| 69 | 6 | * published by the Free Software Foundation. | ||
| 70 | 7 | * | ||
| 71 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 72 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 73 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 74 | 11 | * GNU Lesser General Public License for more details. | ||
| 75 | 12 | * | ||
| 76 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 77 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 78 | 15 | * | ||
| 79 | 16 | * Authors: James Henstridge <james.henstridge@canonical.com> | ||
| 80 | 17 | */ | ||
| 81 | 18 | |||
| 82 | 19 | #pragma once | ||
| 83 | 20 | |||
| 84 | 21 | #include <unity/storage/provider/testing/TestServer.h> | ||
| 85 | 22 | |||
| 86 | 23 | #pragma GCC diagnostic push | ||
| 87 | 24 | #pragma GCC diagnostic ignored "-Wctor-dtor-privacy" | ||
| 88 | 25 | #include <QDBusConnection> | ||
| 89 | 26 | #pragma GCC diagnostic pop | ||
| 90 | 27 | |||
| 91 | 28 | #include <memory> | ||
| 92 | 29 | #include <string> | ||
| 93 | 30 | |||
| 94 | 31 | namespace unity | ||
| 95 | 32 | { | ||
| 96 | 33 | namespace storage | ||
| 97 | 34 | { | ||
| 98 | 35 | namespace provider | ||
| 99 | 36 | { | ||
| 100 | 37 | namespace internal | ||
| 101 | 38 | { | ||
| 102 | 39 | |||
| 103 | 40 | class ProviderInterface; | ||
| 104 | 41 | |||
| 105 | 42 | class TestServerImpl | ||
| 106 | 43 | { | ||
| 107 | 44 | public: | ||
| 108 | 45 | TestServerImpl(std::unique_ptr<ProviderBase>&& provider, | ||
| 109 | 46 | OnlineAccounts::Account* account, | ||
| 110 | 47 | QDBusConnection const& connection, | ||
| 111 | 48 | std::string const& object_path); | ||
| 112 | 49 | ~TestServerImpl(); | ||
| 113 | 50 | |||
| 114 | 51 | QDBusConnection const& connection() const; | ||
| 115 | 52 | std::string const& object_path() const; | ||
| 116 | 53 | |||
| 117 | 54 | private: | ||
| 118 | 55 | QDBusConnection connection_; | ||
| 119 | 56 | std::string const object_path_; | ||
| 120 | 57 | |||
| 121 | 58 | std::unique_ptr<ProviderInterface> interface_; | ||
| 122 | 59 | }; | ||
| 123 | 60 | |||
| 124 | 61 | } | ||
| 125 | 62 | } | ||
| 126 | 63 | } | ||
| 127 | 64 | } | ||
| 128 | 0 | 65 | ||
| 129 | === added directory 'include/unity/storage/provider/testing' | |||
| 130 | === added file 'include/unity/storage/provider/testing/CMakeLists.txt' | |||
| 131 | --- include/unity/storage/provider/testing/CMakeLists.txt 1970-01-01 00:00:00 +0000 | |||
| 132 | +++ include/unity/storage/provider/testing/CMakeLists.txt 2016-08-11 06:54:57 +0000 | |||
| 133 | @@ -0,0 +1,5 @@ | |||
| 134 | 1 | set(includeprefix unity/storage/provider/testing) | ||
| 135 | 2 | file(GLOB provider_headers *.h) | ||
| 136 | 3 | |||
| 137 | 4 | install(FILES ${provider_headers} | ||
| 138 | 5 | DESTINATION ${provider_base_includedir}/${includeprefix}) | ||
| 139 | 0 | 6 | ||
| 140 | === added file 'include/unity/storage/provider/testing/TestServer.h' | |||
| 141 | --- include/unity/storage/provider/testing/TestServer.h 1970-01-01 00:00:00 +0000 | |||
| 142 | +++ include/unity/storage/provider/testing/TestServer.h 2016-08-11 06:54:57 +0000 | |||
| 143 | @@ -0,0 +1,68 @@ | |||
| 144 | 1 | /* | ||
| 145 | 2 | * Copyright (C) 2016 Canonical Ltd | ||
| 146 | 3 | * | ||
| 147 | 4 | * This program is free software: you can redistribute it and/or modify | ||
| 148 | 5 | * it under the terms of the GNU Lesser General Public License version 3 as | ||
| 149 | 6 | * published by the Free Software Foundation. | ||
| 150 | 7 | * | ||
| 151 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 152 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 153 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 154 | 11 | * GNU Lesser General Public License for more details. | ||
| 155 | 12 | * | ||
| 156 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 157 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 158 | 15 | * | ||
| 159 | 16 | * Authors: James Henstridge <james.henstridge@canonical.com> | ||
| 160 | 17 | */ | ||
| 161 | 18 | |||
| 162 | 19 | #pragma once | ||
| 163 | 20 | |||
| 164 | 21 | #include <unity/storage/visibility.h> | ||
| 165 | 22 | |||
| 166 | 23 | #include <memory> | ||
| 167 | 24 | #include <string> | ||
| 168 | 25 | |||
| 169 | 26 | namespace OnlineAccounts | ||
| 170 | 27 | { | ||
| 171 | 28 | class Account; | ||
| 172 | 29 | } | ||
| 173 | 30 | class QDBusConnection; | ||
| 174 | 31 | |||
| 175 | 32 | namespace unity | ||
| 176 | 33 | { | ||
| 177 | 34 | namespace storage | ||
| 178 | 35 | { | ||
| 179 | 36 | namespace provider | ||
| 180 | 37 | { | ||
| 181 | 38 | |||
| 182 | 39 | class ProviderBase; | ||
| 183 | 40 | |||
| 184 | 41 | namespace internal | ||
| 185 | 42 | { | ||
| 186 | 43 | class TestServerImpl; | ||
| 187 | 44 | } | ||
| 188 | 45 | |||
| 189 | 46 | namespace testing | ||
| 190 | 47 | { | ||
| 191 | 48 | |||
| 192 | 49 | class UNITY_STORAGE_EXPORT TestServer | ||
| 193 | 50 | { | ||
| 194 | 51 | public: | ||
| 195 | 52 | TestServer(std::unique_ptr<ProviderBase>&& provider, | ||
| 196 | 53 | OnlineAccounts::Account* account, | ||
| 197 | 54 | QDBusConnection const& connection, | ||
| 198 | 55 | std::string const& object_path); | ||
| 199 | 56 | ~TestServer(); | ||
| 200 | 57 | |||
| 201 | 58 | QDBusConnection const& connection() const; | ||
| 202 | 59 | std::string const& object_path() const; | ||
| 203 | 60 | |||
| 204 | 61 | private: | ||
| 205 | 62 | std::unique_ptr<internal::TestServerImpl> p_; | ||
| 206 | 63 | }; | ||
| 207 | 64 | |||
| 208 | 65 | } | ||
| 209 | 66 | } | ||
| 210 | 67 | } | ||
| 211 | 68 | } | ||
| 212 | 0 | 69 | ||
| 213 | === modified file 'include/unity/storage/qt/client/internal/remote_client/dbusmarshal.h' | |||
| 214 | --- include/unity/storage/qt/client/internal/remote_client/dbusmarshal.h 2016-08-05 05:37:23 +0000 | |||
| 215 | +++ include/unity/storage/qt/client/internal/remote_client/dbusmarshal.h 2016-08-11 06:54:57 +0000 | |||
| 216 | @@ -18,11 +18,7 @@ | |||
| 217 | 18 | 18 | ||
| 218 | 19 | #pragma once | 19 | #pragma once |
| 219 | 20 | 20 | ||
| 225 | 21 | #include <unity/storage/internal/ItemMetadata.h> | 21 | #include <exception> |
| 221 | 22 | |||
| 222 | 23 | #include <QDBusArgument> | ||
| 223 | 24 | #include <QMetaType> | ||
| 224 | 25 | #include <QVariant> | ||
| 226 | 26 | 22 | ||
| 227 | 27 | class QDBusPendingCallWatcher; | 23 | class QDBusPendingCallWatcher; |
| 228 | 28 | 24 | ||
| 229 | @@ -30,18 +26,6 @@ | |||
| 230 | 30 | { | 26 | { |
| 231 | 31 | namespace storage | 27 | namespace storage |
| 232 | 32 | { | 28 | { |
| 233 | 33 | namespace internal | ||
| 234 | 34 | { | ||
| 235 | 35 | |||
| 236 | 36 | struct ItemMetadata; | ||
| 237 | 37 | QDBusArgument& operator<<(QDBusArgument& argument, storage::internal::ItemMetadata const& metadata); | ||
| 238 | 38 | QDBusArgument const& operator>>(QDBusArgument const& argument, storage::internal::ItemMetadata& metadata); | ||
| 239 | 39 | |||
| 240 | 40 | QDBusArgument& operator<<(QDBusArgument& argument, QList<storage::internal::ItemMetadata> const& md_list); | ||
| 241 | 41 | QDBusArgument const& operator>>(QDBusArgument const& argument, QList<storage::internal::ItemMetadata>& md_list); | ||
| 242 | 42 | |||
| 243 | 43 | } // namespace internal | ||
| 244 | 44 | |||
| 245 | 45 | namespace qt | 29 | namespace qt |
| 246 | 46 | { | 30 | { |
| 247 | 47 | namespace client | 31 | namespace client |
| 248 | @@ -59,6 +43,3 @@ | |||
| 249 | 59 | } // qt | 43 | } // qt |
| 250 | 60 | } // storage | 44 | } // storage |
| 251 | 61 | } // unity | 45 | } // unity |
| 252 | 62 | |||
| 253 | 63 | Q_DECLARE_METATYPE(unity::storage::internal::ItemMetadata) | ||
| 254 | 64 | Q_DECLARE_METATYPE(QList<unity::storage::internal::ItemMetadata>) | ||
| 255 | 65 | 46 | ||
| 256 | === modified file 'src/internal/CMakeLists.txt' | |||
| 257 | --- src/internal/CMakeLists.txt 2016-07-06 00:59:42 +0000 | |||
| 258 | +++ src/internal/CMakeLists.txt 2016-08-11 06:54:57 +0000 | |||
| 259 | @@ -1,5 +1,9 @@ | |||
| 260 | 1 | set(src | 1 | set(src |
| 261 | 2 | dbusmarshal.cpp | ||
| 262 | 2 | safe_strerror.cpp | 3 | safe_strerror.cpp |
| 263 | 3 | ) | 4 | ) |
| 264 | 4 | 5 | ||
| 265 | 5 | add_library(storage-framework-common-internal STATIC ${src}) | 6 | add_library(storage-framework-common-internal STATIC ${src}) |
| 266 | 7 | target_link_libraries(storage-framework-common-internal | ||
| 267 | 8 | Qt5::DBus | ||
| 268 | 9 | ) | ||
| 269 | 6 | 10 | ||
| 270 | === added file 'src/internal/dbusmarshal.cpp' | |||
| 271 | --- src/internal/dbusmarshal.cpp 1970-01-01 00:00:00 +0000 | |||
| 272 | +++ src/internal/dbusmarshal.cpp 2016-08-11 06:54:57 +0000 | |||
| 273 | @@ -0,0 +1,113 @@ | |||
| 274 | 1 | /* | ||
| 275 | 2 | * Copyright (C) 2016 Canonical Ltd | ||
| 276 | 3 | * | ||
| 277 | 4 | * This program is free software: you can redistribute it and/or modify | ||
| 278 | 5 | * it under the terms of the GNU Lesser General Public License version 3 as | ||
| 279 | 6 | * published by the Free Software Foundation. | ||
| 280 | 7 | * | ||
| 281 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 282 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 283 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 284 | 11 | * GNU Lesser General Public License for more details. | ||
| 285 | 12 | * | ||
| 286 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 287 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 288 | 15 | * | ||
| 289 | 16 | * Authors: Michi Henning <michi.henning@canonical.com> | ||
| 290 | 17 | */ | ||
| 291 | 18 | |||
| 292 | 19 | #include <unity/storage/internal/dbusmarshal.h> | ||
| 293 | 20 | |||
| 294 | 21 | #include <QDebug> | ||
| 295 | 22 | |||
| 296 | 23 | using namespace unity::storage::internal; | ||
| 297 | 24 | using namespace std; | ||
| 298 | 25 | |||
| 299 | 26 | namespace unity | ||
| 300 | 27 | { | ||
| 301 | 28 | namespace storage | ||
| 302 | 29 | { | ||
| 303 | 30 | namespace internal | ||
| 304 | 31 | { | ||
| 305 | 32 | |||
| 306 | 33 | QDBusArgument& operator<<(QDBusArgument& argument, storage::internal::ItemMetadata const& metadata) | ||
| 307 | 34 | { | ||
| 308 | 35 | argument.beginStructure(); | ||
| 309 | 36 | argument << metadata.item_id; | ||
| 310 | 37 | argument << metadata.parent_id; | ||
| 311 | 38 | argument << metadata.name; | ||
| 312 | 39 | argument << metadata.etag; | ||
| 313 | 40 | argument << static_cast<int32_t>(metadata.type); | ||
| 314 | 41 | argument.beginMap(QVariant::String, qMetaTypeId<QDBusVariant>()); | ||
| 315 | 42 | decltype(ItemMetadata::metadata)::const_iterator i = metadata.metadata.constBegin(); | ||
| 316 | 43 | while (i != metadata.metadata.constEnd()) | ||
| 317 | 44 | { | ||
| 318 | 45 | argument.beginMapEntry(); | ||
| 319 | 46 | argument << i.key() << QDBusVariant(i.value()); | ||
| 320 | 47 | argument.endMapEntry(); | ||
| 321 | 48 | ++i; | ||
| 322 | 49 | } | ||
| 323 | 50 | argument.endMap(); | ||
| 324 | 51 | argument.endStructure(); | ||
| 325 | 52 | return argument; | ||
| 326 | 53 | } | ||
| 327 | 54 | |||
| 328 | 55 | QDBusArgument const& operator>>(QDBusArgument const& argument, storage::internal::ItemMetadata& metadata) | ||
| 329 | 56 | { | ||
| 330 | 57 | argument.beginStructure(); | ||
| 331 | 58 | argument >> metadata.item_id; | ||
| 332 | 59 | argument >> metadata.parent_id; | ||
| 333 | 60 | argument >> metadata.name; | ||
| 334 | 61 | argument >> metadata.etag; | ||
| 335 | 62 | int32_t enum_val; | ||
| 336 | 63 | argument >> enum_val; | ||
| 337 | 64 | if (enum_val < 0 || enum_val >= int(ItemType::LAST_ENTRY__)) | ||
| 338 | 65 | { | ||
| 339 | 66 | qCritical() << "unmarshaling error: impossible ItemType value: " + QString::number(enum_val); | ||
| 340 | 67 | return argument; // Forces error | ||
| 341 | 68 | } | ||
| 342 | 69 | metadata.type = static_cast<ItemType>(enum_val); | ||
| 343 | 70 | metadata.metadata.clear(); | ||
| 344 | 71 | argument.beginMap(); | ||
| 345 | 72 | while (!argument.atEnd()) | ||
| 346 | 73 | { | ||
| 347 | 74 | QString key; | ||
| 348 | 75 | QVariant value; | ||
| 349 | 76 | argument.beginMapEntry(); | ||
| 350 | 77 | argument >> key >> value; | ||
| 351 | 78 | argument.endMapEntry(); | ||
| 352 | 79 | metadata.metadata.insert(key, value); | ||
| 353 | 80 | } | ||
| 354 | 81 | argument.endMap(); | ||
| 355 | 82 | argument.endStructure(); | ||
| 356 | 83 | return argument; | ||
| 357 | 84 | } | ||
| 358 | 85 | |||
| 359 | 86 | QDBusArgument& operator<<(QDBusArgument& argument, QList<storage::internal::ItemMetadata> const& md_list) | ||
| 360 | 87 | { | ||
| 361 | 88 | argument.beginArray(qMetaTypeId<storage::internal::ItemMetadata>()); | ||
| 362 | 89 | for (auto const& md : md_list) | ||
| 363 | 90 | { | ||
| 364 | 91 | argument << md; | ||
| 365 | 92 | } | ||
| 366 | 93 | argument.endArray(); | ||
| 367 | 94 | return argument; | ||
| 368 | 95 | } | ||
| 369 | 96 | |||
| 370 | 97 | QDBusArgument const& operator>>(QDBusArgument const& argument, QList<storage::internal::ItemMetadata>& md_list) | ||
| 371 | 98 | { | ||
| 372 | 99 | md_list.clear(); | ||
| 373 | 100 | argument.beginArray(); | ||
| 374 | 101 | while (!argument.atEnd()) | ||
| 375 | 102 | { | ||
| 376 | 103 | ItemMetadata imd; | ||
| 377 | 104 | argument >> imd; | ||
| 378 | 105 | md_list.append(imd); | ||
| 379 | 106 | } | ||
| 380 | 107 | argument.endArray(); | ||
| 381 | 108 | return argument; | ||
| 382 | 109 | } | ||
| 383 | 110 | |||
| 384 | 111 | } // namespace internal | ||
| 385 | 112 | } // namespace storage | ||
| 386 | 113 | } // namespace unity | ||
| 387 | 0 | 114 | ||
| 388 | === modified file 'src/provider/CMakeLists.txt' | |||
| 389 | --- src/provider/CMakeLists.txt 2016-08-11 03:49:32 +0000 | |||
| 390 | +++ src/provider/CMakeLists.txt 2016-08-11 06:54:57 +0000 | |||
| 391 | @@ -19,6 +19,7 @@ | |||
| 392 | 19 | Server.cpp | 19 | Server.cpp |
| 393 | 20 | TempfileUploadJob.cpp | 20 | TempfileUploadJob.cpp |
| 394 | 21 | UploadJob.cpp | 21 | UploadJob.cpp |
| 395 | 22 | testing/TestServer.cpp | ||
| 396 | 22 | internal/AccountData.cpp | 23 | internal/AccountData.cpp |
| 397 | 23 | internal/DBusPeerCache.cpp | 24 | internal/DBusPeerCache.cpp |
| 398 | 24 | internal/DownloadJobImpl.cpp | 25 | internal/DownloadJobImpl.cpp |
| 399 | @@ -28,6 +29,7 @@ | |||
| 400 | 28 | internal/ProviderInterface.cpp | 29 | internal/ProviderInterface.cpp |
| 401 | 29 | internal/ServerImpl.cpp | 30 | internal/ServerImpl.cpp |
| 402 | 30 | internal/TempfileUploadJobImpl.cpp | 31 | internal/TempfileUploadJobImpl.cpp |
| 403 | 32 | internal/TestServerImpl.cpp | ||
| 404 | 31 | internal/UploadJobImpl.cpp | 33 | internal/UploadJobImpl.cpp |
| 405 | 32 | internal/dbusmarshal.cpp | 34 | internal/dbusmarshal.cpp |
| 406 | 33 | ${CMAKE_SOURCE_DIR}/include/unity/storage/provider/internal/AccountData.h | 35 | ${CMAKE_SOURCE_DIR}/include/unity/storage/provider/internal/AccountData.h |
| 407 | 34 | 36 | ||
| 408 | === added file 'src/provider/internal/TestServerImpl.cpp' | |||
| 409 | --- src/provider/internal/TestServerImpl.cpp 1970-01-01 00:00:00 +0000 | |||
| 410 | +++ src/provider/internal/TestServerImpl.cpp 2016-08-11 06:54:57 +0000 | |||
| 411 | @@ -0,0 +1,82 @@ | |||
| 412 | 1 | /* | ||
| 413 | 2 | * Copyright (C) 2016 Canonical Ltd | ||
| 414 | 3 | * | ||
| 415 | 4 | * This program is free software: you can redistribute it and/or modify | ||
| 416 | 5 | * it under the terms of the GNU Lesser General Public License version 3 as | ||
| 417 | 6 | * published by the Free Software Foundation. | ||
| 418 | 7 | * | ||
| 419 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 420 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 421 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 422 | 11 | * GNU Lesser General Public License for more details. | ||
| 423 | 12 | * | ||
| 424 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 425 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 426 | 15 | * | ||
| 427 | 16 | * Authors: James Henstridge <james.henstridge@canonical.com> | ||
| 428 | 17 | */ | ||
| 429 | 18 | |||
| 430 | 19 | #include <unity/storage/provider/internal/TestServerImpl.h> | ||
| 431 | 20 | #include <unity/storage/provider/ProviderBase.h> | ||
| 432 | 21 | #include <unity/storage/provider/internal/AccountData.h> | ||
| 433 | 22 | #include <unity/storage/provider/internal/DBusPeerCache.h> | ||
| 434 | 23 | #include <unity/storage/provider/internal/ProviderInterface.h> | ||
| 435 | 24 | #include <unity/storage/provider/internal/dbusmarshal.h> | ||
| 436 | 25 | #include "provideradaptor.h" | ||
| 437 | 26 | |||
| 438 | 27 | #include <OnlineAccounts/Account> | ||
| 439 | 28 | |||
| 440 | 29 | #include <stdexcept> | ||
| 441 | 30 | |||
| 442 | 31 | using namespace std; | ||
| 443 | 32 | |||
| 444 | 33 | namespace unity | ||
| 445 | 34 | { | ||
| 446 | 35 | namespace storage | ||
| 447 | 36 | { | ||
| 448 | 37 | namespace provider | ||
| 449 | 38 | { | ||
| 450 | 39 | namespace internal | ||
| 451 | 40 | { | ||
| 452 | 41 | |||
| 453 | 42 | TestServerImpl::TestServerImpl(unique_ptr<ProviderBase>&& provider, | ||
| 454 | 43 | OnlineAccounts::Account* account, | ||
| 455 | 44 | QDBusConnection const& connection, | ||
| 456 | 45 | string const& object_path) | ||
| 457 | 46 | : connection_(connection), object_path_(object_path) | ||
| 458 | 47 | { | ||
| 459 | 48 | qDBusRegisterMetaType<Item>(); | ||
| 460 | 49 | qDBusRegisterMetaType<std::vector<Item>>(); | ||
| 461 | 50 | |||
| 462 | 51 | auto peer_cache = make_shared<DBusPeerCache>(connection_); | ||
| 463 | 52 | auto account_data = make_shared<AccountData>( | ||
| 464 | 53 | move(provider), peer_cache, connection_, account); | ||
| 465 | 54 | interface_.reset(new ProviderInterface(account_data)); | ||
| 466 | 55 | new ProviderAdaptor(interface_.get()); | ||
| 467 | 56 | |||
| 468 | 57 | if (!connection_.registerObject(QString::fromStdString(object_path_), | ||
| 469 | 58 | interface_.get())) | ||
| 470 | 59 | { | ||
| 471 | 60 | throw runtime_error("Could not register provider on connection"); | ||
| 472 | 61 | } | ||
| 473 | 62 | } | ||
| 474 | 63 | |||
| 475 | 64 | TestServerImpl::~TestServerImpl() | ||
| 476 | 65 | { | ||
| 477 | 66 | connection_.unregisterObject(QString::fromStdString(object_path_)); | ||
| 478 | 67 | } | ||
| 479 | 68 | |||
| 480 | 69 | QDBusConnection const& TestServerImpl::connection() const | ||
| 481 | 70 | { | ||
| 482 | 71 | return connection_; | ||
| 483 | 72 | } | ||
| 484 | 73 | |||
| 485 | 74 | string const& TestServerImpl::object_path() const | ||
| 486 | 75 | { | ||
| 487 | 76 | return object_path_; | ||
| 488 | 77 | } | ||
| 489 | 78 | |||
| 490 | 79 | } | ||
| 491 | 80 | } | ||
| 492 | 81 | } | ||
| 493 | 82 | } | ||
| 494 | 0 | 83 | ||
| 495 | === added directory 'src/provider/testing' | |||
| 496 | === added file 'src/provider/testing/TestServer.cpp' | |||
| 497 | --- src/provider/testing/TestServer.cpp 1970-01-01 00:00:00 +0000 | |||
| 498 | +++ src/provider/testing/TestServer.cpp 2016-08-11 06:54:57 +0000 | |||
| 499 | @@ -0,0 +1,61 @@ | |||
| 500 | 1 | /* | ||
| 501 | 2 | * Copyright (C) 2016 Canonical Ltd | ||
| 502 | 3 | * | ||
| 503 | 4 | * This program is free software: you can redistribute it and/or modify | ||
| 504 | 5 | * it under the terms of the GNU Lesser General Public License version 3 as | ||
| 505 | 6 | * published by the Free Software Foundation. | ||
| 506 | 7 | * | ||
| 507 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 508 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 509 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 510 | 11 | * GNU Lesser General Public License for more details. | ||
| 511 | 12 | * | ||
| 512 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
| 513 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 514 | 15 | * | ||
| 515 | 16 | * Authors: James Henstridge <james.henstridge@canonical.com> | ||
| 516 | 17 | */ | ||
| 517 | 18 | |||
| 518 | 19 | #include <unity/storage/provider/testing/TestServer.h> | ||
| 519 | 20 | #include <unity/storage/provider/internal/TestServerImpl.h> | ||
| 520 | 21 | #include <unity/storage/provider/ProviderBase.h> | ||
| 521 | 22 | |||
| 522 | 23 | #include <OnlineAccounts/Account> | ||
| 523 | 24 | |||
| 524 | 25 | |||
| 525 | 26 | using namespace std; | ||
| 526 | 27 | |||
| 527 | 28 | namespace unity | ||
| 528 | 29 | { | ||
| 529 | 30 | namespace storage | ||
| 530 | 31 | { | ||
| 531 | 32 | namespace provider | ||
| 532 | 33 | { | ||
| 533 | 34 | namespace testing | ||
| 534 | 35 | { | ||
| 535 | 36 | |||
| 536 | 37 | TestServer::TestServer(unique_ptr<ProviderBase>&& provider, | ||
| 537 | 38 | OnlineAccounts::Account* account, | ||
| 538 | 39 | QDBusConnection const& connection, | ||
| 539 | 40 | string const& object_path) | ||
| 540 | 41 | : p_(new internal::TestServerImpl(move(provider), account, | ||
| 541 | 42 | connection, object_path)) | ||
| 542 | 43 | { | ||
| 543 | 44 | } | ||
| 544 | 45 | |||
| 545 | 46 | TestServer::~TestServer() = default; | ||
| 546 | 47 | |||
| 547 | 48 | QDBusConnection const& TestServer::connection() const | ||
| 548 | 49 | { | ||
| 549 | 50 | return p_->connection(); | ||
| 550 | 51 | } | ||
| 551 | 52 | |||
| 552 | 53 | string const& TestServer::object_path() const | ||
| 553 | 54 | { | ||
| 554 | 55 | return p_->object_path(); | ||
| 555 | 56 | } | ||
| 556 | 57 | |||
| 557 | 58 | } | ||
| 558 | 59 | } | ||
| 559 | 60 | } | ||
| 560 | 61 | } | ||
| 561 | 0 | 62 | ||
| 562 | === modified file 'src/qt/client/CMakeLists.txt' | |||
| 563 | --- src/qt/client/CMakeLists.txt 2016-07-27 02:19:17 +0000 | |||
| 564 | +++ src/qt/client/CMakeLists.txt 2016-08-11 06:54:57 +0000 | |||
| 565 | @@ -80,7 +80,7 @@ | |||
| 566 | 80 | # Build the remote client library | 80 | # Build the remote client library |
| 567 | 81 | set_source_files_properties(${CMAKE_SOURCE_DIR}/data/provider.xml PROPERTIES | 81 | set_source_files_properties(${CMAKE_SOURCE_DIR}/data/provider.xml PROPERTIES |
| 568 | 82 | CLASSNAME ProviderInterface | 82 | CLASSNAME ProviderInterface |
| 570 | 83 | INCLUDE unity/storage/qt/client/internal/remote_client/dbusmarshal.h | 83 | INCLUDE unity/storage/internal/dbusmarshal.h |
| 571 | 84 | ) | 84 | ) |
| 572 | 85 | 85 | ||
| 573 | 86 | qt5_add_dbus_interface(generated_files | 86 | qt5_add_dbus_interface(generated_files |
| 574 | @@ -109,6 +109,7 @@ | |||
| 575 | 109 | VERSION ${SF_CLIENT_LIBVERSION} | 109 | VERSION ${SF_CLIENT_LIBVERSION} |
| 576 | 110 | ) | 110 | ) |
| 577 | 111 | target_link_libraries(storage-framework-qt-client | 111 | target_link_libraries(storage-framework-qt-client |
| 578 | 112 | storage-framework-common-internal | ||
| 579 | 112 | Qt5::Concurrent | 113 | Qt5::Concurrent |
| 580 | 113 | Qt5::Core | 114 | Qt5::Core |
| 581 | 114 | Qt5::DBus | 115 | Qt5::DBus |
| 582 | 115 | 116 | ||
| 583 | === modified file 'src/qt/client/internal/remote_client/RuntimeImpl.cpp' | |||
| 584 | --- src/qt/client/internal/remote_client/RuntimeImpl.cpp 2016-08-03 06:29:48 +0000 | |||
| 585 | +++ src/qt/client/internal/remote_client/RuntimeImpl.cpp 2016-08-11 06:54:57 +0000 | |||
| 586 | @@ -18,11 +18,12 @@ | |||
| 587 | 18 | 18 | ||
| 588 | 19 | #include <unity/storage/qt/client/internal/remote_client/RuntimeImpl.h> | 19 | #include <unity/storage/qt/client/internal/remote_client/RuntimeImpl.h> |
| 589 | 20 | 20 | ||
| 590 | 21 | #include <unity/storage/internal/dbusmarshal.h> | ||
| 591 | 21 | #include <unity/storage/qt/client/Account.h> | 22 | #include <unity/storage/qt/client/Account.h> |
| 592 | 22 | #include <unity/storage/qt/client/Exceptions.h> | 23 | #include <unity/storage/qt/client/Exceptions.h> |
| 593 | 23 | #include <unity/storage/qt/client/internal/make_future.h> | 24 | #include <unity/storage/qt/client/internal/make_future.h> |
| 594 | 24 | #include <unity/storage/qt/client/internal/remote_client/AccountImpl.h> | 25 | #include <unity/storage/qt/client/internal/remote_client/AccountImpl.h> |
| 596 | 25 | #include <unity/storage/qt/client/internal/remote_client/dbusmarshal.h> | 26 | #include <unity/storage/internal/dbusmarshal.h> |
| 597 | 26 | 27 | ||
| 598 | 27 | #include <QDBusMetaType> | 28 | #include <QDBusMetaType> |
| 599 | 28 | 29 | ||
| 600 | 29 | 30 | ||
| 601 | === modified file 'src/qt/client/internal/remote_client/dbusmarshal.cpp' | |||
| 602 | --- src/qt/client/internal/remote_client/dbusmarshal.cpp 2016-08-11 01:39:44 +0000 | |||
| 603 | +++ src/qt/client/internal/remote_client/dbusmarshal.cpp 2016-08-11 06:54:57 +0000 | |||
| 604 | @@ -37,89 +37,6 @@ | |||
| 605 | 37 | { | 37 | { |
| 606 | 38 | namespace storage | 38 | namespace storage |
| 607 | 39 | { | 39 | { |
| 608 | 40 | namespace internal | ||
| 609 | 41 | { | ||
| 610 | 42 | |||
| 611 | 43 | QDBusArgument& operator<<(QDBusArgument& argument, storage::internal::ItemMetadata const& metadata) | ||
| 612 | 44 | { | ||
| 613 | 45 | argument.beginStructure(); | ||
| 614 | 46 | argument << metadata.item_id; | ||
| 615 | 47 | argument << metadata.parent_id; | ||
| 616 | 48 | argument << metadata.name; | ||
| 617 | 49 | argument << metadata.etag; | ||
| 618 | 50 | argument << static_cast<int32_t>(metadata.type); | ||
| 619 | 51 | argument.beginMap(QVariant::String, qMetaTypeId<QDBusVariant>()); | ||
| 620 | 52 | decltype(ItemMetadata::metadata)::const_iterator i = metadata.metadata.constBegin(); | ||
| 621 | 53 | while (i != metadata.metadata.constEnd()) | ||
| 622 | 54 | { | ||
| 623 | 55 | argument.beginMapEntry(); | ||
| 624 | 56 | argument << i.key() << QDBusVariant(i.value()); | ||
| 625 | 57 | argument.endMapEntry(); | ||
| 626 | 58 | ++i; | ||
| 627 | 59 | } | ||
| 628 | 60 | argument.endMap(); | ||
| 629 | 61 | argument.endStructure(); | ||
| 630 | 62 | return argument; | ||
| 631 | 63 | } | ||
| 632 | 64 | |||
| 633 | 65 | QDBusArgument const& operator>>(QDBusArgument const& argument, storage::internal::ItemMetadata& metadata) | ||
| 634 | 66 | { | ||
| 635 | 67 | argument.beginStructure(); | ||
| 636 | 68 | argument >> metadata.item_id; | ||
| 637 | 69 | argument >> metadata.parent_id; | ||
| 638 | 70 | argument >> metadata.name; | ||
| 639 | 71 | argument >> metadata.etag; | ||
| 640 | 72 | int32_t enum_val; | ||
| 641 | 73 | argument >> enum_val; | ||
| 642 | 74 | if (enum_val < 0 || enum_val >= int(ItemType::LAST_ENTRY__)) | ||
| 643 | 75 | { | ||
| 644 | 76 | qCritical() << "unmarshaling error: impossible ItemType value: " + QString::number(enum_val); | ||
| 645 | 77 | return argument; // Forces error | ||
| 646 | 78 | } | ||
| 647 | 79 | metadata.type = static_cast<ItemType>(enum_val); | ||
| 648 | 80 | metadata.metadata.clear(); | ||
| 649 | 81 | argument.beginMap(); | ||
| 650 | 82 | while (!argument.atEnd()) | ||
| 651 | 83 | { | ||
| 652 | 84 | QString key; | ||
| 653 | 85 | QVariant value; | ||
| 654 | 86 | argument.beginMapEntry(); | ||
| 655 | 87 | argument >> key >> value; | ||
| 656 | 88 | argument.endMapEntry(); | ||
| 657 | 89 | metadata.metadata.insert(key, value); | ||
| 658 | 90 | } | ||
| 659 | 91 | argument.endMap(); | ||
| 660 | 92 | argument.endStructure(); | ||
| 661 | 93 | return argument; | ||
| 662 | 94 | } | ||
| 663 | 95 | |||
| 664 | 96 | QDBusArgument& operator<<(QDBusArgument& argument, QList<storage::internal::ItemMetadata> const& md_list) | ||
| 665 | 97 | { | ||
| 666 | 98 | argument.beginArray(qMetaTypeId<storage::internal::ItemMetadata>()); | ||
| 667 | 99 | for (auto const& md : md_list) | ||
| 668 | 100 | { | ||
| 669 | 101 | argument << md; | ||
| 670 | 102 | } | ||
| 671 | 103 | argument.endArray(); | ||
| 672 | 104 | return argument; | ||
| 673 | 105 | } | ||
| 674 | 106 | |||
| 675 | 107 | QDBusArgument const& operator>>(QDBusArgument const& argument, QList<storage::internal::ItemMetadata>& md_list) | ||
| 676 | 108 | { | ||
| 677 | 109 | md_list.clear(); | ||
| 678 | 110 | argument.beginArray(); | ||
| 679 | 111 | while (!argument.atEnd()) | ||
| 680 | 112 | { | ||
| 681 | 113 | ItemMetadata imd; | ||
| 682 | 114 | argument >> imd; | ||
| 683 | 115 | md_list.append(imd); | ||
| 684 | 116 | } | ||
| 685 | 117 | argument.endArray(); | ||
| 686 | 118 | return argument; | ||
| 687 | 119 | } | ||
| 688 | 120 | |||
| 689 | 121 | } // namespace internal | ||
| 690 | 122 | |||
| 691 | 123 | namespace qt | 40 | namespace qt |
| 692 | 124 | { | 41 | { |
| 693 | 125 | namespace client | 42 | namespace client |
| 694 | 126 | 43 | ||
| 695 | === modified file 'tests/provider-ProviderInterface/CMakeLists.txt' | |||
| 696 | --- tests/provider-ProviderInterface/CMakeLists.txt 2016-08-11 03:49:32 +0000 | |||
| 697 | +++ tests/provider-ProviderInterface/CMakeLists.txt 2016-08-11 06:54:57 +0000 | |||
| 698 | @@ -2,7 +2,7 @@ | |||
| 699 | 2 | 2 | ||
| 700 | 3 | set_source_files_properties(${CMAKE_SOURCE_DIR}/data/provider.xml PROPERTIES | 3 | set_source_files_properties(${CMAKE_SOURCE_DIR}/data/provider.xml PROPERTIES |
| 701 | 4 | CLASSNAME ProviderClient | 4 | CLASSNAME ProviderClient |
| 703 | 5 | INCLUDE unity/storage/qt/client/internal/remote_client/dbusmarshal.h | 5 | INCLUDE unity/storage/internal/dbusmarshal.h |
| 704 | 6 | ) | 6 | ) |
| 705 | 7 | qt5_add_dbus_interface(generated_files | 7 | qt5_add_dbus_interface(generated_files |
| 706 | 8 | ${CMAKE_SOURCE_DIR}/data/provider.xml | 8 | ${CMAKE_SOURCE_DIR}/data/provider.xml |
| 707 | @@ -15,16 +15,14 @@ | |||
| 708 | 15 | add_executable(provider-ProviderInterface_test | 15 | add_executable(provider-ProviderInterface_test |
| 709 | 16 | ProviderInterface_test.cpp | 16 | ProviderInterface_test.cpp |
| 710 | 17 | TestProvider.cpp | 17 | TestProvider.cpp |
| 711 | 18 | ../../src/qt/client/internal/remote_client/dbusmarshal.cpp | ||
| 712 | 19 | ${generated_files} | 18 | ${generated_files} |
| 713 | 20 | ) | 19 | ) |
| 714 | 21 | add_dependencies(provider-ProviderInterface_test storage-framework-provider) | ||
| 715 | 22 | set_target_properties(provider-ProviderInterface_test PROPERTIES | 20 | set_target_properties(provider-ProviderInterface_test PROPERTIES |
| 716 | 23 | AUTOMOC TRUE | 21 | AUTOMOC TRUE |
| 717 | 24 | ) | 22 | ) |
| 718 | 25 | target_link_libraries(provider-ProviderInterface_test | 23 | target_link_libraries(provider-ProviderInterface_test |
| 721 | 26 | storage-framework-provider-static | 24 | storage-framework-common-internal |
| 722 | 27 | storage-framework-qt-client | 25 | storage-framework-provider |
| 723 | 28 | Qt5::Test | 26 | Qt5::Test |
| 724 | 29 | testutils | 27 | testutils |
| 725 | 30 | gtest | 28 | gtest |
| 726 | 31 | 29 | ||
| 727 | === modified file 'tests/provider-ProviderInterface/ProviderInterface_test.cpp' | |||
| 728 | --- tests/provider-ProviderInterface/ProviderInterface_test.cpp 2016-08-11 02:49:25 +0000 | |||
| 729 | +++ tests/provider-ProviderInterface/ProviderInterface_test.cpp 2016-08-11 06:54:57 +0000 | |||
| 730 | @@ -18,12 +18,7 @@ | |||
| 731 | 18 | 18 | ||
| 732 | 19 | #include <unity/storage/internal/dbus_error.h> | 19 | #include <unity/storage/internal/dbus_error.h> |
| 733 | 20 | #include <unity/storage/provider/ProviderBase.h> | 20 | #include <unity/storage/provider/ProviderBase.h> |
| 740 | 21 | #include <unity/storage/provider/internal/DBusPeerCache.h> | 21 | #include <unity/storage/provider/testing/TestServer.h> |
| 735 | 22 | #include <unity/storage/provider/internal/AccountData.h> | ||
| 736 | 23 | #include <unity/storage/provider/internal/ProviderInterface.h> | ||
| 737 | 24 | #include <unity/storage/provider/internal/dbusmarshal.h> | ||
| 738 | 25 | // generated DBus service adaptor | ||
| 739 | 26 | #include "../../src/provider/provideradaptor.h" | ||
| 741 | 27 | 22 | ||
| 742 | 28 | #include "TestProvider.h" | 23 | #include "TestProvider.h" |
| 743 | 29 | #include "ProviderClient.h" | 24 | #include "ProviderClient.h" |
| 744 | @@ -48,7 +43,8 @@ | |||
| 745 | 48 | 43 | ||
| 746 | 49 | using namespace std; | 44 | using namespace std; |
| 747 | 50 | using unity::storage::ItemType; | 45 | using unity::storage::ItemType; |
| 749 | 51 | using namespace unity::storage::provider; | 46 | using unity::storage::provider::ProviderBase; |
| 750 | 47 | using unity::storage::provider::testing::TestServer; | ||
| 751 | 52 | 48 | ||
| 752 | 53 | namespace { | 49 | namespace { |
| 753 | 54 | 50 | ||
| 754 | @@ -75,12 +71,9 @@ | |||
| 755 | 75 | 2, "oauth2-service"); | 71 | 2, "oauth2-service"); |
| 756 | 76 | ASSERT_NE(nullptr, account); | 72 | ASSERT_NE(nullptr, account); |
| 757 | 77 | 73 | ||
| 764 | 78 | auto peer_cache = make_shared<internal::DBusPeerCache>(*service_connection_); | 74 | test_server_.reset( |
| 765 | 79 | auto account_data = make_shared<internal::AccountData>( | 75 | new TestServer(move(provider), account, |
| 766 | 80 | move(provider), peer_cache, *service_connection_, account); | 76 | *service_connection_, BUS_PATH.toStdString())); |
| 761 | 81 | provider_interface_.reset(new internal::ProviderInterface(account_data)); | ||
| 762 | 82 | new ProviderAdaptor(provider_interface_.get()); | ||
| 763 | 83 | service_connection_->registerObject(BUS_PATH, provider_interface_.get()); | ||
| 767 | 84 | 77 | ||
| 768 | 85 | client_.reset(new ProviderClient(service_connection_->baseService(), | 78 | client_.reset(new ProviderClient(service_connection_->baseService(), |
| 769 | 86 | BUS_PATH, | 79 | BUS_PATH, |
| 770 | @@ -108,7 +101,7 @@ | |||
| 771 | 108 | void TearDown() override | 101 | void TearDown() override |
| 772 | 109 | { | 102 | { |
| 773 | 110 | client_.reset(); | 103 | client_.reset(); |
| 775 | 111 | provider_interface_.reset(); | 104 | test_server_.reset(); |
| 776 | 112 | service_connection_.reset(); | 105 | service_connection_.reset(); |
| 777 | 113 | QDBusConnection::disconnectFromBus(SERVICE_CONNECTION_NAME); | 106 | QDBusConnection::disconnectFromBus(SERVICE_CONNECTION_NAME); |
| 778 | 114 | dbus_.reset(); | 107 | dbus_.reset(); |
| 779 | @@ -117,7 +110,7 @@ | |||
| 780 | 117 | unique_ptr<DBusEnvironment> dbus_; | 110 | unique_ptr<DBusEnvironment> dbus_; |
| 781 | 118 | unique_ptr<QDBusConnection> service_connection_; | 111 | unique_ptr<QDBusConnection> service_connection_; |
| 782 | 119 | unique_ptr<OnlineAccounts::Manager> account_manager_; | 112 | unique_ptr<OnlineAccounts::Manager> account_manager_; |
| 784 | 120 | unique_ptr<internal::ProviderInterface> provider_interface_; | 113 | unique_ptr<TestServer> test_server_; |
| 785 | 121 | unique_ptr<ProviderClient> client_; | 114 | unique_ptr<ProviderClient> client_; |
| 786 | 122 | }; | 115 | }; |
| 787 | 123 | 116 | ||
| 788 | @@ -525,8 +518,6 @@ | |||
| 789 | 525 | QCoreApplication app(argc, argv); | 518 | QCoreApplication app(argc, argv); |
| 790 | 526 | qDBusRegisterMetaType<unity::storage::internal::ItemMetadata>(); | 519 | qDBusRegisterMetaType<unity::storage::internal::ItemMetadata>(); |
| 791 | 527 | qDBusRegisterMetaType<QList<unity::storage::internal::ItemMetadata>>(); | 520 | qDBusRegisterMetaType<QList<unity::storage::internal::ItemMetadata>>(); |
| 792 | 528 | qDBusRegisterMetaType<unity::storage::provider::Item>(); | ||
| 793 | 529 | qDBusRegisterMetaType<std::vector<unity::storage::provider::Item>>(); | ||
| 794 | 530 | ::testing::InitGoogleTest(&argc, argv); | 521 | ::testing::InitGoogleTest(&argc, argv); |
| 795 | 531 | return RUN_ALL_TESTS(); | 522 | return RUN_ALL_TESTS(); |
| 796 | 532 | } | 523 | } |
| 797 | 533 | 524 | ||
| 798 | === modified file 'tests/provider-ProviderInterface/TestProvider.h' | |||
| 799 | --- tests/provider-ProviderInterface/TestProvider.h 2016-08-04 10:12:01 +0000 | |||
| 800 | +++ tests/provider-ProviderInterface/TestProvider.h 2016-08-11 06:54:57 +0000 | |||
| 801 | @@ -21,7 +21,12 @@ | |||
| 802 | 21 | #include <unity/storage/provider/ProviderBase.h> | 21 | #include <unity/storage/provider/ProviderBase.h> |
| 803 | 22 | 22 | ||
| 804 | 23 | using namespace std; | 23 | using namespace std; |
| 806 | 24 | using namespace unity::storage::provider; | 24 | using unity::storage::provider::Context; |
| 807 | 25 | using unity::storage::provider::DownloadJob; | ||
| 808 | 26 | using unity::storage::provider::ProviderBase; | ||
| 809 | 27 | using unity::storage::provider::Item; | ||
| 810 | 28 | using unity::storage::provider::ItemList; | ||
| 811 | 29 | using unity::storage::provider::UploadJob; | ||
| 812 | 25 | 30 | ||
| 813 | 26 | class TestProvider : public ProviderBase { | 31 | class TestProvider : public ProviderBase { |
| 814 | 27 | public: | 32 | public: |
FAILED: Continuous integration, rev:48
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/