[Boost-commit] svn:boost r82725 - in trunk/libs/fusion/test: . sequence

Subject: [Boost-commit] svn:boost r82725 - in trunk/libs/fusion/test: . sequence
From: joel_at_[hidden]
Date: 2013-02-06 20:25:38

Author: djowel
Date: 2013-02-04 06:52:18 EST (Mon, 04 Feb 2013)
New Revision: 82725
URL: http://svn.boost.org/trac/boost/changeset/82725

Log:
more map tests (including move test)
Added:
   trunk/libs/fusion/test/sequence/map_misc.cpp   (contents, props changed)
   trunk/libs/fusion/test/sequence/map_move.cpp   (contents, props changed)
   trunk/libs/fusion/test/sequence/map_mutate.cpp   (contents, props changed)
Text files modified: 
   trunk/libs/fusion/test/Jamfile                  |     3 +++                                     
   trunk/libs/fusion/test/sequence/deque_move.cpp  |     4 +++-                                    
   trunk/libs/fusion/test/sequence/move.hpp        |     4 ++--                                    
   trunk/libs/fusion/test/sequence/vector_move.cpp |     4 +++-                                    
   4 files changed, 11 insertions(+), 4 deletions(-)

Modified: trunk/libs/fusion/test/Jamfile
==============================================================================
--- trunk/libs/fusion/test/Jamfile	(original)
+++ trunk/libs/fusion/test/Jamfile	2013-02-04 06:52:18 EST (Mon, 04 Feb 2013)
@@ -92,6 +92,9 @@
     [ run sequence/map_comparison.cpp :  :  :  : ]
     [ run sequence/map_construction.cpp :  :  :  : ]
     [ run sequence/map_copy.cpp :  :  :  : ]
+    [ run sequence/map_misc.cpp :  :  :  : ]
+    [ run sequence/map_move.cpp :  :  :  : ]
+    [ run sequence/map_mutate.cpp :  :  :  : ]
     [ run sequence/map_tie.cpp :  :  :  : ]
     [ run sequence/nview.cpp :  :  :  : ]
     [ run sequence/reverse_view.cpp :  :  :  : ]

Modified: trunk/libs/fusion/test/sequence/deque_move.cpp
==============================================================================
--- trunk/libs/fusion/test/sequence/deque_move.cpp	(original)
+++ trunk/libs/fusion/test/sequence/deque_move.cpp	2013-02-04 06:52:18 EST (Mon, 04 Feb 2013)
@@ -13,7 +13,9 @@
 
 #include <boost/fusion/container/deque/deque.hpp>
 
-#define FUSION_SEQUENCE boost::fusion::deque
+#define FUSION_SEQUENCE boost::fusion::deque<std::vector<x>>
+#define FUSION_SEQUENCE2 boost::fusion::deque<std::vector<x>, x>
+
 #include "move.hpp"
 
 #else

