Continue fleshing out insert_tests

include/boost/unordered/concurrent_flat_map.hpp

@@ -89,7 +89,7 @@ namespace boost {
     class concurrent_flat_map
     {
     private:
-      using type_policy = detail::concurrent_map_types<Key,T>;
+      using type_policy = detail::concurrent_map_types<Key, T>;
 
       detail::foa::concurrent_table<type_policy, Hash, Pred, Allocator> table_;
 
@@ -117,9 +117,19 @@ namespace boost {
       {
       }
 
-      bool insert(value_type const& obj)
+      /// Capacity
+      ///
+
+      size_type size() const noexcept { return table_.size(); }
+
+      /// Modifiers
+      ///
+
+      bool insert(value_type const& obj) { return table_.insert(obj); }
+
+      template <class F> std::size_t visit_all(F f)
       {
-        return table_.insert(obj);
+        return table_.visit_all(std::move(f));
       }
     };
   } // namespace unordered

test/cfoa/insert_tests.cpp

@@ -5,9 +5,11 @@
 #include "../helpers/generators.hpp"
 #include "../helpers/test.hpp"
 
-#include <boost/container_hash/hash.hpp>
 #include <boost/unordered/concurrent_flat_map.hpp>
 
+#include <boost/container_hash/hash.hpp>
+#include <boost/unordered/unordered_flat_map.hpp>
+
 #include <atomic>
 #include <iostream>
 #include <vector>
@@ -111,30 +113,58 @@ std::vector<std::pair<raii const, raii> > make_random_values(
     int b = generate(p, rg);
     v.emplace_back(raii{a}, raii{b});
   }
-
-  raii::reset_counts();
-
   return v;
 }
 
 namespace {
   test::seed_t initialize_seed(78937);
 
-  template <class X> void insert(X*, test::random_generator generator)
+  struct lvalue_inserter_type
   {
-    raii::reset_counts();
+    template <class T, class X>
-
+    void operator()(std::vector<T> const& values, X& x)
-    auto values = make_random_values(1024, generator);
-    BOOST_TEST_GT(values.size(), 0);
-
     {
-      X x;
-
       for (auto const& r : values) {
         bool b = x.insert(r);
         (void)b;
       }
     }
+  } lvalue_inserter;
+
+  struct rvalue_inserter_type
+  {
+    template <class T, class X> void operator()(std::vector<T>& values, X& x)
+    {
+      for (auto& r : values) {
+        bool b = x.insert(std::move(r));
+        (void)b;
+      }
+    }
+  } rvalue_inserter;
+
+  template <class X, class F>
+  void insert(X*, F inserter, test::random_generator generator)
+  {
+    auto values = make_random_values(1024, generator);
+    BOOST_TEST_GT(values.size(), 0);
+
+    auto reference_map =
+      boost::unordered_flat_map<raii, raii>(values.begin(), values.end());
+
+    raii::reset_counts();
+
+    {
+      X x;
+
+      inserter(values, x);
+
+      BOOST_TEST_EQ(x.size(), reference_map.size());
+
+      using value_type = typename X::value_type;
+      BOOST_TEST_EQ(x.size(), x.visit_all([&](value_type const& kv) {
+        BOOST_TEST(reference_map.contains(kv.first));
+      }));
+    }
 
     BOOST_TEST_GE(raii::default_constructor, 0);
     BOOST_TEST_GE(raii::copy_constructor, 0);
@@ -157,7 +187,11 @@ using test::default_generator;
 using test::generate_collisions;
 using test::limited_range;
 
+// clang-format off
 UNORDERED_TEST(
-  insert, ((map))((default_generator)(generate_collisions)(limited_range)))
+  insert, ((map))
+          ((lvalue_inserter)(rvalue_inserter))
+          ((default_generator)(generate_collisions)(limited_range)))
+// clang-format on
 
 RUN_TESTS()