From 2dbefde750b59a653600b795327cb2edc8a07c96 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 25 Sep 2014 13:09:05 -0700
Subject: [PATCH] add validation to face_ptr_creation benchmark

---
 benchmark/test_face_ptr_creation.cpp | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/benchmark/test_face_ptr_creation.cpp b/benchmark/test_face_ptr_creation.cpp
index 6f2410f0b..b546c32c8 100644
--- a/benchmark/test_face_ptr_creation.cpp
+++ b/benchmark/test_face_ptr_creation.cpp
@@ -9,19 +9,31 @@ public:
      : test_case(params) {}
     bool validate() const
     {
-        return true;
+        std::size_t count = 0;
+        std::size_t expected_count = mapnik::freetype_engine::face_names().size();
+        mapnik::freetype_engine engine;
+        for (std::string const& name : mapnik::freetype_engine::face_names())
+        {
+            mapnik::face_ptr f = engine.create_face(name);
+            if (f) ++count;
+        }
+        return count == expected_count;
     }
     void operator()() const
     {
         mapnik::freetype_engine engine;
-        unsigned long count = 0;
+        std::size_t expected_count = mapnik::freetype_engine::face_names().size();
         for (unsigned i=0;i<iterations_;++i)
         {
-            for ( std::string const& name : mapnik::freetype_engine::face_names())
+            std::size_t count = 0;
+            for (std::string const& name : mapnik::freetype_engine::face_names())
             {
                 mapnik::face_ptr f = engine.create_face(name);
                 if (f) ++count;
             }
+            if (count != expected_count) {
+                std::clog << "warning: face creation not working as expected\n";
+            }
         }
     }
 };
@@ -37,6 +49,6 @@ int main(int argc, char** argv)
     } 
     std::size_t face_count = mapnik::freetype_engine::face_names().size();
     test test_runner(params);
-    return run(test_runner,(boost::format("font_engine: creating %ld faces") % (face_count * 1000 * 10)).str());
+    return run(test_runner,(boost::format("font_engine: creating %ld faces") % (face_count)).str());
 }