[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [rocs] src: Cleanup and test if all standard plugins are loaded.
From:       Andreas Cord-Landwehr <cola () uni-paderborn ! de>
Date:       2012-04-30 19:25:45
Message-ID: 20120430192545.A2081A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 1f7599b0901884d956ad3afab15d04dd34f68097 by Andreas Cord-Landwehr.
Committed on 30/04/2012 at 21:21.
Pushed by cordlandwehr into branch 'master'.

Cleanup and test if all standard plugins are loaded.

M  +8    -9    src/Core/DataStructurePluginManager.cpp
M  +1    -1    src/Interface/DataPropertiesWidget.cpp
M  +1    -1    src/Interface/DataPropertiesWidget.ui
M  +21   -11   src/Tests/TestPlugins.cpp
M  +2    -0    src/Tests/TestPlugins.h

http://commits.kde.org/rocs/1f7599b0901884d956ad3afab15d04dd34f68097

diff --git a/src/Core/DataStructurePluginManager.cpp \
b/src/Core/DataStructurePluginManager.cpp index ae70127..bdf43a0 100644
--- a/src/Core/DataStructurePluginManager.cpp
+++ b/src/Core/DataStructurePluginManager.cpp
@@ -88,13 +88,14 @@ public:
     DataStructurePluginInterface* plugin(const QString &pluginName) {
         return  m_plugins.value(pluginName, 0);
     }
-    
+
     DataStructurePluginInterface* pluginByInternalName(const QString &pluginName){
-            foreach(DataStructurePluginInterface* plg, pluginList()){
-                    if (plg->internalName() == pluginName)
-                        return plg;
+        foreach(DataStructurePluginInterface* plg, pluginList()) {
+            if (plg->internalName() == pluginName) {
+                return plg;
             }
-            return 0;
+        }
+        return 0;
     }
 
     void setActivePlugin(const QString &pluginName) {
@@ -174,7 +175,7 @@ void DataStructurePluginManager::setDataStructurePlugin()
     if (actionIndex >= pluginsList().count()) {
         return;
     }
-    qDebug() << "Setting the data structure plugin to" << \
pluginsList().at(actionIndex)->name() ; +    kDebug() << "Setting the data structure \
plugin to" << pluginsList().at(actionIndex)->name() ;  \
setDataStructurePlugin(pluginsList().at(actionIndex)->name());  }
 
@@ -187,17 +188,15 @@ void DataStructurePluginManager::setDataStructurePlugin(const \
QString &pluginNam  return;
     }
 
-    qDebug() << "Setting " << pluginName << "As the active plugin for data \
structures."; +    kDebug() << "Setting " << pluginName << "As the active plugin for \
data structures.";  
     _d->setActivePlugin(pluginName);
     emit changingDataStructurePlugin(pluginName);
-
 }
 
 DataStructurePtr DataStructurePluginManager::changeToDataStructure(DataStructurePtr \
dataStructure, Document * parent)  {
     return _d->changeToDataStructure(dataStructure, parent);
-
 }
 
 DataStructurePtr DataStructurePluginManager::createNewDataStructure(Document* parent \
                , const QString & pluginName)
diff --git a/src/Interface/DataPropertiesWidget.cpp \
b/src/Interface/DataPropertiesWidget.cpp index b6992ce..909ace9 100644
--- a/src/Interface/DataPropertiesWidget.cpp
+++ b/src/Interface/DataPropertiesWidget.cpp
@@ -77,7 +77,7 @@ void DataPropertiesWidget::setData(DataPtr data)
     connect(ui->_dataType,     SIGNAL(activated(QString)),    this, \
                SLOT(setDataType(QString)));
     connect(ui->_color,		SIGNAL(activated(QColor)), this, \
                SLOT(colorChanged(QColor)));
     connect(ui->_addProperty,	SIGNAL(clicked(bool)), 	   this, SLOT(addProperty()));
-    
+
 
     GraphPropertiesModel *model = new GraphPropertiesModel();
     model->setDataSource(_data.get());
diff --git a/src/Interface/DataPropertiesWidget.ui \
b/src/Interface/DataPropertiesWidget.ui index eb9f1d1..caae9cd 100644
--- a/src/Interface/DataPropertiesWidget.ui
+++ b/src/Interface/DataPropertiesWidget.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
diff --git a/src/Tests/TestPlugins.cpp b/src/Tests/TestPlugins.cpp
index d9c80f8..c7af424 100644
--- a/src/Tests/TestPlugins.cpp
+++ b/src/Tests/TestPlugins.cpp
@@ -34,11 +34,22 @@ void TestPlugins::inittestcase()
     }
 }
 
