Fixed sigmod tests to also use namespace Sigmod

1 files changed, 40 insertions, 38 deletions

diff --git a/sigmod/test/TestTrainer.cpp b/sigmod/test/TestTrainer.cpp
index 36775116..092e3490 100644
--- a/sigmod/test/TestTrainer.cpp
+++ b/sigmod/test/TestTrainer.cpp
@@ -19,20 +19,22 @@
 #include "TestTrainer.h"
 
 // Sigmod includes
-#include "../Sigmod.h"
+#include "../Game.h"
 #include "../Trainer.h"
 
 // Qt includes
 #include <QtCore/QFile>
 #include <QtTest/QTest>
 
+using namespace Sigmod;
+
 void TestTrainer::initTestCase()
 {
     TestSigmodObject::initTestCase();
     
-    m_trainer1 = m_sigmod->newTrainer();
-    m_trainer2 = m_sigmod->newTrainer();
-    m_trainer3 = m_sigmod->newTrainer();
+    m_trainer1 = m_game->newTrainer();
+    m_trainer2 = m_game->newTrainer();
+    m_trainer3 = m_game->newTrainer();
 }
 
 void TestTrainer::cleanupTestCase()
@@ -71,7 +73,7 @@ void TestTrainer::validation()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 3);
     
-    m_sigmod->newSkin();
+    m_game->newSkin();
     
     m_trainer1->setSkin(0);
     m_trainer1->validate();
@@ -83,7 +85,7 @@ void TestTrainer::validation()
 
 void TestTrainer::saving()
 {
-    QDomDocument xml = Sigmod::Object::xml(m_trainer1);
+    QDomDocument xml = Object::xml(m_trainer1);
     QFile file("trainer.xml");
     
     QVERIFY(file.open(QIODevice::WriteOnly));
@@ -96,17 +98,17 @@ void TestTrainer::loading()
     QDomDocument xml;
     QFile file("trainer.xml");
     
-    m_sigmod->newSkin();
+    m_game->newSkin();
     
     m_trainer1->setName("Bar");
     m_trainer1->setMoneyFactor(1);
     m_trainer1->setSkin(1);
     m_trainer1->setDepth(5);
-    m_trainer1->setTeamIntel(Sigmod::Trainer::Cheating);
-    m_trainer1->setMoveIntel(Sigmod::Trainer::Cheating);
-    m_trainer1->setItemIntel(Sigmod::Trainer::Cheating);
-    m_trainer1->setAbilityIntel(Sigmod::Trainer::Cheating);
-    m_trainer1->setStatIntel(Sigmod::Trainer::Cheating);
+    m_trainer1->setTeamIntel(Trainer::Cheating);
+    m_trainer1->setMoveIntel(Trainer::Cheating);
+    m_trainer1->setItemIntel(Trainer::Cheating);
+    m_trainer1->setAbilityIntel(Trainer::Cheating);
+    m_trainer1->setStatIntel(Trainer::Cheating);
     
     QVERIFY(file.open(QIODevice::ReadOnly));
     QVERIFY(xml.setContent(&file));
@@ -116,11 +118,11 @@ void TestTrainer::loading()
     QCOMPARE(m_trainer1->moneyFactor(), 0);
     QCOMPARE(m_trainer1->skin(), 0);
     QCOMPARE(m_trainer1->depth(), 0);
-    QCOMPARE(m_trainer1->teamIntel(), Sigmod::Trainer::Remember);
-    QCOMPARE(m_trainer1->moveIntel(), Sigmod::Trainer::Remember);
-    QCOMPARE(m_trainer1->itemIntel(), Sigmod::Trainer::Remember);
-    QCOMPARE(m_trainer1->abilityIntel(), Sigmod::Trainer::Remember);
-    QCOMPARE(m_trainer1->statIntel(), Sigmod::Trainer::Remember);
+    QCOMPARE(m_trainer1->teamIntel(), Trainer::Remember);
+    QCOMPARE(m_trainer1->moveIntel(), Trainer::Remember);
+    QCOMPARE(m_trainer1->itemIntel(), Trainer::Remember);
+    QCOMPARE(m_trainer1->abilityIntel(), Trainer::Remember);
+    QCOMPARE(m_trainer1->statIntel(), Trainer::Remember);
 }
 
 void TestTrainer::setName()
@@ -161,7 +163,7 @@ void TestTrainer::setSkin()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 1);
     
-    m_sigmod->newSkin();
+    m_game->newSkin();
     
     m_trainer2->setSkin(2);
     m_trainer2->setSkin(2);
