[Boost-commit] svn:boost r42695 - in branches/unordered/trunk/libs/unordered/test: helpers objects

From: daniel_james_at_[hidden]
Date: 2008-01-12 07:56:47

Author: danieljames
Date: 2008-01-12 07:56:47 EST (Sat, 12 Jan 2008)
New Revision: 42695
URL: http://svn.boost.org/trac/boost/changeset/42695

Log:
Pull the simple test framework wrapper out of memory.hpp
Added:
   branches/unordered/trunk/libs/unordered/test/helpers/test.hpp   (contents, props changed)
Text files modified: 
   branches/unordered/trunk/libs/unordered/test/objects/memory.hpp |    11 +----------                             
   1 files changed, 1 insertions(+), 10 deletions(-)

Added: branches/unordered/trunk/libs/unordered/test/helpers/test.hpp
==============================================================================
--- (empty file)
+++ branches/unordered/trunk/libs/unordered/test/helpers/test.hpp	2008-01-12 07:56:47 EST (Sat, 12 Jan 2008)
@@ -0,0 +1,19 @@
+
+// Copyright 2006-2007 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#if !defined(BOOST_UNORDERED_TEST_TEST_HEADER)
+#define BOOST_UNORDERED_TEST_TEST_HEADER
+
+#if defined(BOOST_UNORDERED_EXCEPTION_USE_TEST)
+#include <boost/test/test_tools.hpp>
+#define UNORDERED_CHECK(x) BOOST_CHECK(x)
+#define UNORDERED_REQUIRE(x) BOOST_REQUIRE(x)
+#else
+#include <boost/detail/lightweight_test.hpp>
+#define UNORDERED_CHECK(x) BOOST_TEST(x)
+#define UNORDERED_REQUIRE(x) if(!(x)) { BOOST_ERROR(BOOST_STRINGIZE(x)); throw test::lightweight::test_failure(); }
+#endif
+
+#endif

Modified: branches/unordered/trunk/libs/unordered/test/objects/memory.hpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/objects/memory.hpp	(original)
+++ branches/unordered/trunk/libs/unordered/test/objects/memory.hpp	2008-01-12 07:56:47 EST (Sat, 12 Jan 2008)
@@ -7,19 +7,10 @@
 #define BOOST_UNORDERED_TEST_MEMORY_HEADER
 
 #include <memory>
-#if defined(BOOST_UNORDERED_EXCEPTION_USE_TEST)
-#include <boost/test/test_tools.hpp>
-#define UNORDERED_CHECK(x) BOOST_CHECK(x)
-#define UNORDERED_REQUIRE(x) BOOST_REQUIRE(x)
-#else
-#include <boost/detail/lightweight_test.hpp>
-#define UNORDERED_CHECK(x) BOOST_TEST(x)
-#define UNORDERED_REQUIRE(x) if(!(x)) { BOOST_ERROR(BOOST_STRINGIZE(x)); throw test::lightweight::test_failure(); }
-#endif
-
 #include <map>
 #include <boost/mpl/apply.hpp>
 #include <boost/assert.hpp>
+#include "../helpers/test.hpp"
 
 namespace test
 {