Use variadic macros for tests

Author: d-frey

src/test/json/create.cc

@@ -373,7 +373,7 @@ namespace tao
 
          // TODO: Add more tests
 
-         TEST_THROWS(( value { { "foo", 1 }, { "foo", 2 } } ));
+         TEST_THROWS( value { { "foo", 1 }, { "foo", 2 } } );
       }
 
       void unit_test()

src/test/json/test_assert.hh

@@ -1,30 +1,57 @@
-// Copyright (c) 2015 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2015-2016 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #ifndef TAOCPP_JSON_INCLUDE_SRC_TEST_TEST_ASSERT_HH
 #define TAOCPP_JSON_INCLUDE_SRC_TEST_TEST_ASSERT_HH
 
 #include <iostream>
+#include <stdexcept>
 
-#define TEST_ASSERT( eXPReSSioN )                       \
+#define TEST_ASSERT( ... )                              \
    do {                                                 \
-   if ( ! ( eXPReSSioN ) ) {                            \
-      std::cerr << "json: unit test assert [ "          \
-                << ( # eXPReSSioN )                     \
-                << " ] failed in line [ "               \
-                << __LINE__                             \
-                << " ] file [ "                         \
-                << __FILE__ << " ]"                     \
-                << std::endl;                           \
-      ++failed;                                         \
-   }  } while ( 0 )
+      try {                                             \
+         if ( ! ( __VA_ARGS__ ) ) {                     \
+            std::cerr << "json: unit test assert [ "    \
+                      << ( # __VA_ARGS__ )              \
+                      << " ] failed in line [ "         \
+                      << __LINE__                       \
+                      << " ] file [ "                   \
+                      << __FILE__ << " ]"               \
+                      << std::endl;                     \
+            ++failed;                                   \
+         }                                              \
+      }                                                 \
+      catch ( const std::exception & e ) {              \
+         std::cerr << "json: unit test [ "              \
+                   << ( # __VA_ARGS__ )                 \
+                   << " ] threw an exception [ "        \
+                   << e.what()                          \
+                   << " ] in line [ "                   \
+                   << __LINE__                          \
+                   << " ] file [ "                      \
+                   << __FILE__ << " ]"                  \
+                   << std::endl;                        \
+         ++failed;                                      \
+      }                                                 \
+      catch ( ... ) {                                   \
+         std::cerr << "json: unit test [ "              \
+                   << ( # __VA_ARGS__ )                 \
+                   << " ] threw an unknown exception"   \
+                   << "in line [ "                      \
+                   << __LINE__                          \
+                   << " ] file [ "                      \
+                   << __FILE__ << " ]"                  \
+                   << std::endl;                        \
+         ++failed;                                      \
+      }                                                 \
+   } while ( false )
 
-#define TEST_THROWS( STaTeMeNT )                        \
+#define TEST_THROWS( ... )                              \
    do {                                                 \
       try {                                             \
-         STaTeMeNT;                                     \
-         std::cerr << "json: unit test assert [ "       \
-                   << ( # STaTeMeNT )                   \
+         __VA_ARGS__;                                   \
+         std::cerr << "json: unit test [ "              \
+                   << ( # __VA_ARGS__ )                 \
                    << " ] did not throw in line [ "     \
                    << __LINE__                          \
                    << " ] file [ "                      \
@@ -34,6 +61,6 @@
       }                                                 \
       catch ( ... ) {                                   \
       }                                                 \
-   } while ( 0 )
+   } while ( false )
 
 #endif