[Boost-commit] svn:boost r55378 - in trunk/libs/spirit/test: . karma

Subject: [Boost-commit] svn:boost r55378 - in trunk/libs/spirit/test: . karma
From: hartmut.kaiser_at_[hidden]
Date: 2009-08-02 22:27:15

Author: hkaiser
Date: 2009-08-02 22:27:14 EDT (Sun, 02 Aug 2009)
New Revision: 55378
URL: http://svn.boost.org/trac/boost/changeset/55378

Log:
Spirit: renamed an unit test
Added:
   trunk/libs/spirit/test/karma/and_predicate.cpp
      - copied, changed from r55374, /trunk/libs/spirit/test/karma/and_attribute.cpp
Removed:
   trunk/libs/spirit/test/karma/and_attribute.cpp
Text files modified: 
   trunk/libs/spirit/test/CMakeLists.txt          |     2 +-                                      
   trunk/libs/spirit/test/Jamfile                 |     2 +-                                      
   trunk/libs/spirit/test/karma/and_predicate.cpp |     5 ++++-                                   
   3 files changed, 6 insertions(+), 3 deletions(-)

Modified: trunk/libs/spirit/test/CMakeLists.txt
==============================================================================
--- trunk/libs/spirit/test/CMakeLists.txt	(original)
+++ trunk/libs/spirit/test/CMakeLists.txt	2009-08-02 22:27:14 EDT (Sun, 02 Aug 2009)
@@ -63,7 +63,7 @@
 
 # run Karma tests
 boost_test_run(karma_actions karma/actions.cpp COMPILE_FLAGS ${test_compile_flags})
-boost_test_run(karma_and_attribute karma/and_attribute.cpp COMPILE_FLAGS ${test_compile_flags})
+boost_test_run(karma_and_predicate karma/and_predicate.cpp COMPILE_FLAGS ${test_compile_flags})
 boost_test_run(karma_alternative karma/alternative.cpp COMPILE_FLAGS ${test_compile_flags})
 boost_test_run(karma_binary karma/binary.cpp COMPILE_FLAGS ${test_compile_flags})
 boost_test_run(karma_case_handling karma/case_handling.cpp COMPILE_FLAGS ${test_compile_flags})

Modified: trunk/libs/spirit/test/Jamfile
==============================================================================
--- trunk/libs/spirit/test/Jamfile	(original)
+++ trunk/libs/spirit/test/Jamfile	2009-08-02 22:27:14 EDT (Sun, 02 Aug 2009)
@@ -68,7 +68,7 @@
 
     # run Karma tests
     [ run karma/actions.cpp                 : : : : karma_actions ]
-    [ run karma/and_attribute.cpp           : : : : karma_and_attribute ]
+    [ run karma/and_predicate.cpp           : : : : karma_and_predicate ]
     [ run karma/alternative.cpp             : : : : karma_alternative ]
     [ run karma/binary.cpp                  : : : : karma_binary ]
     [ run karma/case_handling.cpp           : : : : ]

Deleted: trunk/libs/spirit/test/karma/and_attribute.cpp
==============================================================================
--- trunk/libs/spirit/test/karma/and_attribute.cpp	2009-08-02 22:27:14 EDT (Sun, 02 Aug 2009)
+++ (empty file)
@@ -1,27 +0,0 @@
-//  Copyright (c) 2001-2007 Hartmut Kaiser
-// 
-//  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)
-
-#include <boost/config/warning_disable.hpp>
-#include <boost/detail/lightweight_test.hpp>
-
-#include <boost/spirit/include/karma_numeric.hpp>
-#include <boost/spirit/include/karma_generate.hpp>
-#include <boost/spirit/include/karma_operator.hpp>
-
-#include <iostream>
-#include "test.hpp"
-
-int
-main()
-{
-    using namespace spirit_test;
-    using namespace boost::spirit;
-
-    {
-        BOOST_TEST(test("1", int_(1) << &(int_(2) << &int_(3) << int_(4))));
-    }
-    
-    return boost::report_errors();
-}

Copied: trunk/libs/spirit/test/karma/and_predicate.cpp (from r55374, /trunk/libs/spirit/test/karma/and_attribute.cpp)
==============================================================================
--- /trunk/libs/spirit/test/karma/and_attribute.cpp	(original)
+++ trunk/libs/spirit/test/karma/and_predicate.cpp	2009-08-02 22:27:14 EDT (Sun, 02 Aug 2009)
@@ -6,9 +6,12 @@
 #include <boost/config/warning_disable.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
+#include <boost/mpl/print.hpp>
 #include <boost/spirit/include/karma_numeric.hpp>
 #include <boost/spirit/include/karma_generate.hpp>
 #include <boost/spirit/include/karma_operator.hpp>
+#include <boost/spirit/include/karma_auxiliary.hpp>
+#include <boost/spirit/include/karma_string.hpp>
 
 #include <iostream>
 #include "test.hpp"
@@ -22,6 +25,6 @@
     {
         BOOST_TEST(test("1", int_(1) << &(int_(2) << &int_(3) << int_(4))));
     }
-    
+
     return boost::report_errors();
 }