Move libc++ pair/tuple assign test to libcxx/ test directory.

Libc++ implements the pair& operator=(pair<U, V>) assignment operator
using a single template that handles assignment from all tuple-like types.

This patch moves the test for that to the libcxx test directory since
it's non-standard. It also adds additional tests to the std/.../pair
directory to test the standard behavior this template implements.

llvm-svn: 328758

diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_tuple.pass.cpp b/libcxx/test/libcxx/utilities/utility/pairs/pairs.pair/assign_tuple_like.pass.cpp
similarity index 67%
rename from libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_tuple.pass.cpp
rename to libcxx/test/libcxx/utilities/utility/pairs/pairs.pair/assign_tuple_like.pass.cpp
index ef7bebc..0e0117e 100644 (file)
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_tuple.pass.cpp
+++ b/libcxx/test/libcxx/utilities/utility/pairs/pairs.pair/assign_tuple_like.pass.cpp
@@ -21,58 +21,22 @@
 #include <memory>
 #include <cassert>
 
+#include "archetypes.hpp"
+
 // Clang warns about missing braces when initializing std::array.
 #if defined(__clang__)
 #pragma clang diagnostic ignored "-Wmissing-braces"
 #endif
 
-struct CountingType {
-  static int constructed;
-  static int copy_constructed;
-  static int move_constructed;
-  static int assigned;
-  static int copy_assigned;
-  static int move_assigned;
-  static void reset() {
-      constructed = copy_constructed = move_constructed = 0;
-      assigned = copy_assigned = move_assigned = 0;
-  }
-  CountingType() : value(0) { ++constructed; }
-  CountingType(int v) : value(v) { ++constructed; }
-  CountingType(CountingType const& o) : value(o.value) { ++constructed; ++copy_constructed; }
-  CountingType(CountingType&& o) : value(o.value) { ++constructed; ++move_constructed; o.value = -1;}
-
-  CountingType& operator=(CountingType const& o) {
-      ++assigned;
-      ++copy_assigned;
-      value = o.value;
-      return *this;
-  }
-  CountingType& operator=(CountingType&& o) {
-      ++assigned;
-      ++move_assigned;
-      value = o.value;
-      o.value = -1;
-      return *this;
-  }
-  int value;
-};
-int CountingType::constructed;
-int CountingType::copy_constructed;
-int CountingType::move_constructed;
-int CountingType::assigned;
-int CountingType::copy_assigned;
-int CountingType::move_assigned;
-
 int main()
 {
-    using C = CountingType;
+    using C = TestTypes::TestType;
     {
        using P = std::pair<int, C>;
        using T = std::tuple<int, C>;
        T t(42, C{42});
        P p(101, C{101});
-       C::reset();
+       C::reset_constructors();
        p = t;
        assert(C::constructed == 0);
        assert(C::assigned == 1);
@@ -86,7 +50,7 @@ int main()
        using T = std::tuple<int, C>;
        T t(42, -42);
        P p(101, 101);
-       C::reset();
+       C::reset_constructors();
        p = std::move(t);
        assert(C::constructed == 0);
        assert(C::assigned == 1);
@@ -100,7 +64,7 @@ int main()
        using T = std::array<C, 2>;
        T t = {42, -42};
        P p{101, 101};
-       C::reset();
+       C::reset_constructors();
        p = t;
        assert(C::constructed == 0);
        assert(C::assigned == 2);
@@ -114,7 +78,7 @@ int main()
        using T = std::array<C, 2>;
        T t = {42, -42};
        P p{101, 101};
-       C::reset();
+       C::reset_constructors();
        p = t;
        assert(C::constructed == 0);
        assert(C::assigned == 2);
@@ -128,7 +92,7 @@ int main()
        using T = std::array<C, 2>;
        T t = {42, -42};
        P p{101, 101};
-       C::reset();
+       C::reset_constructors();
        p = std::move(t);
        assert(C::constructed == 0);
        assert(C::assigned == 2);

diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_pair_U_V.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_pair_U_V.pass.cpp
index 132443f..3ee6f07 100644 (file)
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_pair_U_V.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_pair_U_V.pass.cpp
@@ -16,6 +16,11 @@
 #include <utility>
 #include <cassert>
 
+#include "test_macros.h"
+#if TEST_STD_VER >= 11
+#include "archetypes.hpp"
+#endif
+
 int main()
 {
     {
@@ -27,4 +32,21 @@ int main()
         assert(p2.first == 3);
         assert(p2.second == 4);
     }
+#if TEST_STD_VER >= 11
+    {
+       using C = TestTypes::TestType;
+       using P = std::pair<int, C>;
+       using T = std::pair<long, C>;
+       const T t(42, -42);
+       P p(101, 101);
+       C::reset_constructors();
+       p = t;
+       assert(C::constructed == 0);
+       assert(C::assigned == 1);
+       assert(C::copy_assigned == 1);
+       assert(C::move_assigned == 0atu);
+       assert(p.first == 42);
+       assert(p.second.value == -42);
+    }
+#endif
 }

diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair_U_V.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair_U_V.pass.cpp
index 76dfc3f..b7a89a8 100644 (file)
--- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair_U_V.pass.cpp
+++ b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair_U_V.pass.cpp
@@ -18,6 +18,7 @@
 #include <utility>
 #include <memory>
 #include <cassert>
+#include <archetypes.hpp>
 
 struct Base
 {
@@ -40,4 +41,19 @@ int main()
         assert(p2.first == nullptr);
         assert(p2.second == 4);
     }
+    {
+       using C = TestTypes::TestType;
+       using P = std::pair<int, C>;
+       using T = std::pair<long, C>;
+       T t(42, -42);
+       P p(101, 101);
+       C::reset_constructors();
+       p = std::move(t);
+       assert(C::constructed == 0);
+       assert(C::assigned == 1);
+       assert(C::copy_assigned == 0);
+       assert(C::move_assigned == 1);
+       assert(p.first == 42);
+       assert(p.second.value == -42);
+    }
 }