Fix up the test for MapTrainer to work with the new leadTeamMember methods

(cherry picked from commit 42825f61ed1a27b2642d5962683e456794347035)

1 files changed, 22 insertions, 7 deletions

diff --git a/sigmod/test/TestMapTrainer.cpp b/sigmod/test/TestMapTrainer.cpp
index 80127756..a17ab494 100644
--- a/sigmod/test/TestMapTrainer.cpp
+++ b/sigmod/test/TestMapTrainer.cpp
@@ -278,10 +278,10 @@ void TestMapTrainer::setNumberFight()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 1);
     
-    m_trainer2->setNumberFight(3);
-    m_trainer2->setNumberFight(3);
+    m_trainer2->setNumberFight(2);
+    m_trainer2->setNumberFight(2);
     
-    QCOMPARE(m_trainer2->numberFight(), 3);
+    QCOMPARE(m_trainer2->numberFight(), 2);
     
     QCOMPARE(m_changedCount, 1);
     
@@ -304,7 +304,9 @@ void TestMapTrainer::setScript()
 
 void TestMapTrainer::setLeadTeamMember()
 {
-    m_game->rules()->setMaxFight(1);
+    m_trainer2->setNumberFight(1);
+    
+    QCOMPARE(m_changedCount, 1);
     
     m_trainer2->setLeadTeamMember(0, true);
     
@@ -318,7 +320,7 @@ void TestMapTrainer::setLeadTeamMember()
     
     QCOMPARE(m_trainer2->leadTeamMember(0), true);
     
-    QCOMPARE(m_changedCount, 1);
+    QCOMPARE(m_changedCount, 2);
     
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 1);
@@ -329,6 +331,19 @@ void TestMapTrainer::setLeadTeamMember()
     
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 2);
+    
+    m_trainer2->setNumberFight(2);
+    
+    QCOMPARE(m_changedCount, 3);
+    
+    m_trainer2->setLeadTeamMember(1, true);
+    
+    QCOMPARE(m_trainer2->leadTeamMember(1), true);
+    
+    QCOMPARE(m_changedCount, 4);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 2);
 }
 
 void TestMapTrainer::members()
@@ -362,10 +377,10 @@ void TestMapTrainer::assignment()
     QCOMPARE(m_trainer3->name(), QString("Foo"));
     QCOMPARE(m_trainer3->trainerClass(), 2);
     QCOMPARE(m_trainer3->position(), QPoint(20, 20));
-    QCOMPARE(m_trainer3->numberFight(), 3);
+    QCOMPARE(m_trainer3->numberFight(), 2);
     QCOMPARE(m_trainer3->script(), Script("python", "import os"));
     QCOMPARE(m_trainer3->leadTeamMember(0), true);
-    QCOMPARE(m_trainer3->leadTeamMember(1), false);
+    QCOMPARE(m_trainer3->leadTeamMember(1), true);
     QCOMPARE(m_trainer3->teamMemberCount(), 4);
 }