Added boilerplate to the base test class and some more to TestAbility

5 files changed, 87 insertions, 10 deletions

diff --git a/sigmod/test/CMakeLists.txt b/sigmod/test/CMakeLists.txt
index 4e927feb..a81bff9a 100644
--- a/sigmod/test/CMakeLists.txt
+++ b/sigmod/test/CMakeLists.txt
@@ -8,9 +8,11 @@ KDE4_ADD_LIBRARY(sigmodtest
 )
 TARGET_LINK_LIBRARIES(sigmodtest
     ${QT_QTCORE_LIBRARY}
+    sigmod
 )
 TARGET_LINK_LIBRARIES(sigmodtest LINK_INTERFACE_LIBRARIES
     ${QT_QTCORE_LIBRARY}
+    sigmod
 )
 
 SET(libraries
diff --git a/sigmod/test/TestAbility.cpp b/sigmod/test/TestAbility.cpp
index 8ca93371..30510bf0 100644
--- a/sigmod/test/TestAbility.cpp
+++ b/sigmod/test/TestAbility.cpp
@@ -18,31 +18,48 @@
 // Header include
 #include "TestAbility.h"
 
+// Sigmod includes
+#include "../Ability.h"
+#include "../Sigmod.h"
+
 // Qt includes
 #include <QtTest/QTest>
 
-void TestAbility::initTestCases()
+void TestAbility::initTestCase()
 {
-    TestSigmodObject::initTestCases();
+    TestSigmodObject::initTestCase();
+    
+    m_ability1 = m_sigmod->newAbility();
+    m_ability2 = m_sigmod->newAbility();
+    m_ability3 = m_sigmod->newAbility();
 }
 
-void TestAbility::cleanupTestCases()
+void TestAbility::cleanupTestCase()
 {
-    TestSigmodObject::cleanupTestCases();
+    TestSigmodObject::cleanupTestCase();
 }
 
 void TestAbility::init()
 {
+    makeConnections(m_ability1);
+    makeConnections(m_ability2);
+    makeConnections(m_ability3);
+    
     TestSigmodObject::init();
 }
 
 void TestAbility::cleanup()
 {
+    closeConnections(m_ability1);
+    closeConnections(m_ability2);
+    closeConnections(m_ability3);
+    
     TestSigmodObject::cleanup();
 }
 
 void TestAbility::validation()
 {
+    m_ability1->validate();
 }
 
 void TestAbility::saving()
@@ -55,26 +72,55 @@ void TestAbility::loading()
 
 void TestAbility::setName()
 {
+    
+    QCOMPARE(m_messages.size(), 0);
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 0);
 }
 
 void TestAbility::setPriority()
 {
+    
+    QCOMPARE(m_messages.size(), 0);
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 0);
 }
 
 void TestAbility::setDescription()
 {
+    
+    QCOMPARE(m_messages.size(), 0);
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 0);
 }
 
 void TestAbility::setBattleScript()
 {
+    QCOMPARE(m_ability1->battleScript(), Sigcore::Script());
+    
+    m_ability1->setBattleScript(Sigcore::Script("python", "import os"));
+    
+    QCOMPARE(m_ability1->battleScript(), Sigcore::Script("python", "import os"));
+    
+    QCOMPARE(m_messages.size(), 0);
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 0);
 }
 
 void TestAbility::setWorldScript()
 {
+    
+    QCOMPARE(m_messages.size(), 0);
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 0);
 }
 
 void TestAbility::setPriorityScript()
 {
+    
+    QCOMPARE(m_messages.size(), 0);
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 0);
 }
 
 void TestAbility::assignment()
diff --git a/sigmod/test/TestAbility.h b/sigmod/test/TestAbility.h
index 620a5dc6..f819f715 100644
--- a/sigmod/test/TestAbility.h
+++ b/sigmod/test/TestAbility.h
@@ -29,8 +29,8 @@ class TestAbility : public TestSigmodObject
     Q_OBJECT
     
     private slots:
-        void initTestCases();
-        void cleanupTestCases();
+        void initTestCase();
+        void cleanupTestCase();
         
         void init();
         void cleanup();
diff --git a/sigmod/test/TestSigmodObject.cpp b/sigmod/test/TestSigmodObject.cpp
index b0baa44d..6ea81d7f 100644
--- a/sigmod/test/TestSigmodObject.cpp
+++ b/sigmod/test/TestSigmodObject.cpp
@@ -18,6 +18,21 @@
 // Header include
 #include "TestSigmodObject.h"
 
+// Sigmod includes
+#include "../Sigmod.h"
+
+void TestSigmodObject::makeConnections(Sigmod::Object* object)
+{
+//     connect(object, SIGNAL(message(QString)), this, SLOT(message(QString)));
+//     connect(object, SIGNAL(warning(QString)), this, SLOT(warning(QString)));
+//     connect(object, SIGNAL(error(QString)), this, SLOT(error(QString)));
+}
+
+void TestSigmodObject::closeConnections(Sigmod::Object* object)
+{
+    disconnect(object, 0, this, 0);
+}
+
 void TestSigmodObject::message(const QString& message)
 {
     m_messages.append(message);
@@ -33,12 +48,14 @@ void TestSigmodObject::error(const QString& error)
     m_errors.append(error);
 }
 
-void TestSigmodObject::initTestCases()
+void TestSigmodObject::initTestCase()
 {
+    m_sigmod = new Sigmod::Sigmod;
 }
 
-void TestSigmodObject::cleanupTestCases()
+void TestSigmodObject::cleanupTestCase()
 {
+    delete m_sigmod;
 }
 
 void TestSigmodObject::init()
diff --git a/sigmod/test/TestSigmodObject.h b/sigmod/test/TestSigmodObject.h
index 9ec43f3a..80afc4b4 100644
--- a/sigmod/test/TestSigmodObject.h
+++ b/sigmod/test/TestSigmodObject.h
@@ -26,11 +26,23 @@
 #include <QtCore/QObject>
 #include <QtCore/QString>
 
+// Forward declarations
+namespace Sigmod
+{
+class Object;
+class Sigmod;
+}
+
 class SIGMODTEST_EXPORT TestSigmodObject : public QObject
 {
     Q_OBJECT
     
     protected:
+        void makeConnections(Sigmod::Object* object);
+        void closeConnections(Sigmod::Object* object);
+        
+        Sigmod::Sigmod* m_sigmod;
+        
         QList<QString> m_messages;
         QList<QString> m_warnings;
         QList<QString> m_errors;
@@ -39,8 +51,8 @@ class SIGMODTEST_EXPORT TestSigmodObject : public QObject
         void warning(const QString& warning);
         void error(const QString& warning);
         
-        virtual void initTestCases();
-        virtual void cleanupTestCases();
+        virtual void initTestCase();
+        virtual void cleanupTestCase();
         
         virtual void init();
         virtual void cleanup();