diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-07-27 02:26:47 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-09-15 16:14:19 +0200 |
commit | 26816c21f60450e461a5b6ef4ef740f6070ce278 (patch) | |
tree | 55e8aee03e094abf702438e6cd26233047345e70 /tests/resourcecommunicationtest.cpp | |
parent | 9a9bb39f7641a818434cafa0dae0c8aa47124c0b (diff) | |
download | sink-26816c21f60450e461a5b6ef4ef740f6070ce278.tar.gz sink-26816c21f60450e461a5b6ef4ef740f6070ce278.zip |
Ported to the kasync revamp
Diffstat (limited to 'tests/resourcecommunicationtest.cpp')
-rw-r--r-- | tests/resourcecommunicationtest.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/resourcecommunicationtest.cpp b/tests/resourcecommunicationtest.cpp index 1530f63..201db53 100644 --- a/tests/resourcecommunicationtest.cpp +++ b/tests/resourcecommunicationtest.cpp | |||
@@ -51,13 +51,14 @@ private slots: | |||
51 | int errors = 0; | 51 | int errors = 0; |
52 | for (int i = 0; i < count; i++) { | 52 | for (int i = 0; i < count; i++) { |
53 | auto result = resourceAccess.sendCommand(Sink::Commands::PingCommand) | 53 | auto result = resourceAccess.sendCommand(Sink::Commands::PingCommand) |
54 | .then<void>([&complete]() { complete++; }, | 54 | .syncThen<void>([&resourceAccess, &errors, &complete](const KAsync::Error &error) { |
55 | [&errors, &complete](int error, const QString &msg) { | 55 | complete++; |
56 | qWarning() << msg; | 56 | if (error) { |
57 | errors++; | 57 | qWarning() << error.errorMessage; |
58 | complete++; | 58 | errors++; |
59 | }) | 59 | } |
60 | .exec(); | 60 | }) |
61 | .exec(); | ||
61 | } | 62 | } |
62 | QTRY_COMPARE(complete, count); | 63 | QTRY_COMPARE(complete, count); |
63 | QVERIFY(!errors); | 64 | QVERIFY(!errors); |
@@ -76,13 +77,12 @@ private slots: | |||
76 | int errors = 0; | 77 | int errors = 0; |
77 | for (int i = 0; i < count; i++) { | 78 | for (int i = 0; i < count; i++) { |
78 | resourceAccess.sendCommand(Sink::Commands::PingCommand) | 79 | resourceAccess.sendCommand(Sink::Commands::PingCommand) |
79 | .then<void>([&complete]() { complete++; }, | 80 | .syncThen<void>([&resourceAccess, &errors, &complete](const KAsync::Error &error) { |
80 | [&errors, &complete](int error, const QString &msg) { | 81 | complete++; |
81 | qWarning() << msg; | 82 | if (error) { |
83 | qWarning() << error.errorMessage; | ||
82 | errors++; | 84 | errors++; |
83 | complete++; | 85 | } |
84 | }) | ||
85 | .then<void>([&resourceAccess]() { | ||
86 | resourceAccess.close(); | 86 | resourceAccess.close(); |
87 | resourceAccess.open(); | 87 | resourceAccess.open(); |
88 | }) | 88 | }) |
@@ -104,7 +104,7 @@ private slots: | |||
104 | auto resourceAccess = Sink::ResourceAccessFactory::instance().getAccess(resourceIdentifier, ""); | 104 | auto resourceAccess = Sink::ResourceAccessFactory::instance().getAccess(resourceIdentifier, ""); |
105 | weakRef = resourceAccess.toWeakRef(); | 105 | weakRef = resourceAccess.toWeakRef(); |
106 | resourceAccess->open(); | 106 | resourceAccess->open(); |
107 | resourceAccess->sendCommand(Sink::Commands::PingCommand).then<void>([resourceAccess]() { qDebug() << "Pind complete"; }).exec(); | 107 | resourceAccess->sendCommand(Sink::Commands::PingCommand).syncThen<void>([resourceAccess]() { qDebug() << "Ping complete"; }).exec(); |
108 | } | 108 | } |
109 | QVERIFY(weakRef.toStrongRef()); | 109 | QVERIFY(weakRef.toStrongRef()); |
110 | QTRY_VERIFY(!weakRef.toStrongRef()); | 110 | QTRY_VERIFY(!weakRef.toStrongRef()); |