Added more tests for Rules and fixes for numBoxes and boxSize

2 files changed, 206 insertions, 20 deletions

diff --git a/sigmod/test/TestRules.cpp b/sigmod/test/TestRules.cpp
index 6d29fe9b..e9971469 100644
--- a/sigmod/test/TestRules.cpp
+++ b/sigmod/test/TestRules.cpp
@@ -144,6 +144,192 @@ void TestRules::loading()
     QCOMPARE(m_rules1->maxEVPerStat(), 0);
 }
 
+void TestRules::setGenderAllowed()
+{
+    m_rules2->setGenderAllowed(true);
+    m_rules2->setGenderAllowed(true);
+    
+    QCOMPARE(m_rules2->genderAllowed(), true);
+    
+    QCOMPARE(m_changedCount, 1);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 0);
+}
+
+void TestRules::setBreedingAllowed()
+{
+    m_rules2->setGenderAllowed(false);
+    
+    QCOMPARE(m_changedCount, 1);
+    
+    m_rules2->setBreedingAllowed(true);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 1);
+    
+    m_rules2->setGenderAllowed(true);
+    
+    QCOMPARE(m_changedCount, 2);
+    
+    m_rules2->setBreedingAllowed(true);
+    m_rules2->setBreedingAllowed(true);
+    
+    QCOMPARE(m_rules2->breedingAllowed(), true);
+    
+    QCOMPARE(m_changedCount, 3);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 1);
+}
+
+void TestRules::setCriticalDomains()
+{
+    m_rules2->setCriticalDomains(true);
+    m_rules2->setCriticalDomains(true);
+    
+    QCOMPARE(m_rules2->criticalDomains(), true);
+    
+    QCOMPARE(m_changedCount, 1);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 0);
+}
+
+void TestRules::setUseTurns()
+{
+    m_rules2->setUseTurns(false);
+    m_rules2->setUseTurns(false);
+    
+    QCOMPARE(m_rules2->useTurns(), false);
+    
+    QCOMPARE(m_changedCount, 1);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 0);
+}
+
+void TestRules::setPausedATB()
+{
+    m_rules2->setUseTurns(true);
+    
+    QCOMPARE(m_changedCount, 1);
+    
+    m_rules2->setPausedATB(true);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 1);
+    
+    m_rules2->setUseTurns(false);
+    
+    QCOMPARE(m_changedCount, 2);
+    
+    m_rules2->setPausedATB(true);
+    m_rules2->setPausedATB(true);
+    
+    QCOMPARE(m_rules2->pausedATB(), true);
+    
+    QCOMPARE(m_changedCount, 3);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 1);
+}
+
+void TestRules::setNumBoxes()
+{
+    m_rules2->setNumBoxes(-1);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 1);
+    
+    m_rules2->setNumBoxes(5);
+    m_rules2->setNumBoxes(5);
+    
+    QCOMPARE(m_rules2->numBoxes(), 5);
+    
+    QCOMPARE(m_changedCount, 1);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 1);
+}
+
+void TestRules::setBoxSize()
+{
+    m_rules2->setBoxSize(0);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 1);
+    
+    m_rules2->setBoxSize(5);
+    m_rules2->setBoxSize(5);
+    
+    QCOMPARE(m_rules2->boxSize(), 5);
+    
+    QCOMPARE(m_changedCount, 1);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 1);
+}
+
+void TestRules::setMaxParty()
+{
+    m_rules2->setMaxParty(0);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 1);
+
+    m_rules2->setMaxParty(5);
+    m_rules2->setMaxParty(5);
+    
+    QCOMPARE(m_rules2->maxParty(), 5);
+    
+    QCOMPARE(m_changedCount, 1);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 1);
+}
+
+void TestRules::setMaxFight()
+{
+    m_rules2->setMaxFight(0);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 1);
+
+    m_rules2->setMaxFight(6);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 2);
+
+    m_rules2->setMaxFight(2);
+    m_rules2->setMaxFight(2);
+    
+    QCOMPARE(m_rules2->maxFight(), 2);
+    
+    QCOMPARE(m_changedCount, 1);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 2);
+}
+
+void TestRules::setMaxPlayers()
+{
+    m_rules2->setMaxPlayers(1);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 1);
+
+    m_rules2->setMaxPlayers(3);
+    m_rules2->setMaxPlayers(3);
+    
+    QCOMPARE(m_rules2->maxPlayers(), 3);
+    
+    QCOMPARE(m_changedCount, 1);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 1);
+}
+
 // void TestRules::set()
 // {
 //     m_rules2->set();
@@ -161,16 +347,16 @@ void TestRules::assignment()
 {
     *m_rules3 = *m_rules2;
     
-//     QCOMPARE(m_rules3->genderAllowed(), );
-//     QCOMPARE(m_rules3->breedingAllowed(), );
-//     QCOMPARE(m_rules3->criticalDomains(), );
-//     QCOMPARE(m_rules3->useTurns(), );
-//     QCOMPARE(m_rules3->pausedATB(), );
-//     QCOMPARE(m_rules3->numBoxes(), );
-//     QCOMPARE(m_rules3->boxSize(), );
-//     QCOMPARE(m_rules3->maxParty(), );
-//     QCOMPARE(m_rules3->maxFight(), );
-//     QCOMPARE(m_rules3->maxPlayers(), );
+    QCOMPARE(m_rules3->genderAllowed(), true);
+    QCOMPARE(m_rules3->breedingAllowed(), true);
+    QCOMPARE(m_rules3->criticalDomains(), true);
+    QCOMPARE(m_rules3->useTurns(), false);
+    QCOMPARE(m_rules3->pausedATB(), true);
+    QCOMPARE(m_rules3->numBoxes(), 5);
+    QCOMPARE(m_rules3->boxSize(), 5);
+    QCOMPARE(m_rules3->maxParty(), 5);
+    QCOMPARE(m_rules3->maxFight(), 2);
+    QCOMPARE(m_rules3->maxPlayers(), 3);
 //     QCOMPARE(m_rules3->maxHeldItems(), );
 //     QCOMPARE(m_rules3->maxAbilities(), );
 //     QCOMPARE(m_rules3->maxNatures(), );
diff --git a/sigmod/test/TestRules.h b/sigmod/test/TestRules.h
index 44dff2e5..c538e116 100644
--- a/sigmod/test/TestRules.h
+++ b/sigmod/test/TestRules.h
@@ -39,16 +39,16 @@ class TestRules : public TestSigmodObject
         void saving();
         void loading();
         
-//         void setGenderAllowed();
-//         void setBreedingAllowed();
-//         void setCriticalDomains();
-//         void setUseTurns();
-//         void setPausedATB();
-//         void setNumBoxes();
-//         void setBoxSize();
-//         void setMaxParty();
-//         void setMaxFight();
-//         void setMaxPlayers();
+        void setGenderAllowed();
+        void setBreedingAllowed();
+        void setCriticalDomains();
+        void setUseTurns();
+        void setPausedATB();
+        void setNumBoxes();
+        void setBoxSize();
+        void setMaxParty();
+        void setMaxFight();
+        void setMaxPlayers();
 //         void setMaxHeldItems();
 //         void setMaxAbilities();
 //         void setMaxNatures();