From 910b8de6977de23215a0582316040782c898fa20 Mon Sep 17 00:00:00 2001
From: Christian Mazakas <christian.mazakas@gmail.com>
Date: Tue, 18 Apr 2023 15:11:53 -0700
Subject: [PATCH] Add iterator range + allocator constructor, continue to clean
 up constructor_tests

---
 .../boost/unordered/concurrent_flat_map.hpp   |  6 +++
 test/cfoa/constructor_tests.cpp               | 53 ++++++++++++++++---
 test/cfoa/helpers.hpp                         | 28 +++++++++-
 3 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/include/boost/unordered/concurrent_flat_map.hpp b/include/boost/unordered/concurrent_flat_map.hpp
index 3085e767..f87d3967 100644
--- a/include/boost/unordered/concurrent_flat_map.hpp
+++ b/include/boost/unordered/concurrent_flat_map.hpp
@@ -176,6 +176,12 @@ namespace boost {
       {
       }
 
+      template <class InputIterator>
+      concurrent_flat_map(InputIterator f, InputIterator l, allocator_type a)
+          : concurrent_flat_map(f, l, 0, hasher(), key_equal(), a)
+      {
+      }
+
       /// Capacity
       ///
 
diff --git a/test/cfoa/constructor_tests.cpp b/test/cfoa/constructor_tests.cpp
index f5572c08..00d60072 100644
--- a/test/cfoa/constructor_tests.cpp
+++ b/test/cfoa/constructor_tests.cpp
@@ -97,10 +97,11 @@ UNORDERED_AUTO_TEST (bucket_count_with_hasher_key_equal_and_allocator) {
     BOOST_TEST_EQ(x.key_eq(), key_equal(2));
     BOOST_TEST(x.get_allocator() == allocator_type{});
   }
-  raii::reset_counts();
 }
 
 UNORDERED_AUTO_TEST (soccc) {
+  raii::reset_counts();
+
   boost::unordered::concurrent_flat_map<raii, raii, hasher, key_equal,
     soccc_allocator<std::pair<raii const, raii> > >
     x;
@@ -134,7 +135,6 @@ namespace {
       if (rg == sequential) {
         BOOST_TEST_EQ(x.size(), values.size());
       }
-      raii::reset_counts();
     }
 
     {
@@ -149,7 +149,6 @@ namespace {
       if (rg == sequential) {
         BOOST_TEST_EQ(x.size(), values.size());
       }
-      raii::reset_counts();
     }
 
     {
@@ -164,7 +163,6 @@ namespace {
       if (rg == sequential) {
         BOOST_TEST_EQ(x.size(), values.size());
       }
-      raii::reset_counts();
     }
 
     {
@@ -179,7 +177,6 @@ namespace {
       if (rg == sequential) {
         BOOST_TEST_EQ(x.size(), values.size());
       }
-      raii::reset_counts();
     }
 
     {
@@ -195,8 +192,9 @@ namespace {
       if (rg == sequential) {
         BOOST_TEST_EQ(x.size(), values.size());
       }
-      raii::reset_counts();
     }
+
+    check_raii_counts();
   }
 
   template <class G> void copy_constructor(G gen, test::random_generator rg)
@@ -234,6 +232,8 @@ namespace {
           BOOST_TEST(y.get_allocator() == x.get_allocator());
         });
     }
+
+    check_raii_counts();
   }
 
   template <class G>
@@ -280,6 +280,8 @@ namespace {
       t1.join();
       t2.join();
     }
+
+    check_raii_counts();
   }
 
   template <class G> void move_constructor(G gen, test::random_generator rg)
@@ -342,6 +344,8 @@ namespace {
 
       BOOST_TEST_EQ(num_transfers, 1u);
     }
+
+    check_raii_counts();
   }
 
   template <class G>
@@ -391,6 +395,38 @@ namespace {
 
       BOOST_TEST_GE(num_transfers, 1u);
     }
+
+    check_raii_counts();
+  }
+
+  template <class G>
+  void iterator_range_with_allocator(G gen, test::random_generator rg)
+  {
+    auto values = make_random_values(1024 * 16, [&] { return gen(rg); });
+    auto reference_map =
+      boost::unordered_flat_map<raii, raii>(values.begin(), values.end());
+
+    raii::reset_counts();
+
+    {
+      allocator_type a;
+      map_type x(values.begin(), values.end(), a);
+
+      BOOST_TEST_GT(x.size(), 0u);
+      BOOST_TEST_LE(x.size(), values.size());
+      if (rg == sequential) {
+        BOOST_TEST_EQ(x.size(), values.size());
+      }
+
+      BOOST_TEST_EQ(x.hash_function(), hasher());
+      BOOST_TEST_EQ(x.key_eq(), key_equal());
+
+      BOOST_TEST(x.get_allocator() == a);
+
+      test_fuzzy_matches_reference(x, reference_map, rg);
+    }
+
+    check_raii_counts();
   }
 
 } // namespace
@@ -420,6 +456,11 @@ UNORDERED_TEST(
   move_constructor_with_insertion,
   ((value_type_generator))
   ((default_generator)(sequential)(limited_range)))
+
+UNORDERED_TEST(
+  iterator_range_with_allocator,
+  ((value_type_generator))
+  ((default_generator)(sequential)(limited_range)))
 // clang-format on
 
 RUN_TESTS()
diff --git a/test/cfoa/helpers.hpp b/test/cfoa/helpers.hpp
index 0e2a3832..02f22d86 100644
--- a/test/cfoa/helpers.hpp
+++ b/test/cfoa/helpers.hpp
@@ -297,7 +297,31 @@ void test_matches_reference(X const& x, Y const& reference_map)
   }));
 }
 
-template <class T>
-using span_value_type = typename T::value_type;
+template <class X, class Y>
+void test_fuzzy_matches_reference(
+  X const& x, Y const& reference_map, test::random_generator rg)
+{
+  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));
+    if (rg == test::sequential) {
+      BOOST_TEST_EQ(kv.second, reference_map.find(kv.first)->second);
+    }
+  }));
+}
+
+template <class T> using span_value_type = typename T::value_type;
+
+void check_raii_counts()
+{
+  BOOST_TEST_GE(raii::default_constructor, 0u);
+  BOOST_TEST_GE(raii::copy_constructor, 0u);
+  BOOST_TEST_GE(raii::move_constructor, 0u);
+  BOOST_TEST_GT(raii::destructor, 0u);
+
+  BOOST_TEST_EQ(
+    raii::default_constructor + raii::copy_constructor + raii::move_constructor,
+    raii::destructor);
+}
 
 #endif // BOOST_UNORDERED_TEST_CFOA_HELPERS_HPP
\ No newline at end of file