Added type and egg group tests to Species

2 files changed, 91 insertions, 33 deletions

diff --git a/sigmod/test/TestSpecies.cpp b/sigmod/test/TestSpecies.cpp
index 2bc39e19..32aaf57d 100644
--- a/sigmod/test/TestSpecies.cpp
+++ b/sigmod/test/TestSpecies.cpp
@@ -879,31 +879,89 @@ void TestSpecies::setEggSteps()
     QCOMPARE(m_errors.size(), 1);
 }
 
-// void TestSpecies::setType()
-// {
-//     m_species2->set();
-//     m_species2->set();
-//     
-//     QCOMPARE(m_species2->(), );
-//     
-//     QCOMPARE(m_changedCount, 1);
-//     
-//     QCOMPARE(m_warnings.size(), 0);
-//     QCOMPARE(m_errors.size(), 0);
-// }
-// 
-// void TestSpecies::setEggGroup()
-// {
-//     m_species2->set();
-//     m_species2->set();
-//     
-//     QCOMPARE(m_species2->(), );
-//     
-//     QCOMPARE(m_changedCount, 1);
-//     
-//     QCOMPARE(m_warnings.size(), 0);
-//     QCOMPARE(m_errors.size(), 0);
-// }
+void TestSpecies::setType()
+{
+    m_sigmod->newType();
+    
+    m_species2->setType(0, true);
+    m_species2->setType(0, true);
+    
+    QCOMPARE(m_species2->type(0), true);
+    
+    QCOMPARE(m_changedCount, 1);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 0);
+    
+    m_species2->setType(1, true);
+    
+    QCOMPARE(m_species2->type(1), true);
+    
+    QCOMPARE(m_changedCount, 2);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 0);
+    
+    m_species2->setType(1, false);
+    
+    QCOMPARE(m_species2->type(1), false);
+        
+    QCOMPARE(m_changedCount, 3);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 0);
+    
+    m_species2->setType(2, false);
+    
+    QCOMPARE(m_species2->type(2), false);
+        
+    QCOMPARE(m_changedCount, 3);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 0);
+}
+
+void TestSpecies::setEggGroup()
+{
+    m_sigmod->newEggGroup();
+    
+    m_species2->setEggGroup(0, true);
+    m_species2->setEggGroup(0, true);
+    
+    QCOMPARE(m_species2->eggGroup(0), true);
+    
+    QCOMPARE(m_changedCount, 1);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 0);
+    
+    m_species2->setEggGroup(1, true);
+    
+    QCOMPARE(m_species2->eggGroup(1), true);
+    
+    QCOMPARE(m_changedCount, 2);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 0);
+    
+    m_species2->setEggGroup(1, false);
+    
+    QCOMPARE(m_species2->eggGroup(1), false);
+        
+    QCOMPARE(m_changedCount, 3);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 0);
+    
+    m_species2->setEggGroup(2, false);
+    
+    QCOMPARE(m_species2->eggGroup(2), false);
+        
+    QCOMPARE(m_changedCount, 3);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 0);
+}
 
 void TestSpecies::abilities()
 {
@@ -1026,12 +1084,12 @@ void TestSpecies::assignment()
     QCOMPARE(m_species3->genderFactor(), Sigcore::Fraction(1, 4));
     QCOMPARE(m_species3->eggSpecies(), 2);
     QCOMPARE(m_species3->eggSteps(), 1000);
-//     QCOMPARE(m_species3->type(), );
-//     QCOMPARE(m_species3->type(), );
-//     QCOMPARE(m_species3->type(), );
-//     QCOMPARE(m_species3->eggGroup(), );
-//     QCOMPARE(m_species3->eggGroup(), );
-//     QCOMPARE(m_species3->eggGroup(), );
+    QCOMPARE(m_species3->type(0), true);
+    QCOMPARE(m_species3->type(1), false);
+    QCOMPARE(m_species3->type(2), false);
+    QCOMPARE(m_species3->eggGroup(0), true);
+    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);
diff --git a/sigmod/test/TestSpecies.h b/sigmod/test/TestSpecies.h
index 3e984c2d..764f3912 100644
--- a/sigmod/test/TestSpecies.h
+++ b/sigmod/test/TestSpecies.h
@@ -61,8 +61,8 @@ class TestSpecies : public TestSigmodObject
         void setSkin();
         void setEggSpecies();
         void setEggSteps();
-//         void setType();
-//         void setEggGroup();
+        void setType();
+        void setEggGroup();
         void setEvolution();
         
         void abilities();