Fixed MapTrainer tests

1 files changed, 61 insertions, 31 deletions

diff --git a/sigmod/test/TestMapTrainer.cpp b/sigmod/test/TestMapTrainer.cpp
index f8ed1e3e..29ec2c17 100644
--- a/sigmod/test/TestMapTrainer.cpp
+++ b/sigmod/test/TestMapTrainer.cpp
@@ -68,13 +68,13 @@ void TestMapTrainer::validation()
     m_trainer1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
-    QCOMPARE(m_errors.size(), 3);
+    QCOMPARE(m_errors.size(), 4);
     
     m_trainer1->setName("Foo");
     m_trainer1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
-    QCOMPARE(m_errors.size(), 5);
+    QCOMPARE(m_errors.size(), 7);
     
     m_sigmod->newTrainer();
     
@@ -82,7 +82,7 @@ void TestMapTrainer::validation()
     m_trainer1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
-    QCOMPARE(m_errors.size(), 6);
+    QCOMPARE(m_errors.size(), 9);
     
     m_sigmod->map(0)->setWidth(25);
     m_sigmod->map(0)->setHeight(25);
@@ -91,7 +91,7 @@ void TestMapTrainer::validation()
     m_trainer1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
-    QCOMPARE(m_errors.size(), 7);
+    QCOMPARE(m_errors.size(), 11);
     
     m_sigmod->map(0)->setWidth(20);
     m_sigmod->map(0)->setHeight(20);
@@ -99,7 +99,7 @@ void TestMapTrainer::validation()
     m_trainer1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
-    QCOMPARE(m_errors.size(), 9);
+    QCOMPARE(m_errors.size(), 14);
     
     m_sigmod->map(0)->setWidth(25);
     m_sigmod->map(0)->setHeight(25);
@@ -107,7 +107,7 @@ void TestMapTrainer::validation()
     m_trainer1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
-    QCOMPARE(m_errors.size(), 10);
+    QCOMPARE(m_errors.size(), 16);
     
     m_sigmod->rules()->setMaxParty(6);
     m_sigmod->rules()->setMaxFight(6);
@@ -116,42 +116,56 @@ void TestMapTrainer::validation()
     m_trainer1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
-    QCOMPARE(m_errors.size(), 11);
+    QCOMPARE(m_errors.size(), 18);
     
     m_sigmod->rules()->setMaxFight(2);
     
     m_trainer1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
-    QCOMPARE(m_errors.size(), 13);
+    QCOMPARE(m_errors.size(), 21);
     
     m_sigmod->rules()->setMaxFight(6);
     m_trainer1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
-    QCOMPARE(m_errors.size(), 14);
+    QCOMPARE(m_errors.size(), 23);
     
     m_trainer1->newTeamMember();
     
-    m_trainer1->setLeadTeamMember(0);
+    m_trainer1->setLeadTeamMember(0, true);
     m_trainer1->validate();
     
-    QCOMPARE(m_warnings.size(), 0);
-    QCOMPARE(m_errors.size(), 14);
+    QCOMPARE(m_warnings.size(), 1);
+    QCOMPARE(m_errors.size(), 23);
     
     m_trainer1->deleteTeamMember(0);
     
     m_trainer1->validate();
     
-    QCOMPARE(m_warnings.size(), 0);
-    QCOMPARE(m_errors.size(), 15);
+    QCOMPARE(m_warnings.size(), 1);
+    QCOMPARE(m_errors.size(), 25);
     
     m_trainer1->newTeamMember();
     
     m_trainer1->validate();
     
-    QCOMPARE(m_warnings.size(), 0);
-    QCOMPARE(m_errors.size(), 15);
+    QCOMPARE(m_warnings.size(), 2);
+    QCOMPARE(m_errors.size(), 25);
+    
+    m_sigmod->rules()->setMaxFight(2);
+    m_trainer1->newTeamMember();
+    
+    m_trainer1->setLeadTeamMember(1, true);
+    m_trainer1->validate();
+    
+    QCOMPARE(m_warnings.size(), 3);
+    QCOMPARE(m_errors.size(), 26);
+    
+    m_sigmod->rules()->setMaxFight(2);
+    
+    QCOMPARE(m_warnings.size(), 3);
+    QCOMPARE(m_errors.size(), 26);
 }
 
 void TestMapTrainer::saving()
@@ -177,8 +191,10 @@ void TestMapTrainer::loading()
     m_trainer1->setPosition(QPoint(3, 3));
     m_trainer1->setNumberFight(1);
     m_trainer1->setScript(Sigcore::Script("python", "import os"));
