Count copies too

Author: moskupols

test/regressions.cpp

@@ -6,6 +6,7 @@
 
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "function2-test.hpp"
@@ -262,31 +263,41 @@ TYPED_TEST(AllReferenceRetConstructTests, reference_returns_not_buildable) {
   ASSERT_EQ(ref.data(), 8373827);
 }
 
-/// Functor which counts the number of times it has been moved
-class MoveCountFunctor {
+/// Functor which counts the number of times it has been copied or moved
+class CopyAndMoveCountFunctor {
+  int copy_count = 0;
   int move_count = 0;
 
 public:
-  MoveCountFunctor() {
+  CopyAndMoveCountFunctor() = default;
+
+  CopyAndMoveCountFunctor(const CopyAndMoveCountFunctor& that) {
+    *this = that;
   }
 
-  MoveCountFunctor(const MoveCountFunctor&) = delete;
-  MoveCountFunctor& operator=(const MoveCountFunctor&) = delete;
-  ~MoveCountFunctor() = default;
+  CopyAndMoveCountFunctor& operator=(const CopyAndMoveCountFunctor& that) {
+    copy_count = that.copy_count + 1;
+    move_count = that.move_count;
+  }
 
-  MoveCountFunctor(MoveCountFunctor&& that): move_count(that.move_count + 1) {
+  CopyAndMoveCountFunctor(CopyAndMoveCountFunctor&& that) {
+    *this = std::move(that);
   }
-  MoveCountFunctor& operator=(MoveCountFunctor&& that) {
+
+  CopyAndMoveCountFunctor& operator=(CopyAndMoveCountFunctor&& that) {
+    copy_count = that.copy_count;
     move_count = that.move_count + 1;
     return *this;
   }
 
-  int operator()() const {
-    return move_count;
+  ~CopyAndMoveCountFunctor() = default;
+
+  std::pair<int, int> operator()() const {
+    return std::make_pair(copy_count, move_count);
   }
 };
 
 TEST(regression_tests, no_extra_move_during_construction) {
-  fu2::function<int()> f(MoveCountFunctor{});
-  ASSERT_EQ(f(), 1);
+  fu2::function<int()> f(CopyAndMoveCountFunctor{});
+  ASSERT_EQ(f(), std::make_pair(0, 1));
 }