From 573850a1dfb1ffd8a774dfb182284ce64a9e1b40 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 18 Jan 2009 19:06:55 -0500 Subject: Fixed MapTrainer tests for position change --- sigmod/test/TestMapTrainer.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'sigmod/test/TestMapTrainer.cpp') diff --git a/sigmod/test/TestMapTrainer.cpp b/sigmod/test/TestMapTrainer.cpp index e0a26a47..f8ed1e3e 100644 --- a/sigmod/test/TestMapTrainer.cpp +++ b/sigmod/test/TestMapTrainer.cpp @@ -87,7 +87,7 @@ void TestMapTrainer::validation() m_sigmod->map(0)->setWidth(25); m_sigmod->map(0)->setHeight(25); - m_trainer1->setCoordinate(QPoint(20, 20)); + m_trainer1->setPosition(QPoint(20, 20)); m_trainer1->validate(); QCOMPARE(m_warnings.size(), 0); @@ -174,7 +174,7 @@ void TestMapTrainer::loading() m_trainer1->setName("Bar"); m_trainer1->setTrainerClass(1); - m_trainer1->setCoordinate(QPoint(3, 3)); + m_trainer1->setPosition(QPoint(3, 3)); m_trainer1->setNumberFight(1); m_trainer1->setScript(Sigcore::Script("python", "import os")); m_trainer1->setLeadTeamMember(1); @@ -185,7 +185,7 @@ void TestMapTrainer::loading() QCOMPARE(m_trainer1->name(), QString("Foo")); QCOMPARE(m_trainer1->trainerClass(), 0); - QCOMPARE(m_trainer1->coordinate(), QPoint(20, 20)); + QCOMPARE(m_trainer1->position(), QPoint(20, 20)); QCOMPARE(m_trainer1->numberFight(), 3); QCOMPARE(m_trainer1->script(), Sigcore::Script()); QCOMPARE(m_trainer1->leadTeamMember(), 0); @@ -225,22 +225,22 @@ void TestMapTrainer::setTrainerClass() QCOMPARE(m_errors.size(), 1); } -void TestMapTrainer::setCoordinate() +void TestMapTrainer::setPosition() { - m_trainer2->setCoordinate(QPoint(20, 30)); + m_trainer2->setPosition(QPoint(20, 30)); QCOMPARE(m_warnings.size(), 0); QCOMPARE(m_errors.size(), 1); - m_trainer2->setCoordinate(QPoint(30, 20)); + m_trainer2->setPosition(QPoint(30, 20)); QCOMPARE(m_warnings.size(), 0); QCOMPARE(m_errors.size(), 2); - m_trainer2->setCoordinate(QPoint(20, 20)); - m_trainer2->setCoordinate(QPoint(20, 20)); + m_trainer2->setPosition(QPoint(20, 20)); + m_trainer2->setPosition(QPoint(20, 20)); - QCOMPARE(m_trainer2->coordinate(), QPoint(20, 20)); + QCOMPARE(m_trainer2->position(), QPoint(20, 20)); QCOMPARE(m_changedCount, 1); @@ -329,7 +329,7 @@ void TestMapTrainer::assignment() QCOMPARE(m_trainer3->name(), QString("Foo")); QCOMPARE(m_trainer3->trainerClass(), 2); - QCOMPARE(m_trainer3->coordinate(), QPoint(20, 20)); + QCOMPARE(m_trainer3->position(), QPoint(20, 20)); QCOMPARE(m_trainer3->numberFight(), 3); QCOMPARE(m_trainer3->script(), Sigcore::Script("python", "import os")); QCOMPARE(m_trainer3->leadTeamMember(), 0); -- cgit