Test modify to handle new style translations

diff --git a/trunk/tests/mDictionaryTests/CommonDictInterfaceMock.h b/trunk/tests/mDictionaryTests/CommonDictInterfaceMock.h
index 74aa5c0..1dc77e5 100644 (file)
--- a/trunk/tests/mDictionaryTests/CommonDictInterfaceMock.h
+++ b/trunk/tests/mDictionaryTests/CommonDictInterfaceMock.h
@@ -35,7 +35,8 @@ class CommonDictInterfaceMock : public CommonDictInterface
 public:
     QString fromv, tov, namev, typev, infoNotev;
     bool available,stopped;
-    CommonDictInterfaceMock() {}
+    CommonDictInterfaceMock(QObject* parent = 0) :
+            CommonDictInterface(parent) {}
 
     QString langFrom () const { return fromv; }
     QString langTo() const {return tov;}
@@ -48,7 +49,8 @@ public:
     bool isAvailable() const {return available;}
     uint hash() const { return namev.length() + 10*typev.length();}
     void stop() {stopped = 1;}
-    void search(QString word, int limit) {
+    QString search(QString key) {}
+    QList<Translation*> searchWordList(QString word, int limit) {
         stopped = 0;
         QList<Translation*> list;
 
@@ -60,7 +62,8 @@ public:
         tm1->_translation = typev;
         list << tm << tm1;
 
-        Q_EMIT finalTranslation(list);
+        Q_EMIT finalTranslation();
+        return list;
     }
 
 };

diff --git a/trunk/tests/mDictionaryTests/tst_Backbone.cpp b/trunk/tests/mDictionaryTests/tst_Backbone.cpp
index cbc13ce..8098aed 100644 (file)
--- a/trunk/tests/mDictionaryTests/tst_Backbone.cpp
+++ b/trunk/tests/mDictionaryTests/tst_Backbone.cpp
@@ -163,7 +163,7 @@ void BackboneTest::searchTest() {
 
 
 void BackboneTest::translationTest() {
-    QSignalSpy** ss = new QSignalSpy*[total];
+    QList<QSignalSpy*> ss;
     QSignalSpy translatS(back, SIGNAL(ready()));
     QVERIFY2 (translatS.isValid() == true, "ready() signal is invalid");
 
@@ -173,21 +173,16 @@ void BackboneTest::translationTest() {
         CommonDictInterfaceMock *m = (CommonDictInterfaceMock*) dict[i];
         m->stopped = 1;
         back->addDictionary(dict[i]);
-        ss[i] = new QSignalSpy(m,SIGNAL(finalTranslation(QList<Translation*>)));
+        ss.append(new QSignalSpy(m,SIGNAL(finalTranslation())));
         QVERIFY2(ss[i]->isValid() == 1, "Signal invalid");
     }
 
     back->search("nic");
     for(int i = 0; i < total; i++) {
-
         QVERIFY2(ss[i]->count() == 1, "Translation signal lost");
-        QList<QVariant> qv  = ss[i]->takeFirst();
-        QCOMPARE((int)qv.at(0).type(),  (int)QVariant::UserType);
     }
 
-    qDebug() << "count " << translatS.count();
     QVERIFY2(translatS.count() == 1, "Lost finall 'ready()' signal");
-    qDebug() << "result.size " << back->result().size();
     QVERIFY2(back->result().size() == total*2, "Lost some of translations");
 }