Fixed sigmod tests to also use namespace Sigmod

1 files changed, 29 insertions, 26 deletions

diff --git a/sigmod/test/TestMapTrainer.cpp b/sigmod/test/TestMapTrainer.cpp
index 29ec2c17..80127756 100644
--- a/sigmod/test/TestMapTrainer.cpp
+++ b/sigmod/test/TestMapTrainer.cpp
@@ -19,21 +19,24 @@
 #include "TestMapTrainer.h"
 
 // Sigmod includes
+#include "../Game.h"
 #include "../Map.h"
 #include "../MapTrainer.h"
 #include "../MapTrainerTeamMember.h"
 #include "../Rules.h"
-#include "../Sigmod.h"
 
 // Qt includes
 #include <QtCore/QFile>
 #include <QtTest/QTest>
 
+using namespace Sigcore;
+using namespace Sigmod;
+
 void TestMapTrainer::initTestCase()
 {
     TestSigmodObject::initTestCase();
     
-    Sigmod::Map* map = m_sigmod->newMap();
+    Map* map = m_game->newMap();
     
     m_trainer1 = map->newTrainer();
     m_trainer2 = map->newTrainer();
@@ -76,7 +79,7 @@ void TestMapTrainer::validation()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 7);
     
-    m_sigmod->newTrainer();
+    m_game->newTrainer();
     
     m_trainer1->setTrainerClass(0);
     m_trainer1->validate();
@@ -84,8 +87,8 @@ void TestMapTrainer::validation()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 9);
     
-    m_sigmod->map(0)->setWidth(25);
-    m_sigmod->map(0)->setHeight(25);
+    m_game->map(0)->setWidth(25);
+    m_game->map(0)->setHeight(25);
     
     m_trainer1->setPosition(QPoint(20, 20));
     m_trainer1->validate();
@@ -93,24 +96,24 @@ void TestMapTrainer::validation()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 11);
     
-    m_sigmod->map(0)->setWidth(20);
-    m_sigmod->map(0)->setHeight(20);
+    m_game->map(0)->setWidth(20);
+    m_game->map(0)->setHeight(20);
     
     m_trainer1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 14);
     
-    m_sigmod->map(0)->setWidth(25);
-    m_sigmod->map(0)->setHeight(25);
+    m_game->map(0)->setWidth(25);
+    m_game->map(0)->setHeight(25);
     
     m_trainer1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 16);
     
-    m_sigmod->rules()->setMaxParty(6);
-    m_sigmod->rules()->setMaxFight(6);
+    m_game->rules()->setMaxParty(6);
+    m_game->rules()->setMaxFight(6);
     
     m_trainer1->setNumberFight(3);
     m_trainer1->validate();
@@ -118,14 +121,14 @@ void TestMapTrainer::validation()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 18);
     
-    m_sigmod->rules()->setMaxFight(2);
+    m_game->rules()->setMaxFight(2);
     
     m_trainer1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 21);
     
-    m_sigmod->rules()->setMaxFight(6);
+    m_game->rules()->setMaxFight(6);
     m_trainer1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
@@ -153,7 +156,7 @@ void TestMapTrainer::validation()
     QCOMPARE(m_warnings.size(), 2);
     QCOMPARE(m_errors.size(), 25);
     
-    m_sigmod->rules()->setMaxFight(2);
+    m_game->rules()->setMaxFight(2);
     m_trainer1->newTeamMember();
     
     m_trainer1->setLeadTeamMember(1, true);
@@ -162,7 +165,7 @@ void TestMapTrainer::validation()
     QCOMPARE(m_warnings.size(), 3);
     QCOMPARE(m_errors.size(), 26);
     
-    m_sigmod->rules()->setMaxFight(2);
+    m_game->rules()->setMaxFight(2);
     
     QCOMPARE(m_warnings.size(), 3);
     QCOMPARE(m_errors.size(), 26);