@@ -194,10 +196,10 @@ void TestTrainer::setDepth()
 
 void TestTrainer::setTeamIntel()
 {
-    m_trainer2->setTeamIntel(Sigmod::Trainer::Cheating);
-    m_trainer2->setTeamIntel(Sigmod::Trainer::Cheating);
+    m_trainer2->setTeamIntel(Trainer::Cheating);
+    m_trainer2->setTeamIntel(Trainer::Cheating);
     
-    QCOMPARE(m_trainer2->teamIntel(), Sigmod::Trainer::Cheating);
+    QCOMPARE(m_trainer2->teamIntel(), Trainer::Cheating);
     
     QCOMPARE(m_changedCount, 1);
     
@@ -207,10 +209,10 @@ void TestTrainer::setTeamIntel()
 
 void TestTrainer::setMoveIntel()
 {
-    m_trainer2->setMoveIntel(Sigmod::Trainer::Cheating);
-    m_trainer2->setMoveIntel(Sigmod::Trainer::Cheating);
+    m_trainer2->setMoveIntel(Trainer::Cheating);
+    m_trainer2->setMoveIntel(Trainer::Cheating);
     
-    QCOMPARE(m_trainer2->moveIntel(), Sigmod::Trainer::Cheating);
+    QCOMPARE(m_trainer2->moveIntel(), Trainer::Cheating);
     
     QCOMPARE(m_changedCount, 1);
     
@@ -220,10 +222,10 @@ void TestTrainer::setMoveIntel()
 
 void TestTrainer::setItemIntel()
 {
-    m_trainer2->setItemIntel(Sigmod::Trainer::Cheating);
-    m_trainer2->setItemIntel(Sigmod::Trainer::Cheating);
+    m_trainer2->setItemIntel(Trainer::Cheating);
+    m_trainer2->setItemIntel(Trainer::Cheating);
     
-    QCOMPARE(m_trainer2->itemIntel(), Sigmod::Trainer::Cheating);
+    QCOMPARE(m_trainer2->itemIntel(), Trainer::Cheating);
     
     QCOMPARE(m_changedCount, 1);
     
@@ -233,10 +235,10 @@ void TestTrainer::setItemIntel()
 
 void TestTrainer::setAbilityIntel()
 {
-    m_trainer2->setAbilityIntel(Sigmod::Trainer::Cheating);
-    m_trainer2->setAbilityIntel(Sigmod::Trainer::Cheating);
+    m_trainer2->setAbilityIntel(Trainer::Cheating);
+    m_trainer2->setAbilityIntel(Trainer::Cheating);
     
-    QCOMPARE(m_trainer2->abilityIntel(), Sigmod::Trainer::Cheating);
+    QCOMPARE(m_trainer2->abilityIntel(), Trainer::Cheating);
     
     QCOMPARE(m_changedCount, 1);
     
@@ -246,10 +248,10 @@ void TestTrainer::setAbilityIntel()
 
 void TestTrainer::setStatIntel()
 {
-    m_trainer2->setStatIntel(Sigmod::Trainer::Cheating);
-    m_trainer2->setStatIntel(Sigmod::Trainer::Cheating);
+    m_trainer2->setStatIntel(Trainer::Cheating);
+    m_trainer2->setStatIntel(Trainer::Cheating);
     
-    QCOMPARE(m_trainer2->statIntel(), Sigmod::Trainer::Cheating);
+    QCOMPARE(m_trainer2->statIntel(), Trainer::Cheating);
     
     QCOMPARE(m_changedCount, 1);
     
@@ -265,11 +267,11 @@ void TestTrainer::assignment()
     QCOMPARE(m_trainer3->moneyFactor(), 5);
     QCOMPARE(m_trainer3->skin(), 2);
     QCOMPARE(m_trainer3->depth(), 5);
-    QCOMPARE(m_trainer3->teamIntel(), Sigmod::Trainer::Cheating);
-    QCOMPARE(m_trainer3->moveIntel(), Sigmod::Trainer::Cheating);
-    QCOMPARE(m_trainer3->itemIntel(), Sigmod::Trainer::Cheating);
-    QCOMPARE(m_trainer3->abilityIntel(), Sigmod::Trainer::Cheating);
-    QCOMPARE(m_trainer3->statIntel(), Sigmod::Trainer::Cheating);
+    QCOMPARE(m_trainer3->teamIntel(), Trainer::Cheating);
+    QCOMPARE(m_trainer3->moveIntel(), Trainer::Cheating);
+    QCOMPARE(m_trainer3->itemIntel(), Trainer::Cheating);
+    QCOMPARE(m_trainer3->abilityIntel(), Trainer::Cheating);
+    QCOMPARE(m_trainer3->statIntel(), Trainer::Cheating);
 }
 
 QTEST_APPLESS_MAIN(TestTrainer)