From dde935e48d44ca1b2b8ce993ae5bc187a8ca30fd Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 24 Feb 2009 15:53:15 -0500 Subject: Fixed sigmod tests to also use namespace Sigmod --- sigmod/test/TestGlobalScript.cpp | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'sigmod/test/TestGlobalScript.cpp') diff --git a/sigmod/test/TestGlobalScript.cpp b/sigmod/test/TestGlobalScript.cpp index 8556e4ad..81dd50a5 100644 --- a/sigmod/test/TestGlobalScript.cpp +++ b/sigmod/test/TestGlobalScript.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel + * Copyright 2008-2009 Ben Boeckel * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,20 +19,23 @@ #include "TestGlobalScript.h" // Sigmod includes +#include "../Game.h" #include "../GlobalScript.h" -#include "../Sigmod.h" // Qt includes #include #include +using namespace Sigcore; +using namespace Sigmod; + void TestGlobalScript::initTestCase() { TestSigmodObject::initTestCase(); - m_globalScript1 = m_sigmod->newGlobalScript(); - m_globalScript2 = m_sigmod->newGlobalScript(); - m_globalScript3 = m_sigmod->newGlobalScript(); + m_globalScript1 = m_game->newGlobalScript(); + m_globalScript2 = m_game->newGlobalScript(); + m_globalScript3 = m_game->newGlobalScript(); } void TestGlobalScript::cleanupTestCase() @@ -74,7 +77,7 @@ void TestGlobalScript::validation() void TestGlobalScript::saving() { - QDomDocument xml = Sigmod::Object::xml(m_globalScript1); + QDomDocument xml = Object::xml(m_globalScript1); QFile file("globalScript.xml"); QVERIFY(file.open(QIODevice::WriteOnly)); @@ -88,14 +91,14 @@ void TestGlobalScript::loading() QFile file("globalScript.xml"); m_globalScript1->setName("Bar"); - m_globalScript1->setScript(Sigcore::Script("python", "import os")); + m_globalScript1->setScript(Script("python", "import os")); QVERIFY(file.open(QIODevice::ReadOnly)); QVERIFY(xml.setContent(&file)); m_globalScript1->load(xml.firstChildElement("GlobalScript")); QCOMPARE(m_globalScript1->name(), QString("Foo")); - QCOMPARE(m_globalScript1->script(), Sigcore::Script()); + QCOMPARE(m_globalScript1->script(), Script()); } void TestGlobalScript::setName() @@ -113,10 +116,10 @@ void TestGlobalScript::setName() void TestGlobalScript::setScript() { - m_globalScript2->setScript(Sigcore::Script("python", "import os")); - m_globalScript2->setScript(Sigcore::Script("python", "import os")); + m_globalScript2->setScript(Script("python", "import os")); + m_globalScript2->setScript(Script("python", "import os")); - QCOMPARE(m_globalScript2->script(), Sigcore::Script("python", "import os")); + QCOMPARE(m_globalScript2->script(), Script("python", "import os")); QCOMPARE(m_changedCount, 1); @@ -129,7 +132,7 @@ void TestGlobalScript::assignment() *m_globalScript3 = *m_globalScript2; QCOMPARE(m_globalScript3->name(), QString("Foo")); - QCOMPARE(m_globalScript3->script(), Sigcore::Script("python", "import os")); + QCOMPARE(m_globalScript3->script(), Script("python", "import os")); } QTEST_APPLESS_MAIN(TestGlobalScript) -- cgit