@@ -170,7 +173,7 @@ void TestMapTrainer::validation()
 
 void TestMapTrainer::saving()
 {
-    QDomDocument xml = Sigmod::Object::xml(m_trainer1);
+    QDomDocument xml = Object::xml(m_trainer1);
     QFile file("mapTrainer.xml");
     
     QVERIFY(file.open(QIODevice::WriteOnly));
@@ -183,14 +186,14 @@ void TestMapTrainer::loading()
     QDomDocument xml;
     QFile file("mapTrainer.xml");
     
-    m_sigmod->newTrainer();
+    m_game->newTrainer();
     m_trainer1->newTeamMember();
     
     m_trainer1->setName("Bar");
     m_trainer1->setTrainerClass(1);
     m_trainer1->setPosition(QPoint(3, 3));
     m_trainer1->setNumberFight(1);
-    m_trainer1->setScript(Sigcore::Script("python", "import os"));
+    m_trainer1->setScript(Script("python", "import os"));
     m_trainer1->setLeadTeamMember(0, false);
     m_trainer1->setLeadTeamMember(1, false);
     m_trainer1->setLeadTeamMember(2, true);
@@ -203,7 +206,7 @@ void TestMapTrainer::loading()
     QCOMPARE(m_trainer1->trainerClass(), 0);
     QCOMPARE(m_trainer1->position(), QPoint(20, 20));
     QCOMPARE(m_trainer1->numberFight(), 3);
-    QCOMPARE(m_trainer1->script(), Sigcore::Script());
+    QCOMPARE(m_trainer1->script(), Script());
     QCOMPARE(m_trainer1->leadTeamMember(0), true);
     QCOMPARE(m_trainer1->leadTeamMember(1), true);
     QCOMPARE(m_trainer1->leadTeamMember(2), false);
@@ -230,7 +233,7 @@ void TestMapTrainer::setTrainerClass()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 1);
     
-    m_sigmod->newTrainer();
+    m_game->newTrainer();
     
     m_trainer2->setTrainerClass(2);
     m_trainer2->setTrainerClass(2);
@@ -268,7 +271,7 @@ void TestMapTrainer::setPosition()
 
 void TestMapTrainer::setNumberFight()
 {
-    m_sigmod->rules()->setMaxFight(4);
+    m_game->rules()->setMaxFight(4);
     
     m_trainer2->setNumberFight(10);
     
@@ -288,10 +291,10 @@ void TestMapTrainer::setNumberFight()
 
 void TestMapTrainer::setScript()
 {
-    m_trainer2->setScript(Sigcore::Script("python", "import os"));
-    m_trainer2->setScript(Sigcore::Script("python", "import os"));
+    m_trainer2->setScript(Script("python", "import os"));
+    m_trainer2->setScript(Script("python", "import os"));
     
-    QCOMPARE(m_trainer2->script(), Sigcore::Script("python", "import os"));
+    QCOMPARE(m_trainer2->script(), Script("python", "import os"));
     
     QCOMPARE(m_changedCount, 1);
     
@@ -301,7 +304,7 @@ void TestMapTrainer::setScript()
 
 void TestMapTrainer::setLeadTeamMember()
 {
-    m_sigmod->rules()->setMaxFight(1);
+    m_game->rules()->setMaxFight(1);
     
     m_trainer2->setLeadTeamMember(0, true);
     
@@ -360,7 +363,7 @@ void TestMapTrainer::assignment()
     QCOMPARE(m_trainer3->trainerClass(), 2);
     QCOMPARE(m_trainer3->position(), QPoint(20, 20));
     QCOMPARE(m_trainer3->numberFight(), 3);
-    QCOMPARE(m_trainer3->script(), Sigcore::Script("python", "import os"));
+    QCOMPARE(m_trainer3->script(), Script("python", "import os"));
     QCOMPARE(m_trainer3->leadTeamMember(0), true);
     QCOMPARE(m_trainer3->leadTeamMember(1), false);
     QCOMPARE(m_trainer3->teamMemberCount(), 4);