diff options
author | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2011-09-23 19:52:25 -0300 |
---|---|---|
committer | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2011-09-23 19:52:25 -0300 |
commit | 79a235c3304e71828e6b6f759bf5bae2119f21f4 (patch) | |
tree | 3741816981f849b402bb289fedc98190156ed17a | |
parent | 20792a1d701772021877b58f220c0cb1a8c19ba3 (diff) |
echo2 cm: Add delivery-token support for delivery reports.
-rw-r--r-- | tests/dbus/text-chan.cpp | 4 | ||||
-rw-r--r-- | tests/lib/glib/echo2/chan.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/dbus/text-chan.cpp b/tests/dbus/text-chan.cpp index 8c3ec197..e525ec8c 100644 --- a/tests/dbus/text-chan.cpp +++ b/tests/dbus/text-chan.cpp @@ -468,8 +468,8 @@ void TestTextChan::commonTest(bool withMessages) QCOMPARE(r.supersededToken(), QString()); QVERIFY(r.isDeliveryReport()); QVERIFY(r.deliveryDetails().isValid()); - QVERIFY(!r.deliveryDetails().hasOriginalToken()); - QVERIFY(r.deliveryDetails().originalToken().isEmpty()); + QVERIFY(r.deliveryDetails().hasOriginalToken()); + QCOMPARE(r.deliveryDetails().originalToken(), QLatin1String("1111")); QCOMPARE(r.deliveryDetails().status(), Tp::DeliveryStatusPermanentlyFailed); QVERIFY(r.deliveryDetails().isError()); QCOMPARE(r.deliveryDetails().error(), Tp::ChannelTextSendErrorPermissionDenied); diff --git a/tests/lib/glib/echo2/chan.c b/tests/lib/glib/echo2/chan.c index 3ab3dd30..158f51b1 100644 --- a/tests/lib/glib/echo2/chan.c +++ b/tests/lib/glib/echo2/chan.c @@ -122,6 +122,8 @@ send_message (GObject *object, tp_message_set_string (delivery_report, 0, "delivery-error-message", "You asked for it"); + tp_message_set_string (delivery_report, 0, "delivery-token", "1111"); + tp_cm_message_take_message (delivery_report, 0, "delivery-echo", message); tp_message_mixin_take_received (object, delivery_report); |