1 files changed, 33 insertions, 31 deletions

diff --git a/sigmod/test/TestSigmod.cpp b/sigmod/test/TestSigmod.cpp
index bfc3e149..86a3c676 100644
--- a/sigmod/test/TestSigmod.cpp
+++ b/sigmod/test/TestSigmod.cpp
@@ -19,61 +19,63 @@
 #include "TestSigmod.h"
 
 // Sigmod includes
-#include "../Sigmod.h"
+#include "../Game.h"
 
 // Qt includes
 #include <QtCore/QFile>
 #include <QtTest/QTest>
 
-void TestSigmod::initTestCase()
+using namespace Sigmod;
+
+void TestinitTestCase()
 {
     TestSigmodObject::initTestCase();
     
-    m_sigmod1 = m_sigmod->newSigmod();
-    m_sigmod2 = m_sigmod->newSigmod();
-    m_sigmod3 = m_sigmod->newSigmod();
+    m_game1 = m_game->newSigmod();
+    m_game2 = m_game->newSigmod();
+    m_game3 = m_game->newSigmod();
 }
 
-void TestSigmod::cleanupTestCase()
+void TestcleanupTestCase()
 {
     TestSigmodObject::cleanupTestCase();
 }
 
-void TestSigmod::init()
+void Testinit()
 {
     TestSigmodObject::init();
     
-    makeConnections(m_sigmod1);
-    makeConnections(m_sigmod2);
-    makeConnections(m_sigmod3);
+    makeConnections(m_game1);
+    makeConnections(m_game2);
+    makeConnections(m_game3);
 }
 
-void TestSigmod::cleanup()
+void Testcleanup()
 {
-    closeConnections(m_sigmod1);
-    closeConnections(m_sigmod2);
-    closeConnections(m_sigmod3);
+    closeConnections(m_game1);
+    closeConnections(m_game2);
+    closeConnections(m_game3);
     
     TestSigmodObject::cleanup();
 }
 
-void TestSigmod::validation()
+void Testvalidation()
 {
-    m_sigmod1->validate();
+    m_game1->validate();
     
     QCOMPARE(m_warnings.size(), );
     QCOMPARE(m_errors.size(), );
     
-    m_sigmod1->set();
-    m_sigmod1->validate();
+    m_game1->set();
+    m_game1->validate();
     
     QCOMPARE(m_warnings.size(), );
     QCOMPARE(m_errors.size(), );
 }
 
-void TestSigmod::saving()
+void Testsaving()
 {
-    QDomDocument xml = Sigmod::Object::xml(m_sigmod1);
+    QDomDocument xml = Object::xml(m_game1);
     QFile file("sigmod.xml");
     
     QVERIFY(file.open(QIODevice::WriteOnly));
@@ -81,26 +83,26 @@ void TestSigmod::saving()
     file.close();
 }
 
-void TestSigmod::loading()
+void Testloading()
 {
     QDomDocument xml;
     QFile file("sigmod.xml");
     
-    m_sigmod1->set();
+    m_game1->set();
     
     QVERIFY(file.open(QIODevice::ReadOnly));
     QVERIFY(xml.setContent(&file));
-    m_sigmod1->load(xml.firstChildElement("Sigmod"));
+    m_game1->load(xml.firstChildElement("Sigmod"));
     
-    QCOMPARE(m_sigmod1->(), );
+    QCOMPARE(m_game1->(), );
 }
 
-void TestSigmod::set()
+void Testset()
 {
-    m_sigmod2->set();
-    m_sigmod2->set();
+    m_game2->set();
+    m_game2->set();
     
-    QCOMPARE(m_sigmod2->(), );
+    QCOMPARE(m_game2->(), );
     
     QCOMPARE(m_changedCount, 1);
     
@@ -108,11 +110,11 @@ void TestSigmod::set()
     QCOMPARE(m_errors.size(), 0);
 }
 
-void TestSigmod::assignment()
+void Testassignment()
 {
-    *m_sigmod3 = *m_sigmod2;
+    *m_game3 = *m_game2;
     
-    QCOMPARE(m_sigmod3->(), );
+    QCOMPARE(m_game3->(), );
 }
 
 QTEST_APPLESS_MAIN(TestSigmod)