content-hub

Merge lp:~abreu-alexandre/content-hub/types-per-app-id into lp:content-hub

  1. types-per-app-id
  2. Merge into trunk
Proposed by Alexandre Abreu
Status: Needs review
Proposed branch: lp:~abreu-alexandre/content-hub/types-per-app-id
Merge into: lp:content-hub
Diff against target: 312 lines (+120/-0)
17 files modified
import/Ubuntu/Content/contenthub.cpp (+24/-0)
import/Ubuntu/Content/contenthub.h (+2/-0)
include/com/ubuntu/content/hub.h (+1/-0)
src/com/ubuntu/content/detail/com.ubuntu.content.Service.xml (+4/-0)
src/com/ubuntu/content/detail/peer_registry.h (+1/-0)
src/com/ubuntu/content/detail/service.cpp (+14/-0)
src/com/ubuntu/content/detail/service.h (+1/-0)
src/com/ubuntu/content/hub.cpp (+19/-0)
src/com/ubuntu/content/service/registry.cpp (+46/-0)
src/com/ubuntu/content/service/registry.h (+1/-0)
tests/acceptance-tests/app_hub_communication_default_source.cpp (+1/-0)
tests/acceptance-tests/app_hub_communication_handler.cpp (+1/-0)
tests/acceptance-tests/app_hub_communication_known_sources.cpp (+1/-0)
tests/acceptance-tests/app_hub_communication_paste.cpp (+1/-0)
tests/acceptance-tests/app_hub_communication_stores.cpp (+1/-0)
tests/acceptance-tests/app_hub_communication_transfer.cpp (+1/-0)
tests/acceptance-tests/test_hook.cpp (+1/-0)
To merge this branch: bzr merge lp:~abreu-alexandre/content-hub/types-per-app-id
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
Ken VanDine Approve
Review via email: mp+299081@code.launchpad.net

Commit message

Give apps access to their currently supported content-types

Description of the change

Give apps access to their currently supported content-types

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:282
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/17/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/832
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/144
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/832
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/762
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/762
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/762
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/764
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/764/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/764
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/764/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/764
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/764/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/764
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/764/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/764
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/764/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/764
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/764/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/764
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/764/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/764
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/764/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/764
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/764/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-3-clickpkg/29

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/17/rebuild

review: Approve (continuous-integration)
Reply
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good

review: Approve
Reply
lp:~abreu-alexandre/content-hub/types-per-app-id updated
283. By Alexandre Abreu

merge trunk

284. By Alexandre Abreu

fix merged trunk test

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:283
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/49/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1438/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1438
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1289/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1289/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1289/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1289/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1289/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1289/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1289/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1289/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1289/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/49/rebuild

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:284
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/50/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1440/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1440
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1290
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1290/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1290/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1290
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1290/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1290
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1290/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1290
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1290/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1290
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1290/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1290
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1290/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1290/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1290
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1290/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/50/rebuild

review: Needs Fixing (continuous-integration)
Reply

Unmerged revisions

284. By Alexandre Abreu

fix merged trunk test

283. By Alexandre Abreu

merge trunk

282. By Alexandre Abreu

bit braces

281. By Alexandre Abreu

tweaks

280. By Alexandre Abreu

