From 8d4564830fc742edbfa75b7e5b7331222a44a848 Mon Sep 17 00:00:00 2001
From: Bartosz Szatkowski <bulislaw@linux.com>
Date: Wed, 11 Aug 2010 12:27:03 +0200
Subject: [PATCH] Backbone test fixed

---
 trunk/src/base/backbone/backbone.cpp          |   35 ++++++++++++++++++++-----
 trunk/src/base/backbone/backbone.h            |    1 +
 trunk/tests/mDictionaryTests/tst_Backbone.cpp |    3 ++-
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/trunk/src/base/backbone/backbone.cpp b/trunk/src/base/backbone/backbone.cpp
index f5f535f..1335ae6 100644
--- a/trunk/src/base/backbone/backbone.cpp
+++ b/trunk/src/base/backbone/backbone.cpp
@@ -26,10 +26,14 @@
 
 void Backbone::init() {
    _interval = 250; //msec
-
-   _configPath = QDir::homePath() + "/.mdictionary/mdictionary.config";
-   _defaultConfigPath = QDir::homePath() + "/.mdictionary/mdictionary.defaults";
-   _pluginPath = "/usr/lib/mdictionary";
+   dryRun = false;
+
+   if(!_configPath.size())
+       _configPath = QDir::homePath() + "/.mdictionary/mdictionary.config";
+   if(!_defaultConfigPath.size())
+       _defaultConfigPath = QDir::homePath() + "/.mdictionary/mdictionary.defaults";
+   if(!_pluginPath.size())
+       _pluginPath = "/usr/lib/mdictionary";
    _historyLen = 10;
    _searchLimit = 15;
 
@@ -52,9 +56,11 @@ void Backbone::init() {
 Backbone::Backbone(QString pluginPath, QString configPath, QObject *parent)
     : QObject(parent)
 {
+    init();
+    dryRun = true;
     _pluginPath = pluginPath;
     _configPath = configPath;
-    init();
+    _defaultConfigPath = configPath;
 }
 
 
@@ -233,6 +239,8 @@ QStringList Backbone::getFilesFromDir(QString dir, QStringList nameFilter) {
 
 
 void Backbone::loadPlugins() {
+    if(dryRun)
+        return;
     QStringList nameFilter;
     nameFilter << "*.so";
     QStringList files = getFilesFromDir(_pluginPath, nameFilter);
@@ -263,6 +271,8 @@ CommonDictInterface* Backbone::plugin(QString type) {
 
 
 void Backbone::loadPrefs(QString fileName) {
+    if(dryRun)
+        return;
     QFileInfo file(QDir::toNativeSeparators(fileName));
     QDir confDir(file.dir());
     if(!confDir.exists()){
@@ -279,6 +289,8 @@ void Backbone::loadPrefs(QString fileName) {
 
 
 void Backbone::savePrefs(QSettings *set) {
+    if(dryRun)
+        return;
     set->setValue("general/plugin_path", _pluginPath);
     set->setValue("general/history_length", _historyLen);
     set->setValue("general/search_limit", _searchLimit);
@@ -287,6 +299,8 @@ void Backbone::savePrefs(QSettings *set) {
 
 
 void Backbone::saveDefaultPrefs(QSettings *set) {
+    if(dryRun)
+        return;
     set->setValue("general/plugin_path", _defaultPluginPath);
     set->setValue("general/history_length", _defaultHistoryLen);
     set->setValue("general/search_limit", _defaultSearchLimit);
@@ -295,6 +309,8 @@ void Backbone::saveDefaultPrefs(QSettings *set) {
 
 
 void Backbone::loadDicts(QString fileName, bool _default) {
+    if(dryRun)
+        return;
     QFileInfo file(QDir::toNativeSeparators(fileName));
     qDebug() << file.filePath();
     QDir confDir(file.dir());
@@ -336,6 +352,8 @@ void Backbone::loadDicts(QString fileName, bool _default) {
 
 
 void Backbone::dictUpdated() {
+    if(dryRun)
+        return;
     QFileInfo file(QDir::toNativeSeparators(_configPath));
     QDir confDir(file.dir());
     if(!confDir.exists())
@@ -352,17 +370,22 @@ void Backbone::dictUpdated() {
     savePrefs(&set);
     saveDefaultPrefs(&defSet);
 
-    foreach(CommonDictInterface* dict, _dicts.keys())
+    foreach(CommonDictInterface* dict, _dicts.keys()){
+        if(!dict || !dict->settings())
+            continue;
         if(!dict->settings()->keys().contains("_default_"))
             saveState(&set, dict->settings(), _dicts[dict], dict->hash());
         else
             saveState(&defSet, dict->settings(), _dicts[dict], dict->hash());
+    }
 }
 
 
 
 void Backbone::saveState(QSettings* set, Settings* plugSet, bool active
                          , uint hash) {
+    if(dryRun)
+        return;
     if(!set || !plugSet)
         return;
     QString section;
diff --git a/trunk/src/base/backbone/backbone.h b/trunk/src/base/backbone/backbone.h
index ff57196..52c3ff7 100644
--- a/trunk/src/base/backbone/backbone.h
+++ b/trunk/src/base/backbone/backbone.h
@@ -162,6 +162,7 @@ private:
     int _activeSearchNum;
     int _interval; //Search fetching timer.timeout interval in msec
     int _historyLen, _defaultHistoryLen;
+    bool dryRun;
 
     void init();
     QStringList getFilesFromDir(QString dir, QStringList nameFilter);
diff --git a/trunk/tests/mDictionaryTests/tst_Backbone.cpp b/trunk/tests/mDictionaryTests/tst_Backbone.cpp
index cf998e2..7aae8a6 100644
--- a/trunk/tests/mDictionaryTests/tst_Backbone.cpp
+++ b/trunk/tests/mDictionaryTests/tst_Backbone.cpp
@@ -75,7 +75,8 @@ void BackboneTest::init()
         cd->namev = QString("name%1").arg(i);
         cd->typev = QString("type%1").arg(i);
     }
-    back = new Backbone("vim");
+    back = new Backbone("empty","empty");
+    qDebug() << back->getDictionaries().size();
     addDicts();
 }
 
-- 
1.7.9.5