From 84b7d198d4e7c65cfdc3fb12cc1b28d523af4f03 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Thu, 22 Dec 2011 12:48:11 -0800
Subject: [PATCH] fixup fontset tests

---
 tests/data/broken_maps/missing_fontset.xml | 7 +++++++
 tests/data/good_maps/fontset.xml           | 1 -
 tests/python_tests/test_fontset.py         | 6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 tests/data/broken_maps/missing_fontset.xml

diff --git a/tests/data/broken_maps/missing_fontset.xml b/tests/data/broken_maps/missing_fontset.xml
new file mode 100644
index 000000000..f36337d77
--- /dev/null
+++ b/tests/data/broken_maps/missing_fontset.xml
@@ -0,0 +1,7 @@
+<Map>
+
+<FontSet name="book-fonts">
+  <Font face-name="does not exist" />
+</FontSet>
+
+</Map>
diff --git a/tests/data/good_maps/fontset.xml b/tests/data/good_maps/fontset.xml
index 4d004c002..80ab2cd60 100644
--- a/tests/data/good_maps/fontset.xml
+++ b/tests/data/good_maps/fontset.xml
@@ -3,7 +3,6 @@
 <FontSet name="book-fonts">
   <Font face-name="DejaVu Sans Book" />
   <Font face-name="DejaVu Sans Oblique" />
-  <Font face-name="does not exist" />
 </FontSet>
 
 </Map>
diff --git a/tests/python_tests/test_fontset.py b/tests/python_tests/test_fontset.py
index e41e64576..f6fed30a1 100644
--- a/tests/python_tests/test_fontset.py
+++ b/tests/python_tests/test_fontset.py
@@ -13,10 +13,10 @@ def setup():
 
 def test_loading_fontset_from_map():
     m = mapnik.Map(256,256)
-    mapnik.load_map(m,'../data/good_maps/fontset.xml')
+    mapnik.load_map(m,'../data/good_maps/fontset.xml',True)
     fs = m.find_fontset('book-fonts')
-    eq_(len(fs.names),3)
-    eq_(list(fs.names),['DejaVu Sans Book','DejaVu Sans Oblique', 'does not exist'])
+    eq_(len(fs.names),2)
+    eq_(list(fs.names),['DejaVu Sans Book','DejaVu Sans Oblique'])
 
 
 if __name__ == "__main__":