draft

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'import/Ubuntu/Content/contenthub.cpp'
--- import/Ubuntu/Content/contenthub.cpp 2015-08-21 14:49:38 +0000
+++ import/Ubuntu/Content/contenthub.cpp 2016-09-07 16:26:08 +0000
@@ -316,6 +316,30 @@
316}316}
317317
318/*!318/*!
319 * \brief ContentHub::getSupportedTypes returns the list of supported types by the current host application
320 * \return List of supported ContentType
321 */
322QList<ContentType::Type> ContentHub::getSupportedTypes()
323{
324 TRACE() << Q_FUNC_INFO;
325
326 QList<ContentType::Type> type_ids;
327
328 QString appId = QString(qgetenv("APP_ID"));
329 if (appId.isEmpty())
330 {
331 return type_ids;
332 }
333
334 QVector<QString> types = m_hub->supported_types_for_app_id(appId);
335 Q_FOREACH(const QString& t, types)
336 {
337 type_ids.append(ContentType::hubType2contentType(t));
338 }
339 return type_ids;
340}
341
342/*!
319 * \qmlsignal ContentHub::importRequested(ContentTransfer transfer)343 * \qmlsignal ContentHub::importRequested(ContentTransfer transfer)
320 *344 *
321 * The signal is triggered when an import is requested.345 * The signal is triggered when an import is requested.
322346
=== modified file 'import/Ubuntu/Content/contenthub.h'
--- import/Ubuntu/Content/contenthub.h 2015-08-20 15:54:52 +0000
+++ import/Ubuntu/Content/contenthub.h 2016-09-07 16:26:08 +0000
@@ -23,6 +23,7 @@
23#include <QQmlListProperty>23#include <QQmlListProperty>
24#include "contentpeer.h"24#include "contentpeer.h"
25#include "contenttransfer.h"25#include "contenttransfer.h"
26#include "contenttype.h"
2627
27class ContentStore;28class ContentStore;
28class QmlImportExportHandler;29class QmlImportExportHandler;
@@ -58,6 +59,7 @@
58 Q_INVOKABLE ContentTransfer* importContent(com::ubuntu::content::Peer peer, ContentType::Type type);59 Q_INVOKABLE ContentTransfer* importContent(com::ubuntu::content::Peer peer, ContentType::Type type);
59 Q_INVOKABLE ContentTransfer* exportContent(com::ubuntu::content::Peer peer, ContentType::Type type);60 Q_INVOKABLE ContentTransfer* exportContent(com::ubuntu::content::Peer peer, ContentType::Type type);
60 Q_INVOKABLE ContentTransfer* shareContent(com::ubuntu::content::Peer peer, ContentType::Type type);61 Q_INVOKABLE ContentTransfer* shareContent(com::ubuntu::content::Peer peer, ContentType::Type type);
62 Q_INVOKABLE QList<ContentType::Type> getSupportedTypes();
6163
62Q_SIGNALS:64Q_SIGNALS:
63 void importRequested(ContentTransfer *transfer);65 void importRequested(ContentTransfer *transfer);
6466
=== modified file 'include/com/ubuntu/content/hub.h'
--- include/com/ubuntu/content/hub.h 2016-08-24 20:23:44 +0000
+++ include/com/ubuntu/content/hub.h 2016-09-07 16:26:08 +0000
@@ -62,6 +62,7 @@
62 Q_INVOKABLE virtual Transfer* create_import_from_peer(Peer peer);62 Q_INVOKABLE virtual Transfer* create_import_from_peer(Peer peer);
63 Q_INVOKABLE virtual Transfer* create_export_to_peer(Peer peer);63 Q_INVOKABLE virtual Transfer* create_export_to_peer(Peer peer);
64 Q_INVOKABLE virtual Transfer* create_share_to_peer(Peer peer);64 Q_INVOKABLE virtual Transfer* create_share_to_peer(Peer peer);
65 Q_INVOKABLE virtual QVector<QString> supported_types_for_app_id(QString app_id);
6566
66 Q_INVOKABLE virtual void quit();67 Q_INVOKABLE virtual void quit();
6768
6869
=== modified file 'src/com/ubuntu/content/detail/com.ubuntu.content.Service.xml'
--- src/com/ubuntu/content/detail/com.ubuntu.content.Service.xml 2016-08-24 20:23:44 +0000
+++ src/com/ubuntu/content/detail/com.ubuntu.content.Service.xml 2016-09-07 16:26:08 +0000
@@ -67,6 +67,10 @@
67 <arg name="app_id" type="s" direction="in" />67 <arg name="app_id" type="s" direction="in" />
68 <arg name="peer" type="v" direction="out" />68 <arg name="peer" type="v" direction="out" />
69 </method>69 </method>
70 <method name="SupportedTypesForAppId">
71 <arg name="app_id" type="s" direction="in" />
72 <arg name="types" type="av" direction="out" />
73 </method>
70 <method name="PasteFormats">74 <method name="PasteFormats">
71 <arg name="formats" type="as" direction="out" />75 <arg name="formats" type="as" direction="out" />
72 </method>76 </method>
7377
=== modified file 'src/com/ubuntu/content/detail/peer_registry.h'
--- src/com/ubuntu/content/detail/peer_registry.h 2015-10-20 20:18:18 +0000
+++ src/com/ubuntu/content/detail/peer_registry.h 2016-09-07 16:26:08 +0000
@@ -51,6 +51,7 @@
51 virtual bool install_share_for_type(Type, Peer) = 0;51 virtual bool install_share_for_type(Type, Peer) = 0;
52 virtual bool remove_peer(Peer peer) = 0;52 virtual bool remove_peer(Peer peer) = 0;
53 virtual bool peer_is_legacy(QString type) = 0;53 virtual bool peer_is_legacy(QString type) = 0;
54 virtual void enumerate_types_for_app_id(const QString& app_id, const std::function<void(const QString&)>&for_each) = 0;
5455
55};56};
56}57}
5758
=== modified file 'src/com/ubuntu/content/detail/service.cpp'
--- src/com/ubuntu/content/detail/service.cpp 2016-08-24 20:23:44 +0000
+++ src/com/ubuntu/content/detail/service.cpp 2016-09-07 16:26:08 +0000
@@ -756,6 +756,20 @@
756 return false;756 return false;
757}757}
758758
759QVariantList cucd::Service::SupportedTypesForAppId(const QString& app_id)
760{
761 QVariantList result;
762
763 d->registry->enumerate_types_for_app_id(
764 app_id,
765 [&result](const QString& type)
766 {
767 result.append(QVariant::fromValue(type));
768 });
769
770 return result;
771}
772
759QStringList cucd::Service::PasteFormats()773QStringList cucd::Service::PasteFormats()
760{774{
761 TRACE() << Q_FUNC_INFO;775 TRACE() << Q_FUNC_INFO;
762776
=== modified file 'src/com/ubuntu/content/detail/service.h'
--- src/com/ubuntu/content/detail/service.h 2016-08-24 20:23:44 +0000
+++ src/com/ubuntu/content/detail/service.h 2016-09-07 16:26:08 +0000
@@ -61,6 +61,7 @@
61 QDBusObjectPath CreateImportFromPeer(const QString&, const QString&, const QString&);61 QDBusObjectPath CreateImportFromPeer(const QString&, const QString&, const QString&);
62 QDBusObjectPath CreateExportToPeer(const QString&, const QString&, const QString&);62 QDBusObjectPath CreateExportToPeer(const QString&, const QString&, const QString&);
63 QDBusObjectPath CreateShareToPeer(const QString&, const QString&, const QString&);63 QDBusObjectPath CreateShareToPeer(const QString&, const QString&, const QString&);
64 QVariantList SupportedTypesForAppId(const QString &);
64 bool CreatePaste(const QString&, const QString&, const QByteArray&, const QStringList&);65 bool CreatePaste(const QString&, const QString&, const QByteArray&, const QStringList&);
65 QByteArray GetLatestPasteData(const QString& surfaceId);66 QByteArray GetLatestPasteData(const QString& surfaceId);
66 QByteArray GetPasteData(const QString& surfaceId, const QString& pasteId);67 QByteArray GetPasteData(const QString& surfaceId, const QString& pasteId);
6768
=== modified file 'src/com/ubuntu/content/hub.cpp'
--- src/com/ubuntu/content/hub.cpp 2016-08-24 20:23:44 +0000
+++ src/com/ubuntu/content/hub.cpp 2016-09-07 16:26:08 +0000
@@ -251,6 +251,25 @@
251 return result;251 return result;
252}252}
253253
254QVector<QString> cuc::Hub::supported_types_for_app_id(QString app_id)
255{
256 QVector<QString> result;
257
258 auto reply = d->service->SupportedTypesForAppId(app_id);
259 reply.waitForFinished();
260
261 if (reply.isError())
262 return result;
263
264 auto types = reply.value();
265
266 Q_FOREACH(const QVariant& t, types)
267 {
268 result << qdbus_cast<QString>(t);
269 }
270 return result;
271}
272
254QVector<cuc::Peer> cuc::Hub::known_shares_for_type(cuc::Type t)273QVector<cuc::Peer> cuc::Hub::known_shares_for_type(cuc::Type t)
255{274{
256 QVector<cuc::Peer> result;275 QVector<cuc::Peer> result;
257276
=== modified file 'src/com/ubuntu/content/service/registry.cpp'
--- src/com/ubuntu/content/service/registry.cpp 2016-01-29 17:27:50 +0000
+++ src/com/ubuntu/content/service/registry.cpp 2016-09-07 16:26:08 +0000
@@ -255,6 +255,52 @@
255 }255 }
256}256}
257257
258void Registry::enumerate_types_for_app_id(const QString& app_id,
259 const std::function<void(const QString&)>&for_each)
260{
261 TRACE() << Q_FUNC_INFO;
262
263 Q_FOREACH (QString type_id, m_sources->keys())
264 {
265 TRACE() << Q_FUNC_INFO << type_id;
266 Q_FOREACH (QString k, m_sources->get(type_id).toStringList())
267 {
268 TRACE() << Q_FUNC_INFO << k;
269 if (k == app_id)
270 {
271 for_each(type_id);
272 break;
273 }
274 }
275 }
276 Q_FOREACH (QString type_id, m_dests->keys())
277 {
278 TRACE() << Q_FUNC_INFO << type_id;
279 Q_FOREACH (QString k, m_dests->get(type_id).toStringList())
280 {
281 TRACE() << Q_FUNC_INFO << k;
282 if (k == app_id)
283 {
284 for_each(type_id);
285 break;
286 }
287 }
288 }
289 Q_FOREACH (QString type_id, m_shares->keys())
290 {
291 TRACE() << Q_FUNC_INFO << type_id;
292 Q_FOREACH (QString k, m_shares->get(type_id).toStringList())
293 {
294 TRACE() << Q_FUNC_INFO << k;
295 if (k == app_id)
296 {
297 for_each(type_id);
298 break;
299 }
300 }
301 }
302}
303
258void Registry::enumerate_known_sources_for_type(cuc::Type type, const std::function<void(const cuc::Peer&)>&for_each)304void Registry::enumerate_known_sources_for_type(cuc::Type type, const std::function<void(const cuc::Peer&)>&for_each)
259{305{
260 TRACE() << Q_FUNC_INFO << type.id();306 TRACE() << Q_FUNC_INFO << type.id();
261307
=== modified file 'src/com/ubuntu/content/service/registry.h'
--- src/com/ubuntu/content/service/registry.h 2015-10-20 20:18:18 +0000
+++ src/com/ubuntu/content/service/registry.h 2016-09-07 16:26:08 +0000
@@ -44,6 +44,7 @@
44 bool install_share_for_type(cuc::Type type, cuc::Peer peer);44 bool install_share_for_type(cuc::Type type, cuc::Peer peer);
45 bool remove_peer(cuc::Peer peer);45 bool remove_peer(cuc::Peer peer);
46 bool peer_is_legacy(QString type);46 bool peer_is_legacy(QString type);
47 void enumerate_types_for_app_id(const QString& app_id, const std::function<void(const QString&)>&for_each);
4748
48private:49private:
49 QScopedPointer<QGSettings> m_defaultSources;50 QScopedPointer<QGSettings> m_defaultSources;
5051
=== modified file 'tests/acceptance-tests/app_hub_communication_default_source.cpp'
--- tests/acceptance-tests/app_hub_communication_default_source.cpp 2015-10-20 20:23:09 +0000
+++ tests/acceptance-tests/app_hub_communication_default_source.cpp 2016-09-07 16:26:08 +0000
@@ -76,6 +76,7 @@
76 MOCK_METHOD2(install_share_for_type, bool(cuc::Type, cuc::Peer));76 MOCK_METHOD2(install_share_for_type, bool(cuc::Type, cuc::Peer));
77 MOCK_METHOD1(remove_peer, bool(cuc::Peer));77 MOCK_METHOD1(remove_peer, bool(cuc::Peer));
78 MOCK_METHOD1(peer_is_legacy, bool(QString));78 MOCK_METHOD1(peer_is_legacy, bool(QString));
79 MOCK_METHOD2(enumerate_types_for_app_id, void(const QString&, const std::function<void(const QString&)>&));
79};80};
80}81}
8182
8283
=== modified file 'tests/acceptance-tests/app_hub_communication_handler.cpp'
--- tests/acceptance-tests/app_hub_communication_handler.cpp 2016-05-31 19:50:24 +0000
+++ tests/acceptance-tests/app_hub_communication_handler.cpp 2016-09-07 16:26:08 +0000
@@ -74,6 +74,7 @@
74 MOCK_METHOD2(install_share_for_type, bool(cuc::Type, cuc::Peer));74 MOCK_METHOD2(install_share_for_type, bool(cuc::Type, cuc::Peer));
75 MOCK_METHOD1(remove_peer, bool(cuc::Peer));75 MOCK_METHOD1(remove_peer, bool(cuc::Peer));
76 MOCK_METHOD1(peer_is_legacy, bool(QString));76 MOCK_METHOD1(peer_is_legacy, bool(QString));
77 MOCK_METHOD2(enumerate_types_for_app_id, void(const QString&, const std::function<void(const QString&)>&));
77};78};
7879
79struct MockedHandler : public cuc::ImportExportHandler80struct MockedHandler : public cuc::ImportExportHandler
8081
=== modified file 'tests/acceptance-tests/app_hub_communication_known_sources.cpp'
--- tests/acceptance-tests/app_hub_communication_known_sources.cpp 2016-07-15 18:54:41 +0000
+++ tests/acceptance-tests/app_hub_communication_known_sources.cpp 2016-09-07 16:26:08 +0000
@@ -75,6 +75,7 @@
75 MOCK_METHOD2(install_share_for_type, bool(cuc::Type, cuc::Peer));75 MOCK_METHOD2(install_share_for_type, bool(cuc::Type, cuc::Peer));
76 MOCK_METHOD1(remove_peer, bool(cuc::Peer));76 MOCK_METHOD1(remove_peer, bool(cuc::Peer));
77 MOCK_METHOD1(peer_is_legacy, bool(QString));77 MOCK_METHOD1(peer_is_legacy, bool(QString));
78 MOCK_METHOD2(enumerate_types_for_app_id, void(const QString&, const std::function<void(const QString&)>&));
78};79};
79}80}
8081
8182
=== modified file 'tests/acceptance-tests/app_hub_communication_paste.cpp'
--- tests/acceptance-tests/app_hub_communication_paste.cpp 2016-08-23 20:17:57 +0000
+++ tests/acceptance-tests/app_hub_communication_paste.cpp 2016-09-07 16:26:08 +0000
@@ -74,6 +74,7 @@
74 MOCK_METHOD2(install_share_for_type, bool(cuc::Type, cuc::Peer));74 MOCK_METHOD2(install_share_for_type, bool(cuc::Type, cuc::Peer));
75 MOCK_METHOD1(remove_peer, bool(cuc::Peer));75 MOCK_METHOD1(remove_peer, bool(cuc::Peer));
76 MOCK_METHOD1(peer_is_legacy, bool(QString));76 MOCK_METHOD1(peer_is_legacy, bool(QString));
77 MOCK_METHOD2(enumerate_types_for_app_id, void(const QString&, const std::function<void(const QString&)>&));
77};78};
78}79}
7980
8081
=== modified file 'tests/acceptance-tests/app_hub_communication_stores.cpp'
--- tests/acceptance-tests/app_hub_communication_stores.cpp 2015-10-20 20:23:09 +0000
+++ tests/acceptance-tests/app_hub_communication_stores.cpp 2016-09-07 16:26:08 +0000
@@ -75,6 +75,7 @@
75 MOCK_METHOD2(install_share_for_type, bool(cuc::Type, cuc::Peer));75 MOCK_METHOD2(install_share_for_type, bool(cuc::Type, cuc::Peer));
76 MOCK_METHOD1(remove_peer, bool(cuc::Peer));76 MOCK_METHOD1(remove_peer, bool(cuc::Peer));
77 MOCK_METHOD1(peer_is_legacy, bool(QString));77 MOCK_METHOD1(peer_is_legacy, bool(QString));
78 MOCK_METHOD2(enumerate_types_for_app_id, void(const QString&, const std::function<void(const QString&)>&));
78};79};
79}80}
8081
8182
=== modified file 'tests/acceptance-tests/app_hub_communication_transfer.cpp'
--- tests/acceptance-tests/app_hub_communication_transfer.cpp 2015-10-20 20:23:09 +0000
+++ tests/acceptance-tests/app_hub_communication_transfer.cpp 2016-09-07 16:26:08 +0000
@@ -78,6 +78,7 @@
78 MOCK_METHOD2(install_share_for_type, bool(cuc::Type, cuc::Peer));78 MOCK_METHOD2(install_share_for_type, bool(cuc::Type, cuc::Peer));
79 MOCK_METHOD1(remove_peer, bool(cuc::Peer));79 MOCK_METHOD1(remove_peer, bool(cuc::Peer));
80 MOCK_METHOD1(peer_is_legacy, bool(QString));80 MOCK_METHOD1(peer_is_legacy, bool(QString));
81 MOCK_METHOD2(enumerate_types_for_app_id, void(const QString&, const std::function<void(const QString&)>&));
81};82};
82}83}
8384
8485
=== modified file 'tests/acceptance-tests/test_hook.cpp'
--- tests/acceptance-tests/test_hook.cpp 2015-10-20 20:23:09 +0000
+++ tests/acceptance-tests/test_hook.cpp 2016-09-07 16:26:08 +0000
@@ -57,6 +57,7 @@
57 MOCK_METHOD2(install_share_for_type, bool(cuc::Type, cuc::Peer));57 MOCK_METHOD2(install_share_for_type, bool(cuc::Type, cuc::Peer));
58 MOCK_METHOD1(remove_peer, bool(cuc::Peer));58 MOCK_METHOD1(remove_peer, bool(cuc::Peer));
59 MOCK_METHOD1(peer_is_legacy, bool(QString));59 MOCK_METHOD1(peer_is_legacy, bool(QString));
60 MOCK_METHOD2(enumerate_types_for_app_id, void(const QString&, const std::function<void(const QString&)>&));
60};61};
61}62}
6263

Subscribers

People subscribed via source and target branches