From 4c48a528f65945b340af32eba5d5704db19291a6 Mon Sep 17 00:00:00 2001 From: Sirpa Kemppainen Date: Wed, 30 Mar 2011 11:40:46 +0300 Subject: [PATCH] Fixed ofono-qt sms bearer test case --- tests/test_ofonomessagemanager.cpp | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/tests/test_ofonomessagemanager.cpp b/tests/test_ofonomessagemanager.cpp index 868dc32..e6010cd 100644 --- a/tests/test_ofonomessagemanager.cpp +++ b/tests/test_ofonomessagemanager.cpp @@ -235,12 +235,27 @@ private slots: QSignalSpy setBearerFailed(m, SIGNAL(setBearerFailed())); QSignalSpy bearerChanged(m, SIGNAL(bearerChanged(QString))); - m->setBearer("cs-preferred"); // initialize + m->requestBearer(); + for (int i=0; i<30; i++) { + if (bearerComplete.count() > 0) + break; + QTest::qWait(1000); + } + + QCOMPARE(bearerComplete.count(), 1); + QVariantList params = bearerComplete.takeFirst(); + QCOMPARE(params.at(0).toBool(), true); + QString bearer = params.at(1).toString(); + QVERIFY(bearer.length() > 0); + qDebug() << bearer; + + m->setBearer("ps-preferred"); for (int i=0; i<30; i++) { if (setBearerFailed.count() > 0 || bearerChanged.count() > 0) break; QTest::qWait(1000); } + m->requestBearer(); for (int i=0; i<30; i++) { if (bearerComplete.count() > 0) @@ -249,14 +264,13 @@ private slots: } QCOMPARE(bearerComplete.count(), 1); - QVariantList params = bearerComplete.takeFirst(); + params = bearerComplete.takeFirst(); QCOMPARE(params.at(0).toBool(), true); - QString bearer = params.at(1).toString(); + bearer = params.at(1).toString(); QVERIFY(bearer.length() > 0); - QCOMPARE(bearer, QString("cs-preferred")); - qDebug() << bearer; + QCOMPARE(bearer, QString("ps-preferred")); - m->setBearer("ps-preferred"); // change value + m->setBearer("cs-preferred"); // change value for (int i=0; i<30; i++) { if (setBearerFailed.count() > 0 || bearerChanged.count() > 0) break; -- 2.7.4