Fixed Species test for changes

2 files changed, 110 insertions, 30 deletions

diff --git a/sigmod/test/TestSpecies.cpp b/sigmod/test/TestSpecies.cpp
index 0cc7960f..6ddbe38c 100644
--- a/sigmod/test/TestSpecies.cpp
+++ b/sigmod/test/TestSpecies.cpp
@@ -22,8 +22,6 @@
 #include "../Rules.h"
 #include "../Sigmod.h"
 #include "../Species.h"
-#include "../SpeciesAbility.h"
-#include "../SpeciesItem.h"
 #include "../SpeciesMove.h"
 
 // Qt includes
@@ -285,7 +283,9 @@ void TestSpecies::validation()
     QCOMPARE(m_warnings.size(), 1);
     QCOMPARE(m_errors.size(), 117);
     
-    m_species1->newAbility();
+    m_sigmod->newAbility();
+    
+    m_species1->setAbility(0, 1);
     m_species1->validate();
     
     QCOMPARE(m_warnings.size(), 1);
@@ -298,7 +298,9 @@ void TestSpecies::validation()
     QCOMPARE(m_warnings.size(), 2);
     QCOMPARE(m_errors.size(), 119);
     
-    m_species1->newItem();
+    m_sigmod->newItem();
+    
+    m_species1->setItem(0, 1);
     m_species1->validate();
     
     QCOMPARE(m_warnings.size(), 2);
@@ -375,6 +377,8 @@ void TestSpecies::loading()
     m_species1->setEggGroup(0, false);
     m_species1->setEggGroup(1, true);
     m_species1->setEvolution(Sigcore::Script("python", "import os"));
+    m_species1->setAbility(0, 0);
+    m_species1->setItem(0, 0);
     
     QVERIFY(file.open(QIODevice::ReadOnly));
     QVERIFY(xml.setContent(&file));
@@ -417,6 +421,8 @@ void TestSpecies::loading()
     QCOMPARE(m_species1->eggGroup(0), true);
     QCOMPARE(m_species1->eggGroup(1), false);
     QCOMPARE(m_species1->evolution(), Sigcore::Script());
+    QCOMPARE(m_species1->ability(0), 1);
+    QCOMPARE(m_species1->item(0), 1);
 }
 
 void TestSpecies::setName()
@@ -1146,52 +1152,124 @@ void TestSpecies::setEggGroup()
     QCOMPARE(m_errors.size(), 0);
 }
 
-void TestSpecies::abilities()
+void TestSpecies::setAbility()
 {
-    QCOMPARE(m_species2->newAbility()->id(), 0);
-    QCOMPARE(m_species2->newAbility()->id(), 1);
-    QCOMPARE(m_species2->newAbility()->id(), 2);
+    m_sigmod->newAbility();
     
-    QCOMPARE(m_species2->abilityCount(), 3);
+    m_species2->setAbility(0, 1);
+    m_species2->setAbility(0, 1);
     
-    m_species2->deleteAbility(0);
+    QCOMPARE(m_species2->ability(0), 1);
     
-    QCOMPARE(m_species2->abilityCount(), 2);
+    QCOMPARE(m_changedCount, 1);
     
-    QCOMPARE(m_species2->newAbility()->id(), 0);
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 0);
     
-    QCOMPARE(m_species2->abilityIndex(0), 2);
+    m_species2->setAbility(0, 0);
     
-    m_species2->deleteAbilityById(1);
+    QCOMPARE(m_species2->ability().size(), 0);
     
-    QCOMPARE(m_species2->abilityIndex(0), 1);
+    QCOMPARE(m_changedCount, 2);
     
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 0);
+    
+    m_species2->setAbility(2, 1);
+    
+    QCOMPARE(m_species2->ability().size(), 0);
+    
+    QCOMPARE(m_changedCount, 2);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 1);
+    
+    m_species2->setAbility(1, -1);
+    
+    QCOMPARE(m_species2->ability(1), 0);
+        
+    QCOMPARE(m_changedCount, 2);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 2);
+    
+    m_species2->setAbility(1, 2);
+    
+    QCOMPARE(m_species2->ability(1), 2);
+        
+    QCOMPARE(m_changedCount, 3);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 2);
+    
+    m_species2->setAbility(0, 1);
+    
+    QCOMPARE(m_species2->ability(0), 1);
+        
+    QCOMPARE(m_changedCount, 4);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 2);
 }
 
-void TestSpecies::items()
+void TestSpecies::setItem()
 {
-    QCOMPARE(m_species2->newItem()->id(), 0);
-    QCOMPARE(m_species2->newItem()->id(), 1);
-    QCOMPARE(m_species2->newItem()->id(), 2);
+    m_sigmod->newItem();
     
-    QCOMPARE(m_species2->itemCount(), 3);
+    m_species2->setItem(0, 1);
+    m_species2->setItem(0, 1);
     
-    m_species2->deleteItem(0);
+    QCOMPARE(m_species2->item(0), 1);
     
-    QCOMPARE(m_species2->itemCount(), 2);
+    QCOMPARE(m_changedCount, 1);
     
-    QCOMPARE(m_species2->newItem()->id(), 0);
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 0);
     
-    QCOMPARE(m_species2->itemIndex(0), 2);
+    m_species2->setItem(0, 0);
     
-    m_species2->deleteItemById(1);
+    QCOMPARE(m_species2->item().size(), 0);
     
-    QCOMPARE(m_species2->itemIndex(0), 1);
+    QCOMPARE(m_changedCount, 2);
     
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 0);
+    
+    m_species2->setItem(2, 1);
+    
+    QCOMPARE(m_species2->item().size(), 0);
+    
+    QCOMPARE(m_changedCount, 2);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 1);
+    
+    m_species2->setItem(1, -1);
+    
+    QCOMPARE(m_species2->item(1), 0);
+        
+    QCOMPARE(m_changedCount, 2);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 2);
+    
+    m_species2->setItem(1, 2);
+    
+    QCOMPARE(m_species2->item(1), 2);
+        
+    QCOMPARE(m_changedCount, 3);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 2);
+    
+    m_species2->setItem(0, 1);
+    
+    QCOMPARE(m_species2->item(0), 1);
+        
+    QCOMPARE(m_changedCount, 4);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 2);
 }
 
 void TestSpecies::moves()
@@ -1276,8 +1354,10 @@ void TestSpecies::assignment()
     QCOMPARE(m_species3->eggGroup(1), false);
     QCOMPARE(m_species3->eggGroup(2), false);
     QCOMPARE(m_species3->evolution(), Sigcore::Script("python", "import os"));
-    QCOMPARE(m_species3->abilityCount(), 2);
-    QCOMPARE(m_species3->itemCount(), 2);
+    QCOMPARE(m_species3->ability(0), 1);
+    QCOMPARE(m_species3->ability(1), 2);
+    QCOMPARE(m_species3->item(0), 1);
+    QCOMPARE(m_species3->item(1), 2);
     QCOMPARE(m_species3->moveCount(), 2);
 }
 
diff --git a/sigmod/test/TestSpecies.h b/sigmod/test/TestSpecies.h
index 887069b5..d9970e22 100644
--- a/sigmod/test/TestSpecies.h
+++ b/sigmod/test/TestSpecies.h
@@ -64,9 +64,9 @@ class TestSpecies : public TestSigmodObject
         void setType();
         void setEggGroup();
         void setEvolution();
+        void setAbility();
+        void setItem();
         
-        void abilities();
-        void items();
         void moves();
         
         void assignment();