-    m_trainer1->setLeadTeamMember(1);
-    
+    m_trainer1->setLeadTeamMember(0, false);
+    m_trainer1->setLeadTeamMember(1, false);
+    m_trainer1->setLeadTeamMember(2, true);
+
     QVERIFY(file.open(QIODevice::ReadOnly));
     QVERIFY(xml.setContent(&file));
     m_trainer1->load(xml.firstChildElement("MapTrainer"));
@@ -188,8 +204,10 @@ void TestMapTrainer::loading()
     QCOMPARE(m_trainer1->position(), QPoint(20, 20));
     QCOMPARE(m_trainer1->numberFight(), 3);
     QCOMPARE(m_trainer1->script(), Sigcore::Script());
-    QCOMPARE(m_trainer1->leadTeamMember(), 0);
-    QCOMPARE(m_trainer1->teamMemberCount(), 1);
+    QCOMPARE(m_trainer1->leadTeamMember(0), true);
+    QCOMPARE(m_trainer1->leadTeamMember(1), true);
+    QCOMPARE(m_trainer1->leadTeamMember(2), false);
+    QCOMPARE(m_trainer1->teamMemberCount(), 2);
 }
 
 void TestMapTrainer::setName()
@@ -250,6 +268,8 @@ void TestMapTrainer::setPosition()
 
 void TestMapTrainer::setNumberFight()
 {
+    m_sigmod->rules()->setMaxFight(4);
+    
     m_trainer2->setNumberFight(10);
     
     QCOMPARE(m_warnings.size(), 0);
@@ -281,43 +301,52 @@ void TestMapTrainer::setScript()
 
 void TestMapTrainer::setLeadTeamMember()
 {
-    m_trainer2->setLeadTeamMember(0);
+    m_sigmod->rules()->setMaxFight(1);
+    
+    m_trainer2->setLeadTeamMember(0, true);
     
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 1);
     
     m_trainer2->newTeamMember();
     
-    m_trainer2->setLeadTeamMember(0);
-    m_trainer2->setLeadTeamMember(0);
+    m_trainer2->setLeadTeamMember(0, true);
+    m_trainer2->setLeadTeamMember(0, true);
     
-    QCOMPARE(m_trainer2->leadTeamMember(), 0);
+    QCOMPARE(m_trainer2->leadTeamMember(0), true);
     
     QCOMPARE(m_changedCount, 1);
     
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 1);
+    
+    m_trainer2->newTeamMember();
+    
+    m_trainer2->setLeadTeamMember(1, true);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 2);
 }
 
 void TestMapTrainer::members()
 {
-    QCOMPARE(m_trainer2->newTeamMember()->id(), 1);
     QCOMPARE(m_trainer2->newTeamMember()->id(), 2);
     QCOMPARE(m_trainer2->newTeamMember()->id(), 3);
+    QCOMPARE(m_trainer2->newTeamMember()->id(), 4);
     
-    QCOMPARE(m_trainer2->teamMemberCount(), 4);
+    QCOMPARE(m_trainer2->teamMemberCount(), 5);
     
     m_trainer2->deleteTeamMember(0);
     
-    QCOMPARE(m_trainer2->teamMemberCount(), 3);
+    QCOMPARE(m_trainer2->teamMemberCount(), 4);
     
     QCOMPARE(m_trainer2->newTeamMember()->id(), 0);
     
-    QCOMPARE(m_trainer2->teamMemberIndex(0), 3);
+    QCOMPARE(m_trainer2->teamMemberIndex(0), 4);
     
     m_trainer2->deleteTeamMemberById(1);
     
-    QCOMPARE(m_trainer2->teamMemberIndex(0), 2);
+    QCOMPARE(m_trainer2->teamMemberIndex(0), 3);
     
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 0);
@@ -332,8 +361,9 @@ void TestMapTrainer::assignment()
     QCOMPARE(m_trainer3->position(), QPoint(20, 20));
     QCOMPARE(m_trainer3->numberFight(), 3);
     QCOMPARE(m_trainer3->script(), Sigcore::Script("python", "import os"));
-    QCOMPARE(m_trainer3->leadTeamMember(), 0);
-    QCOMPARE(m_trainer3->teamMemberCount(), 3);
+    QCOMPARE(m_trainer3->leadTeamMember(0), true);
+    QCOMPARE(m_trainer3->leadTeamMember(1), false);
+    QCOMPARE(m_trainer3->teamMemberCount(), 4);
 }
 
 QTEST_APPLESS_MAIN(TestMapTrainer)