Added: trunk/libs/fusion/test/sequence/map_misc.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/fusion/test/sequence/map_misc.cpp	2013-02-04 06:52:18 EST (Mon, 04 Feb 2013)
@@ -0,0 +1,167 @@
+/*=============================================================================
+    Copyright (c) 1999-2003 Jaakko Jarvi
+    Copyright (c) 2001-2013 Joel de Guzman
+    Copyright (c) 2006 Dan Marsden
+
+    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/fusion/container/map/map.hpp>
+#include <boost/fusion/container/map/convert.hpp>
+#include <boost/detail/lightweight_test.hpp>
+#include <boost/fusion/sequence/intrinsic.hpp>
+#include <boost/fusion/support/is_sequence.hpp>
+#include <boost/fusion/mpl.hpp>
+#include <boost/mpl/find.hpp>
+#include <boost/mpl/equal.hpp>
+#include <boost/mpl/int.hpp>
+#include <boost/mpl/integral_c.hpp>
+#include <boost/type_traits/is_same.hpp>
+#include <string>
+
+struct k1 {};
+struct k2 {};
+struct k3 {};
+struct k4 {};
+
+template <typename S1, typename S2>
+struct is_same
+{
+};
+
+namespace fn = boost::fusion;
+
+struct test_intrinsics1
+{
+    // test at, begin, end, next, prior, advance, size, deref, etc.
+
+    typedef fn::map<
+        fn::pair<k1, int>, fn::pair<k2, float>,
+        fn::pair<k3, bool>, fn::pair<k3, char> >
+    sequence;
+
+    typedef boost::mpl::begin<sequence>::type first;
+    typedef boost::mpl::next<first>::type second;
+    typedef boost::mpl::next<second>::type third;
+    typedef boost::mpl::next<third>::type fourth;
+    typedef boost::mpl::end<sequence>::type last;
+
+    BOOST_STATIC_ASSERT((boost::is_same<
+        boost::mpl::deref<first>::type, fn::pair<k1, int> >::value));
+
+    BOOST_STATIC_ASSERT((boost::is_same<
+        boost::mpl::deref<second>::type, fn::pair<k2, float> >::value));
+
+    BOOST_STATIC_ASSERT((boost::is_same<
+        boost::mpl::deref<third>::type, fn::pair<k3, bool> >::value));
+
+    BOOST_STATIC_ASSERT((boost::is_same<
+        boost::mpl::deref<fourth>::type, fn::pair<k3, char> >::value));
+
+    BOOST_STATIC_ASSERT((boost::is_same<
+        boost::mpl::at_c<sequence, 2>::type, fn::pair<k3, bool> >::value));
+
+    BOOST_STATIC_ASSERT((boost::is_same<
+        boost::mpl::front<sequence>::type, fn::pair<k1, int> >::value));
+
+    BOOST_STATIC_ASSERT((boost::is_same<
+        boost::mpl::deref<
+            boost::mpl::advance_c<second, 2>::type>::type, fn::pair<k3, char> >::value));
+
+    BOOST_STATIC_ASSERT((boost::mpl::size<sequence>::value == 4));
+    BOOST_STATIC_ASSERT(!(boost::mpl::empty<sequence>::value));
+    BOOST_STATIC_ASSERT((boost::mpl::distance<second, fourth>::value == 2));
+
+    typedef boost::mpl::prior<last>::type fourth_;
+    typedef boost::mpl::prior<fourth_>::type third_;
+    typedef boost::mpl::prior<third_>::type second_;
+    typedef boost::mpl::prior<second_>::type first_;
+
+    BOOST_STATIC_ASSERT((boost::is_same<
+        boost::mpl::deref<first_>::type, fn::pair<k1, int> >::value));
+
+    BOOST_STATIC_ASSERT((boost::is_same<
+        boost::mpl::deref<second_>::type, fn::pair<k2, float> >::value));
+
+    BOOST_STATIC_ASSERT((boost::is_same<
+        boost::mpl::deref<third_>::type, fn::pair<k3, bool> >::value));
+
+    BOOST_STATIC_ASSERT((boost::is_same<
+        boost::mpl::deref<fourth_>::type, fn::pair<k3, char> >::value));
+
+    BOOST_STATIC_ASSERT((boost::is_same<
+        boost::mpl::back<sequence>::type, fn::pair<k3, char> >::value));
+
+};
+
+void
+test()
+{
+    using namespace boost::fusion;
+
+    {   // testing const sequences
+
+        const map<pair<k1, int>, pair<k2, float> > t1(5, 3.3f);
+        BOOST_TEST(at_c<0>(t1).second == 5);
+        BOOST_TEST(at_c<1>(t1).second == 3.3f);
+    }
+
+    {   // testing at<N> works with MPL integral constants
+        const map<pair<k1, int>, pair<k2, char> > t1(101, 'z');
+        BOOST_TEST(boost::fusion::at<boost::mpl::int_<0> >(t1).second == 101);
+        BOOST_TEST(boost::fusion::at<boost::mpl::int_<1> >(t1).second == 'z');
+        // explicitly try something other than mpl::int_
+        BOOST_TEST((boost::fusion::at<boost::mpl::integral_c<long, 0> >(t1).second == 101));
+        BOOST_TEST((boost::fusion::at<boost::mpl::integral_c<long, 1> >(t1).second == 'z'));
+    }
+
+    {   // testing size & empty
+
+        typedef map<pair<k1, int>, pair<k2, float>, pair<k3, double> > t1;
+        typedef map<> t2;
+
+        BOOST_STATIC_ASSERT(boost::fusion::result_of::size<t1>::value == 3);
+        BOOST_STATIC_ASSERT(boost::fusion::result_of::size<t2>::value == 0);
+        BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<t1>::value);
+        BOOST_STATIC_ASSERT(boost::fusion::result_of::empty<t2>::value);
+    }
+
+    {   // testing front & back
+
+        typedef map<pair<k1, int>, pair<k2, float>, pair<k3, std::string> > tup;
+        tup t(1, 2.2f, std::string("Kimpo"));
+
+        BOOST_TEST(front(t).second == 1);
+        BOOST_TEST(back(t).second == "Kimpo");
+    }
+
+    {   // testing is_sequence
+
+        typedef map<pair<k1, int>, pair<k2, float>, pair<k3, double> > t1;
+        typedef map<> t2;
+        typedef map<pair<k1, char> > t3;
+
+        BOOST_STATIC_ASSERT(traits::is_sequence<t1>::value);
+        BOOST_STATIC_ASSERT(traits::is_sequence<t2>::value);
+        BOOST_STATIC_ASSERT(traits::is_sequence<t3>::value);
+        BOOST_STATIC_ASSERT(!traits::is_sequence<int>::value);
+        BOOST_STATIC_ASSERT(!traits::is_sequence<char>::value);
+    }
+
+    {   // testing mpl compatibility
+
+        // test an algorithm
+        typedef map<pair<k1, int>, pair<k2, float>, pair<k3, double> > t1;
+        typedef boost::mpl::find<t1, pair<k2, float> >::type iter;
+        typedef boost::mpl::deref<iter>::type type;
+        BOOST_STATIC_ASSERT((boost::is_same<type, pair<k2, float> >::value));
+    }
+}
+
+int
+main()
+{
+    test();
+    return boost::report_errors();
+}
+

Added: trunk/libs/fusion/test/sequence/map_move.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/fusion/test/sequence/map_move.cpp	2013-02-04 06:52:18 EST (Mon, 04 Feb 2013)
@@ -0,0 +1,39 @@
+/*=============================================================================
+    Copyright (c) 2012 Joel de Guzman
+
+    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)
+==============================================================================*/
+#define BOOST_FUSION_DONT_USE_PREPROCESSED_FILES // $$$ JDG temp $$$
+
+#include <boost/config.hpp>
+
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+
+#include <boost/fusion/container/map/map.hpp>
+
+struct k1 {};
+struct k2 {};
+
+#define FUSION_SEQUENCE boost::fusion::map<boost::fusion::pair<k1, std::vector<x>>>
+
+#define FUSION_SEQUENCE2 boost::fusion::map<        \
+    boost::fusion::pair<k1, std::vector<x>>,        \
+    boost::fusion::pair<k2, x>>
+
+#include "move.hpp"
+
+#else
+#include <boost/detail/lightweight_test.hpp>
+#endif
+
+int
+main()
+{
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+    test();
+#endif
+
+    return boost::report_errors();
+}
+

