[Telepathy-commits] [telepathy-qt4/master] Fixed pinnochio test case.

[Andre Moreira Magalhaes (andrunko)]

---
 tests/pinocchio/cm-basics.cpp |   53 ++++++++++++++++------------------------
 1 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/tests/pinocchio/cm-basics.cpp b/tests/pinocchio/cm-basics.cpp
index 69ec5e6..b8b1342 100644
--- a/tests/pinocchio/cm-basics.cpp
+++ b/tests/pinocchio/cm-basics.cpp
@@ -72,39 +72,28 @@ void TestCmBasics::testBasics()
     QCOMPARE(mCM->interfaces(), QStringList());
     QCOMPARE(mCM->supportedProtocols(), QStringList() << "dummy");
 
-    const ProtocolInfo* info = mCM->protocolInfo("not-there");
-    QVERIFY(info == 0);
-    info = mCM->protocolInfo("dummy");
-    QVERIFY(info != 0);
-    QVERIFY(info->cmName() == "pinocchio");
-    QVERIFY(info->protocolName() == "dummy");
-    QSet<QString> paramSet = QSet<QString>();
-    Q_FOREACH (QString param, info->parameters()) {
-        paramSet << param;
+    Q_FOREACH (ProtocolInfo *info, mCM->protocols()) {
+        QVERIFY(info != 0);
+        QVERIFY(info->cmName() == "pinocchio");
+        QVERIFY(info->name() == "dummy");
+
+        QCOMPARE(info->hasParameter("account"), true);
+        QCOMPARE(info->hasParameter("not-there"), false);
+
+        Q_FOREACH (ProtocolParameter *param, info->parameters()) {
+            if (param->name() == "account") {
+                QCOMPARE(param->dbusSignature().signature(),
+                         QLatin1String("s"));
+                QCOMPARE(param->isRequired(), true);
+                QCOMPARE(param->isSecret(), false);
+            }
+            else if (param->name() == "password") {
+                QCOMPARE(param->isRequired(), false);
+                QCOMPARE(param->isSecret(), true);
+            }
+        }
+        QCOMPARE(info->canRegister(), false);
     }
-    QCOMPARE(paramSet, QSet<QString>() << "account" << "password");
-
-    QCOMPARE(info->hasParameter("account"), true);
-    QCOMPARE(info->hasParameter("not-there"), false);
-
-    QCOMPARE(info->parameterDBusSignature("account").signature(),
-            QLatin1String("s"));
-    QCOMPARE(info->parameterDBusSignature("not-there").signature(), QString());
-
-    QCOMPARE(info->parameterIsRequired("account"), true);
-    QCOMPARE(info->parameterIsRequired("password"), false);
-    QCOMPARE(info->parameterIsRequired("not-there"), false);
-
-    QCOMPARE(info->parameterIsSecret("account"), false);
-    QCOMPARE(info->parameterIsSecret("password"), true);
-    QCOMPARE(info->parameterIsSecret("not-there"), false);
-
-    QCOMPARE(info->parameterIsDBusProperty("account"), false);
-    QCOMPARE(info->parameterIsDBusProperty("not-there"), false);
-
-    QCOMPARE(info->parameterHasDefault("not-there"), false);
-
-    QCOMPARE(info->canRegister(), false);
 
     QCOMPARE(mCM->supportedProtocols(), QStringList() << "dummy");
 }
-- 
1.5.6.5