Update map test to not use types and instead check for isWorld

2 files changed, 21 insertions, 17 deletions

diff --git a/sigmod/test/TestMap.cpp b/sigmod/test/TestMap.cpp
index 95cbae13..9879accf 100644
--- a/sigmod/test/TestMap.cpp
+++ b/sigmod/test/TestMap.cpp
@@ -136,18 +136,18 @@ void TestMap::loading()
     m_map1->newWildList();
     
     m_map1->setName("Bar");
-    m_map1->setType(Map::Dungeon);
     m_map1->setWidth(5);
     m_map1->setHeight(5);
+    m_map1->setIsWorld(true);
     
     QVERIFY(file.open(QIODevice::ReadOnly));
     QVERIFY(xml.setContent(&file));
     m_map1->load(xml.firstChildElement("Map"));
     
     QCOMPARE(m_map1->name(), QString("Foo"));
-    QCOMPARE(m_map1->type(), Map::Outdoor);
     QCOMPARE(m_map1->width(), 1);
     QCOMPARE(m_map1->height(), 1);
+    QCOMPARE(m_map1->isWorld(), false);
     QCOMPARE(m_map1->effectCount(), 1);
     QCOMPARE(m_map1->tileCount(), 1);
     QCOMPARE(m_map1->trainerCount(), 1);
@@ -168,19 +168,6 @@ void TestMap::setName()
     QCOMPARE(m_errors.size(), 0);
 }
 
-void TestMap::setType()
-{
-    m_map2->setType(Map::Dungeon);
-    m_map2->setType(Map::Dungeon);
-    
-    QCOMPARE(m_map2->type(), Map::Dungeon);
-    
-    QCOMPARE(m_changedCount, 1);
-    
-    QCOMPARE(m_warnings.size(), 0);
-    QCOMPARE(m_errors.size(), 0);
-}
-
 void TestMap::setWidth()
 {
     m_map2->setWidth(0);
@@ -217,6 +204,23 @@ void TestMap::setHeight()
     QCOMPARE(m_errors.size(), 1);
 }
 
+void TestMap::setIsWorld()
+{
+    m_map2->setIsWorld(false);
+    
+    QCOMPARE(m_changedCount, 0);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 0);
+    
+    m_map2->setIsWorld(true);
+    
+    QCOMPARE(m_changedCount, 1);
+    
+    QCOMPARE(m_warnings.size(), 0);
+    QCOMPARE(m_errors.size(), 0);
+}
+
 void TestMap::effects()
 {
     QCOMPARE(m_map2->newEffect()->id(), 0);
@@ -342,9 +346,9 @@ void TestMap::assignment()
     *m_map3 = *m_map2;
     
     QCOMPARE(m_map3->name(), QString("Foo"));
-    QCOMPARE(m_map3->type(), Map::Dungeon);
     QCOMPARE(m_map3->width(), 5);
     QCOMPARE(m_map3->height(), 5);
+    QCOMPARE(m_map3->isWorld(), true);
     QCOMPARE(m_map3->effectCount(), 2);
     QCOMPARE(m_map3->tileCount(), 2);
     QCOMPARE(m_map3->trainerCount(), 2);
diff --git a/sigmod/test/TestMap.h b/sigmod/test/TestMap.h
index af49a997..0cec78c8 100644
--- a/sigmod/test/TestMap.h
+++ b/sigmod/test/TestMap.h
@@ -43,9 +43,9 @@ class TestMap : public TestSigmodObject
         void loading();
         
         void setName();
-        void setType();
         void setWidth();
         void setHeight();
+        void setIsWorld();
         
         void effects();
         void tiles();