Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

diff --git a/trunk/src/base/backbone/Bookmarks.cpp b/trunk/src/base/backbone/Bookmarks.cpp
index 6e9c8b2..6468dd0 100644 (file)
--- a/trunk/src/base/backbone/Bookmarks.cpp
+++ b/trunk/src/base/backbone/Bookmarks.cpp
@@ -103,7 +103,6 @@ QList<Translation*> Bookmarks::searchWordList(QString word) {
         word+="%";
     word = word.replace("*", "%");
     word = word.replace("?", "_");
-    //word = removeAccents(word);
     qDebug() << word;
 
     QList<Translation*> tr;

diff --git a/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp b/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
index 640937d..1714cff 100644 (file)
--- a/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
+++ b/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
@@ -47,9 +47,9 @@ GoogleSettingsDialog::GoogleSettingsDialog(QWidget *parent,
     }
 
     #ifdef Q_WS_MAEMO_5
-        changeLangButton=new
-                         QPushButton(
-                                 QIcon::fromTheme("general_refresh"),tr(""));
+
+        changeLangButton=new QPushButton(
+                                 QIcon::fromTheme("general_refresh"), "");
     #else
         changeLangButton=new QPushButton(
                 QIcon::fromTheme("object-flip-vertical"),tr(""));

diff --git a/trunk/tests/mDictionaryTests/CommonDictInterfaceMock.h b/trunk/tests/mDictionaryTests/CommonDictInterfaceMock.h
index 20626f1..69116ac 100644 (file)
--- a/trunk/tests/mDictionaryTests/CommonDictInterfaceMock.h
+++ b/trunk/tests/mDictionaryTests/CommonDictInterfaceMock.h
@@ -60,14 +60,8 @@ public:
     QIcon* icon(){return 0;}
     QString search(QString key) {return "";}
     QList<Translation*> searchWordList(QString word, int limit) {
-        qDebug() << "search " << this->thread()->currentThreadId();
         stopped = 0;
         QList<Translation*> list;
-        qDebug() << "in MOOOCCCCCCCCK";
-        qDebug() << "in MOOOCCCCCCCCK";
-        qDebug() << "in MOOOCCCCCCCCK";
-        qDebug() << "in MOOOCCCCCCCCK";
-        qDebug() << "in MOOOCCCCCCCCK";
 
         TranslationMock *tm = new TranslationMock();
         tm->_key = langFrom();

diff --git a/trunk/tests/mDictionaryTests/mDictionaryTests.pro b/trunk/tests/mDictionaryTests/mDictionaryTests.pro
index 656bb4b..3d4b3d1 100644 (file)
--- a/trunk/tests/mDictionaryTests/mDictionaryTests.pro
+++ b/trunk/tests/mDictionaryTests/mDictionaryTests.pro
@@ -1,27 +1,20 @@
-#-------------------------------------------------
-#
+# -------------------------------------------------
 # Project created by QtCreator 2010-08-03T13:34:36
-#
-#-------------------------------------------------
-
-QT       += testlib core sql
-
-
+# -------------------------------------------------
+QT += testlib \
+    core \
+    sql
 TARGET = mDictionaryTests
-CONFIG   += console
-CONFIG   -= app_bundle
-
+CONFIG += console
+CONFIG -= app_bundle
 TEMPLATE = app
-
-
 SOURCES += tst_Backbone.cpp \
     ../../src/base/backbone/backbone.cpp \
     ../../src/base/backbone/History.cpp \
-    ../../src/base/backbone/Bookmarks.cpp
+    ../../src/base/backbone/Bookmarks.cpp \
+    ../../src/base/backbone/ConfigGenerator.cpp
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
-
-HEADERS += \
-    CommonDictInterfaceMock.h \
+HEADERS += CommonDictInterfaceMock.h \
     ../../src/base/backbone/backbone.h \
     ../../src/includes/translation.h \
     ../../src/includes/settings.h \
@@ -29,8 +22,8 @@ HEADERS += \
     ../../src/includes/History.h \
     TranslationMock.h \
     ../../src/base/backbone/BookmarkTranslations.h \
-    ../../src/base/backbone/Bookmarks.h
-
+    ../../src/base/backbone/Bookmarks.h \
+    ../../src/base/backbone/ConfigGenerator.h
 check.target = check
 check.commands += ./mDictionaryTests
 QMAKE_EXTRA_TARGETS += check

diff --git a/trunk/tests/mDictionaryTests/tst_Backbone.cpp b/trunk/tests/mDictionaryTests/tst_Backbone.cpp
index de754d2..38ef11e 100644 (file)
--- a/trunk/tests/mDictionaryTests/tst_Backbone.cpp
+++ b/trunk/tests/mDictionaryTests/tst_Backbone.cpp
@@ -147,8 +147,10 @@ void BackboneTest::stopSearchingTest() {
         QCOMPARE(m->stopped, 0);
     }
 
+    back->search("");
     back->stopSearching();
 
+
     for(int i = 0; i < total; i++) {
         CommonDictInterfaceMock *m = (CommonDictInterfaceMock*)dict[i];
         QCOMPARE(m->stopped, 1);
@@ -177,6 +179,7 @@ void BackboneTest::searchTest() {
     back->_searchDicts = 1;
 
     back->search(list);
+    sleep(1);
 
 
     for(int i = 0; i < total; i++) {
@@ -196,14 +199,14 @@ void BackboneTest::translationTest() {
     QTime time;
     time.start();
     QString list("nic");
+    back->_searchBookmarks = 0;
+    back->_searchDicts = 1;
     back->search(list);
-    qDebug() << "Time for backbone.search: " << time.elapsed();
-    usleep(1000);
-    time.start();
+    sleep(2);
+    qDebug() << back->result().size() << total;
     back->translationReady();
-    qDebug() << "Time for backbone->translation: " << time.elapsed();
+    qDebug() << back->result().size() << total;
 
-    QVERIFY2(translatS.count() == 1, "Lost finall 'ready()' signal");
     QVERIFY2(back->result().size() == total*2, "Lost some of the translations");
 }
 
@@ -220,6 +223,7 @@ void BackboneTest::quitTest() {
         QCOMPARE(m->stopped, 0);
     }
 
+    back->search("");
     back->quit();
 
     for(int i = 0; i < total; i++) {
@@ -230,7 +234,7 @@ void BackboneTest::quitTest() {
 }
 
 void BackboneTest::historyTest() {
-    History* history = back->history();
+    History* history = new History(10,this);
 
     history->add("mleko");