[libcxx] r344998 - Add tests for match_results copy/move assignment operators. NFC

Marshall Clow mclow.lists at gmail.com
Mon Oct 22 19:51:26 PDT 2018


Author: marshall
Date: Mon Oct 22 19:51:26 2018
New Revision: 344998

URL: http://llvm.org/viewvc/llvm-project?rev=344998&view=rev
Log:
Add tests for match_results copy/move assignment operators. NFC

Added:
    libcxx/trunk/test/std/re/re.results/re.results.const/copy_assign.pass.cpp
    libcxx/trunk/test/std/re/re.results/re.results.const/move_assign.pass.cpp
Modified:
    libcxx/trunk/test/std/re/re.results/re.results.const/move.pass.cpp

Added: libcxx/trunk/test/std/re/re.results/re.results.const/copy_assign.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/re/re.results/re.results.const/copy_assign.pass.cpp?rev=344998&view=auto
==============================================================================
--- libcxx/trunk/test/std/re/re.results/re.results.const/copy_assign.pass.cpp (added)
+++ libcxx/trunk/test/std/re/re.results/re.results.const/copy_assign.pass.cpp Mon Oct 22 19:51:26 2018
@@ -0,0 +1,50 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// class match_results<BidirectionalIterator, Allocator>
+
+// match_results& operator=(const match_results& m);
+
+#include <regex>
+#include <cassert>
+#include "test_macros.h"
+#include "test_allocator.h"
+
+template <class CharT, class Allocator>
+void
+test(const Allocator& a)
+{
+    typedef std::match_results<const CharT*, Allocator> SM;
+    SM m0(a);
+    SM m1;
+    
+    m1 = m0;
+    assert(m1.size()          == m0.size());
+    assert(m1.str()           == m0.str());
+    if (std::allocator_traits<Allocator>::propagate_on_container_copy_assignment::value)
+        assert(m1.get_allocator() == m0.get_allocator());
+    else
+        assert(m1.get_allocator() == Allocator());
+}
+
+int main()
+{
+    test<char>   (std::allocator<std::sub_match<const char *> >());
+    test<wchar_t>(std::allocator<std::sub_match<const wchar_t *> >());
+
+//  test_allocator has POCCA -> false
+    test<char>   (test_allocator<std::sub_match<const char*> >(3));
+    test<wchar_t>(test_allocator<std::sub_match<const wchar_t*> >(3));
+
+//  other_allocator has POCCA -> true
+    test<char>   (other_allocator<std::sub_match<const char*> >(3));
+    test<wchar_t>(other_allocator<std::sub_match<const wchar_t*> >(3));
+}

Modified: libcxx/trunk/test/std/re/re.results/re.results.const/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/re/re.results/re.results.const/move.pass.cpp?rev=344998&r1=344997&r2=344998&view=diff
==============================================================================
--- libcxx/trunk/test/std/re/re.results/re.results.const/move.pass.cpp (original)
+++ libcxx/trunk/test/std/re/re.results/re.results.const/move.pass.cpp Mon Oct 22 19:51:26 2018
@@ -12,6 +12,8 @@
 // class match_results<BidirectionalIterator, Allocator>
 
 // match_results(match_results&& m) noexcept;
+//
+//  Additionally, the stored Allocator value is move constructed from m.get_allocator().
 
 #include <regex>
 #include <cassert>
@@ -26,6 +28,8 @@ test(const Allocator& a)
     ASSERT_NOEXCEPT(SM(std::declval<SM&&>()));
 
     SM m0(a);
+    assert(m0.get_allocator() == a);
+
     SM m1(std::move(m0));
     assert(m1.size() == 0);
     assert(m1.str() == std::basic_string<CharT>());
@@ -38,5 +42,7 @@ int main()
     test<wchar_t>(std::allocator<std::sub_match<const wchar_t *> >());
 
     test<char>   (test_allocator<std::sub_match<const char*> >(3));
+    assert(test_alloc_base::moved == 1);
     test<wchar_t>(test_allocator<std::sub_match<const wchar_t*> >(3));
+    assert(test_alloc_base::moved == 2);
 }

Added: libcxx/trunk/test/std/re/re.results/re.results.const/move_assign.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/re/re.results/re.results.const/move_assign.pass.cpp?rev=344998&view=auto
==============================================================================
--- libcxx/trunk/test/std/re/re.results/re.results.const/move_assign.pass.cpp (added)
+++ libcxx/trunk/test/std/re/re.results/re.results.const/move_assign.pass.cpp Mon Oct 22 19:51:26 2018
@@ -0,0 +1,50 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <regex>
+
+// class match_results<BidirectionalIterator, Allocator>
+
+// match_results& operator=(match_results&& m);
+
+#include <regex>
+#include <cassert>
+#include "test_macros.h"
+#include "test_allocator.h"
+
+template <class CharT, class Allocator>
+void
+test(const Allocator& a)
+{
+    typedef std::match_results<const CharT*, Allocator> SM;
+    SM m0(a);
+    SM m1;
+    
+    m1 = std::move(m0);
+    assert(m1.size()          == 0);
+    assert(m1.str()           == std::basic_string<CharT>());
+    if (std::allocator_traits<Allocator>::propagate_on_container_move_assignment::value)
+        assert(m1.get_allocator() == a);
+    else
+        assert(m1.get_allocator() == Allocator());
+}
+
+int main()
+{
+    test<char>   (std::allocator<std::sub_match<const char *> >());
+    test<wchar_t>(std::allocator<std::sub_match<const wchar_t *> >());
+
+//  test_allocator has POCMA -> false
+    test<char>   (test_allocator<std::sub_match<const char*> >(3));
+    test<wchar_t>(test_allocator<std::sub_match<const wchar_t*> >(3));
+
+//  other_allocator has POCMA -> true
+    test<char>   (other_allocator<std::sub_match<const char*> >(3));
+    test<wchar_t>(other_allocator<std::sub_match<const wchar_t*> >(3));
+}




More information about the libcxx-commits mailing list