Fixed sigmod tests to also use namespace Sigmod

1 files changed, 21 insertions, 18 deletions

diff --git a/sigmod/test/TestMapEffect.cpp b/sigmod/test/TestMapEffect.cpp
index 95ad3c12..362167d9 100644
--- a/sigmod/test/TestMapEffect.cpp
+++ b/sigmod/test/TestMapEffect.cpp
@@ -19,19 +19,22 @@
 #include "TestMapEffect.h"
 
 // Sigmod includes
+#include "../Game.h"
 #include "../Map.h"
 #include "../MapEffect.h"
-#include "../Sigmod.h"
 
 // Qt includes
 #include <QtCore/QFile>
 #include <QtTest/QTest>
 
+using namespace Sigcore;
+using namespace Sigmod;
+
 void TestMapEffect::initTestCase()
 {
     TestSigmodObject::initTestCase();
     
-    Sigmod::Map* map = m_sigmod->newMap();
+    Map* map = m_game->newMap();
     
     m_effect1 = map->newEffect();
     m_effect2 = map->newEffect();
@@ -74,8 +77,8 @@ void TestMapEffect::validation()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 3);
     
-    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_effect1->setPosition(QPoint(20, 20));
     m_effect1->validate();
@@ -83,23 +86,23 @@ void TestMapEffect::validation()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 4);
     
-    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_effect1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 6);
     
-    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_effect1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 7);
     
-    m_sigmod->newSkin();
+    m_game->newSkin();
     
     m_effect1->setSkin(0);
     m_effect1->validate();
@@ -110,7 +113,7 @@ void TestMapEffect::validation()
 
 void TestMapEffect::saving()
 {
-    QDomDocument xml = Sigmod::Object::xml(m_effect1);
+    QDomDocument xml = Object::xml(m_effect1);
     QFile file("mapEffect.xml");
     
     QVERIFY(file.open(QIODevice::WriteOnly));
@@ -123,13 +126,13 @@ void TestMapEffect::loading()
     QDomDocument xml;
     QFile file("mapEffect.xml");
     
-    m_sigmod->newSkin();
+    m_game->newSkin();
     
     m_effect1->setName("Bar");
     m_effect1->setPosition(QPoint(3, 3));
     m_effect1->setSkin(1);
     m_effect1->setIsGhost(true);
-    m_effect1->setScript(Sigcore::Script("python", "import os"));
+    m_effect1->setScript(Script("python", "import os"));
     
     QVERIFY(file.open(QIODevice::ReadOnly));
     QVERIFY(xml.setContent(&file));
@@ -139,7 +142,7 @@ void TestMapEffect::loading()
     QCOMPARE(m_effect1->position(), QPoint(20, 20));
     QCOMPARE(m_effect1->skin(), 0);
     QCOMPARE(m_effect1->isGhost(), false);
-    QCOMPARE(m_effect1->script(), Sigcore::Script());
+    QCOMPARE(m_effect1->script(), Script());
 }
 
 void TestMapEffect::setName()
@@ -185,7 +188,7 @@ void TestMapEffect::setSkin()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 1);
     
-    m_sigmod->newSkin();
+    m_game->newSkin();
     
     m_effect2->setSkin(2);
     m_effect2->setSkin(2);
@@ -213,10 +216,10 @@ void TestMapEffect::setIsGhost()
 
 void TestMapEffect::setScript()
 {
-    m_effect2->setScript(Sigcore::Script("python", "import os"));
-    m_effect2->setScript(Sigcore::Script("python", "import os"));
+    m_effect2->setScript(Script("python", "import os"));
+    m_effect2->setScript(Script("python", "import os"));
     
-    QCOMPARE(m_effect2->script(), Sigcore::Script("python", "import os"));
+    QCOMPARE(m_effect2->script(), Script("python", "import os"));
     
     QCOMPARE(m_changedCount, 1);
     
@@ -232,7 +235,7 @@ void TestMapEffect::assignment()
     QCOMPARE(m_effect3->position(), QPoint(20, 20));
     QCOMPARE(m_effect3->skin(), 2);
     QCOMPARE(m_effect3->isGhost(), true);
-    QCOMPARE(m_effect3->script(), Sigcore::Script("python", "import os"));
+    QCOMPARE(m_effect3->script(), Script("python", "import os"));
 }
 
 QTEST_APPLESS_MAIN(TestMapEffect)