Fixed tests for enumeration load/save fix

6 files changed, 3 insertions, 23 deletions

diff --git a/sigmod/test/TestCoinListItem.cpp b/sigmod/test/TestCoinListItem.cpp
index f66830c1..c1939cde 100644
--- a/sigmod/test/TestCoinListItem.cpp
+++ b/sigmod/test/TestCoinListItem.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
@@ -120,8 +120,6 @@ void TestCoinListItem::loading()
     QVERIFY(xml.setContent(&file));
     m_item1->load(xml.firstChildElement("CoinListItem"));
     
-    // FIXME
-    QEXPECT_FAIL(0, "Loading enumeration data from XML file doesn't work", Continue);
     QCOMPARE(m_item1->type(), Sigmod::CoinListItem::Species);
     QCOMPARE(m_item1->object(), 0);
     QCOMPARE(m_item1->cost(), 20);
diff --git a/sigmod/test/TestItemType.cpp b/sigmod/test/TestItemType.cpp
index 156c31c1..a198a906 100644
--- a/sigmod/test/TestItemType.cpp
+++ b/sigmod/test/TestItemType.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
@@ -126,8 +126,6 @@ void TestItemType::loading()
     QCOMPARE(m_itemType1->computer(), 0);
     QCOMPARE(m_itemType1->player(), 1);
     QCOMPARE(m_itemType1->maxWeight(), 50);
-    // FIXME
-    QEXPECT_FAIL(0, "Loading enumeration data from XML file doesn't work", Continue);
     QCOMPARE(m_itemType1->count(), Sigmod::ItemType::Total);
 }
 
diff --git a/sigmod/test/TestMap.cpp b/sigmod/test/TestMap.cpp
index 20e882a8..d3e58d47 100644
--- a/sigmod/test/TestMap.cpp
+++ b/sigmod/test/TestMap.cpp
@@ -166,8 +166,6 @@ void TestMap::loading()
     
     QCOMPARE(m_map1->name(), QString("Foo"));
     QCOMPARE(m_map1->flyWarp(), -1);
-    // FIXME
-//     QEXPECT_FAIL(0, "Loading enumeration data from XML file doesn't work", Continue);
     QCOMPARE(m_map1->type(), Sigmod::Map::Outdoor);
     QCOMPARE(m_map1->width(), 1);
     QCOMPARE(m_map1->height(), 1);
diff --git a/sigmod/test/TestSound.cpp b/sigmod/test/TestSound.cpp
index 272dd853..37c42809 100644
--- a/sigmod/test/TestSound.cpp
+++ b/sigmod/test/TestSound.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
@@ -104,8 +104,6 @@ void TestSound::loading()
     m_sound1->load(xml.firstChildElement("Sound"));
     
     QCOMPARE(m_sound1->name(), QString("Foo"));
-    // FIXME
-    QEXPECT_FAIL(0, "Loading enumeration data from XML file doesn't work", Continue);
     QCOMPARE(m_sound1->type(), Sigmod::Sound::Music);
     QCOMPARE(m_sound1->data(), QByteArray("blah"));
 }
diff --git a/sigmod/test/TestSpecies.cpp b/sigmod/test/TestSpecies.cpp
index 2f4cda62..0cc7960f 100644
--- a/sigmod/test/TestSpecies.cpp
+++ b/sigmod/test/TestSpecies.cpp
@@ -393,8 +393,6 @@ void TestSpecies::loading()
     QCOMPARE(m_species1->effortValue(Sigmod::ST_Speed), 35);
     QCOMPARE(m_species1->effortValue(Sigmod::ST_SpecialAttack), 45);
     QCOMPARE(m_species1->effortValue(Sigmod::ST_SpecialDefense), 55);
-    // FIXME
-    QEXPECT_FAIL(0, "Loading enumeration data from XML file doesn't work", Continue);
     QCOMPARE(m_species1->growth(), Sigmod::Species::Fast);
     QCOMPARE(m_species1->experienceValue(), 0);
     QCOMPARE(m_species1->catchValue(), 0);
diff --git a/sigmod/test/TestTrainer.cpp b/sigmod/test/TestTrainer.cpp
index 5d1e50e7..36775116 100644
--- a/sigmod/test/TestTrainer.cpp
+++ b/sigmod/test/TestTrainer.cpp
@@ -116,20 +116,10 @@ void TestTrainer::loading()
     QCOMPARE(m_trainer1->moneyFactor(), 0);
     QCOMPARE(m_trainer1->skin(), 0);
     QCOMPARE(m_trainer1->depth(), 0);
-    // FIXME
-    QEXPECT_FAIL(0, "Loading enumeration data from XML file doesn't work", Continue);
     QCOMPARE(m_trainer1->teamIntel(), Sigmod::Trainer::Remember);
-    // FIXME
-    QEXPECT_FAIL(0, "Loading enumeration data from XML file doesn't work", Continue);
     QCOMPARE(m_trainer1->moveIntel(), Sigmod::Trainer::Remember);
-    // FIXME
-    QEXPECT_FAIL(0, "Loading enumeration data from XML file doesn't work", Continue);
     QCOMPARE(m_trainer1->itemIntel(), Sigmod::Trainer::Remember);
-    // FIXME
-    QEXPECT_FAIL(0, "Loading enumeration data from XML file doesn't work", Continue);
     QCOMPARE(m_trainer1->abilityIntel(), Sigmod::Trainer::Remember);
-    // FIXME
-    QEXPECT_FAIL(0, "Loading enumeration data from XML file doesn't work", Continue);
     QCOMPARE(m_trainer1->statIntel(), Sigmod::Trainer::Remember);
 }