diff options
Diffstat (limited to 'sigmod/test/TestCoinList.cpp')
| -rw-r--r-- | sigmod/test/TestCoinList.cpp | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/sigmod/test/TestCoinList.cpp b/sigmod/test/TestCoinList.cpp index f423fc06..d64b7dcc 100644 --- a/sigmod/test/TestCoinList.cpp +++ b/sigmod/test/TestCoinList.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * 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 @@ -21,19 +21,22 @@ // Sigmod includes #include "../CoinList.h" #include "../CoinListItem.h" -#include "../Sigmod.h" +#include "../Game.h" // Qt includes #include <QtCore/QFile> #include <QtTest/QTest> +using namespace Sigcore; +using namespace Sigmod; + void TestCoinList::initTestCase() { TestSigmodObject::initTestCase(); - m_coinList1 = m_sigmod->newCoinList(); - m_coinList2 = m_sigmod->newCoinList(); - m_coinList3 = m_sigmod->newCoinList(); + m_coinList1 = m_game->newCoinList(); + m_coinList2 = m_game->newCoinList(); + m_coinList3 = m_game->newCoinList(); } void TestCoinList::cleanupTestCase() @@ -81,7 +84,7 @@ void TestCoinList::validation() void TestCoinList::saving() { - QDomDocument xml = Sigmod::Object::xml(m_coinList1); + QDomDocument xml = Object::xml(m_coinList1); QFile file("coinList.xml"); QVERIFY(file.open(QIODevice::WriteOnly)); @@ -95,7 +98,7 @@ void TestCoinList::loading() QFile file("coinList.xml"); m_coinList1->setName("Bar"); - m_coinList1->setScript(Sigcore::Script("python", "import os")); + m_coinList1->setScript(Script("python", "import os")); m_coinList1->newItem(); QVERIFY(file.open(QIODevice::ReadOnly)); @@ -103,7 +106,7 @@ void TestCoinList::loading() m_coinList1->load(xml.firstChildElement("CoinList")); QCOMPARE(m_coinList1->name(), QString("Foo")); - QCOMPARE(m_coinList1->script(), Sigcore::Script()); + QCOMPARE(m_coinList1->script(), Script()); QCOMPARE(m_coinList1->itemCount(), 1); } @@ -122,10 +125,10 @@ void TestCoinList::setName() void TestCoinList::setScript() { - m_coinList2->setScript(Sigcore::Script("python", "import os")); - m_coinList2->setScript(Sigcore::Script("python", "import os")); + m_coinList2->setScript(Script("python", "import os")); + m_coinList2->setScript(Script("python", "import os")); - QCOMPARE(m_coinList2->script(), Sigcore::Script("python", "import os")); + QCOMPARE(m_coinList2->script(), Script("python", "import os")); QCOMPARE(m_changedCount, 1); @@ -162,7 +165,7 @@ void TestCoinList::assignment() *m_coinList3 = *m_coinList2; QCOMPARE(m_coinList3->name(), QString("Foo")); - QCOMPARE(m_coinList3->script(), Sigcore::Script("python", "import os")); + QCOMPARE(m_coinList3->script(), Script("python", "import os")); QCOMPARE(m_coinList3->itemCount(), 2); } |