[geos-commits] r2759 - in trunk/tests: unit unit/tut xmltester

[svn_geos at osgeo.org]

Author: mloskot
Date: 2009-12-03 08:25:57 -0500 (Thu, 03 Dec 2009)
New Revision: 2759

Modified:
   trunk/tests/unit/geos_unit.cpp
   trunk/tests/unit/tut/tut_restartable.hpp
   trunk/tests/xmltester/XMLTester.h
Log:
Updated C++ TUT framework.

Modified: trunk/tests/unit/geos_unit.cpp
===================================================================
--- trunk/tests/unit/geos_unit.cpp	2009-12-01 16:16:18 UTC (rev 2758)
+++ trunk/tests/unit/geos_unit.cpp	2009-12-03 13:25:57 UTC (rev 2759)
@@ -111,6 +111,5 @@
     // XXX - mloskot - this should be removed in future!
     geos::io::Unload::Release();
 
-    return (visi.all_ok() ? EXIT_SUCCESS : EXIT_FAILURE);
-    
+    return (visi.all_ok() ? EXIT_SUCCESS : EXIT_FAILURE);   
 }

Modified: trunk/tests/unit/tut/tut_restartable.hpp
===================================================================
--- trunk/tests/unit/tut/tut_restartable.hpp	2009-12-01 16:16:18 UTC (rev 2758)
+++ trunk/tests/unit/tut/tut_restartable.hpp	2009-12-03 13:25:57 UTC (rev 2759)
@@ -5,6 +5,7 @@
 #include <fstream>
 #include <iostream>
 #include <stdexcept>
+#include <cassert>
 
 /**
  * Optional restartable wrapper for test_runner.
@@ -114,6 +115,14 @@
     case test_result::term:
         os << 4;
         break;
+    case test_result::rethrown:
+        os << 5;
+        break;
+    case test_result::ex_ctor:
+        os << 6;
+        break;
+    case test_result::dummy:
+        assert(!"Should never be called");
     default:
         throw std::logic_error("operator << : bad result_type");
     }
@@ -158,6 +167,12 @@
     case 4:
         tr.result = test_result::term;
         break;
+    case 5:
+        tr.result = test_result::rethrown;
+        break;
+    case 6:
+        tr.result = test_result::ex_ctor;
+        break;
     default:
         throw std::logic_error("operator >> : bad result_type");
     }
@@ -280,19 +295,12 @@
                 // last executed test pos
                 register_execution_(*gni,test);
 
-                try
+                tut::test_result tr;
+                if( !runner_.run_test(*gni,test, tr) || tr.result == test_result::dummy )
                 {
-                    tut::test_result tr;
-                    if( !runner_.run_test(*gni,test, tr) )
-                    {
-                        break;
-                    }
-                    register_test_(tr);
-                }
-                catch (const tut::beyond_last_test&)
-                {
                     break;
                 }
+                register_test_(tr);
 
                 ++test;
             }

Modified: trunk/tests/xmltester/XMLTester.h
===================================================================
--- trunk/tests/xmltester/XMLTester.h	2009-12-01 16:16:18 UTC (rev 2758)
+++ trunk/tests/xmltester/XMLTester.h	2009-12-03 13:25:57 UTC (rev 2759)
@@ -13,8 +13,8 @@
  *
  **********************************************************************/
 
-#ifndef __XMLTESTER_H__
-#define __XMLTESTER_H__
+#ifndef GEOS_XMLTESTER_H
+#define GEOS_XMLTESTER_H
 
 #include <geos/geom/GeometryFactory.h>
 #include <geos/geom/PrecisionModel.h>
@@ -106,5 +106,4 @@
 
 };
 
-
-#endif 
+#endif // GEOS_XMLTESTER_H