+void TestPlugins::standardPluginsLoaded()
+{
+    QList<QString> pluginNames;
+    foreach (DataStructurePluginInterface* plugin, \
DataStructurePluginManager::self()->pluginsList()) { +         \
pluginNames.append(plugin->internalName()); +    }
+    QVERIFY2(pluginNames.contains("Graph"), "Could not found Graph plugin");
+    QVERIFY2(pluginNames.contains("Linked list"), "Could not found LinkedList \
plugin"); +    QVERIFY2(pluginNames.contains("RootedTree"), "Could not found Graph \
plugin"); +}
+
 void TestPlugins::createGraph()
 {
     DataStructurePluginInterface * pl = \
                DataStructurePluginManager::self()->plugin("Graph");
-    QVERIFY2(pl,"Graph plugin not found");
-    
+    QVERIFY2(pl,"Could create data structure of type Graph");
+
     DataStructurePluginManager::self()->setDataStructurePlugin(pl->name());
     Document doc("TestDocument");
     DataStructurePtr ds = doc.addDataStructure();
@@ -48,8 +59,8 @@ void TestPlugins::createGraph()
 void TestPlugins::createList()
 {
     DataStructurePluginInterface * pl = \
                DataStructurePluginManager::self()->plugin("Linked list");
-    QVERIFY2(pl,"Graph plugin not found");
-    
+    QVERIFY2(pl,"Could create data structure of type LinkedList");
+
     DataStructurePluginManager::self()->setDataStructurePlugin(pl->name());
     Document doc("TestDocument");
     DataStructurePtr ds = doc.addDataStructure();
@@ -59,8 +70,8 @@ void TestPlugins::createList()
 void TestPlugins::createRootedTree()
 {
     DataStructurePluginInterface * pl = \
                DataStructurePluginManager::self()->plugin("RootedTree");
-    QVERIFY2(pl,"Rooted tree plugin not found");
-    
+    QVERIFY2(pl,"Could create data structure of type RootedTree");
+
     DataStructurePluginManager::self()->setDataStructurePlugin(pl->name());
     Document doc("TestDocument");
     DataStructurePtr ds = doc.addDataStructure();
@@ -70,13 +81,13 @@ void TestPlugins::createRootedTree()
 void TestPlugins::convertGraphToLinkedList()
 {
     DataStructurePluginInterface * plGraph = \
                DataStructurePluginManager::self()->plugin("Graph");
-            
+
     QVERIFY2(plGraph,"Graph plugin not found");
-    
+
     DataStructurePluginInterface * plList = \
                DataStructurePluginManager::self()->plugin("Linked list");
-    
+
     QVERIFY2(plList,"Linked list plugin not found");
-    
+
     DataStructurePluginManager::self()->setDataStructurePlugin(plGraph->name());
     Document doc("TestDocument");
 //     connect(DSPluginManager::instance(), SIGNAL(changingDS(QString)), &doc, \
SLOT(convertToDS(QString))); @@ -95,7 +106,6 @@ void \
TestPlugins::convertGraphToLinkedList()  
     QCOMPARE(list->dataList().count(), 3);
     QCOMPARE(list->pointers().count(), 1);
-
 }
 
 QTEST_MAIN(TestPlugins)
diff --git a/src/Tests/TestPlugins.h b/src/Tests/TestPlugins.h
index 68b6eb1..6361e66 100644
--- a/src/Tests/TestPlugins.h
+++ b/src/Tests/TestPlugins.h
@@ -26,6 +26,8 @@ class TestPlugins : public QObject
 private slots:
     void inittestcase();
 
+    void standardPluginsLoaded();
+
     void createGraph();
     void createList();
     void createRootedTree();


[prev in list] [next in list] [prev in thread] [next in thread]