Added: trunk/libs/fusion/test/sequence/map_mutate.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/fusion/test/sequence/map_mutate.cpp	2013-02-04 06:52:18 EST (Mon, 04 Feb 2013)
@@ -0,0 +1,69 @@
+/*=============================================================================
+    Copyright (c) 1999-2003 Jaakko Jarvi
+    Copyright (c) 2001-2011 Joel de Guzman
+    Copyright (c) 2006
+
+    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/fusion/container/map/map.hpp>
+#include <boost/detail/lightweight_test.hpp>
+#include <boost/fusion/sequence/intrinsic/at.hpp>
+
+struct k1 {};
+struct k2 {};
+struct k3 {};
+struct k4 {};
+
+namespace test_detail
+{
+    // no public default constructor
+    class foo
+    {
+    public:
+
+        explicit foo(int v) : val(v) {}
+
+        bool operator==(const foo& other) const
+        {
+            return val == other.val;
+        }
+
+    private:
+
+        foo() {}
+        int val;
+    };
+}
+
+void
+test()
+{
+    using namespace boost::fusion;
+    using namespace test_detail;
+
+    map<
+        pair<k1, int>,
+        pair<k1, float>,
+        pair<k1, bool>,
+        pair<k1, foo>
+    > t1(5, 12.2f, true, foo(4));
+
+    at_c<0>(t1).second = 6;
+    at_c<1>(t1).second = 2.2f;
+    at_c<2>(t1).second = false;
+    at_c<3>(t1).second = foo(5);
+
+    BOOST_TEST(at_c<0>(t1).second == 6);
+    BOOST_TEST(at_c<1>(t1).second > 2.1f && at_c<1>(t1).second < 2.3f);
+    BOOST_TEST(at_c<2>(t1).second == false);
+    BOOST_TEST(at_c<3>(t1).second == foo(5));
+}
+
+int
+main()
+{
+    test();
+    return boost::report_errors();
+}
+

Modified: trunk/libs/fusion/test/sequence/move.hpp
==============================================================================
--- trunk/libs/fusion/test/sequence/move.hpp	(original)
+++ trunk/libs/fusion/test/sequence/move.hpp	2013-02-04 06:52:18 EST (Mon, 04 Feb 2013)
@@ -73,7 +73,7 @@
         return T();
     }
 
-    typedef FUSION_SEQUENCE<std::vector<x>> return_type;
+    typedef FUSION_SEQUENCE return_type;
 
     return_type
     generate()
@@ -84,7 +84,7 @@
         return return_type();
     }
 
-    typedef FUSION_SEQUENCE<std::vector<x>, x> return_type2;
+    typedef FUSION_SEQUENCE2 return_type2;
 
     return_type2
     generate2()

Modified: trunk/libs/fusion/test/sequence/vector_move.cpp
==============================================================================
--- trunk/libs/fusion/test/sequence/vector_move.cpp	(original)
+++ trunk/libs/fusion/test/sequence/vector_move.cpp	2013-02-04 06:52:18 EST (Mon, 04 Feb 2013)
@@ -12,7 +12,9 @@
 
 #include <boost/fusion/container/vector/vector.hpp>
 
-#define FUSION_SEQUENCE boost::fusion::vector
+#define FUSION_SEQUENCE boost::fusion::vector<std::vector<x>>
+#define FUSION_SEQUENCE2 boost::fusion::vector<std::vector<x>, x>
+
 #include "move.hpp"
 
 #else