1 files changed, 50 insertions, 4 deletions

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()