Merge pull request #946 from KFilipek/test-modifiers

string_view: add modifiers API and related libcxx tests

Author: lukaszstolarczuk

include/libpmemobj++/string_view.hpp

@@ -13,6 +13,7 @@
 #include <limits>
 #include <stdexcept>
 #include <string>
+#include <utility>
 
 #if __cpp_lib_string_view
 #include <string_view>
@@ -88,6 +89,10 @@ class basic_string_view {
 	constexpr const_reference front() const noexcept;
 	constexpr const_reference back() const noexcept;
 
+	void remove_prefix(size_type n);
+	void remove_suffix(size_type n);
+	void swap(basic_string_view &v) noexcept;
+
 	int compare(const basic_string_view &other) const noexcept;
 
 private:
@@ -320,6 +325,47 @@ basic_string_view<CharT, Traits>::front() const noexcept
 	return operator[](0);
 }
 
+/**
+ * Moves the start of the view forward by n characters.
+ * The behavior is undefined if n > size().
+ *
+ * @param[in] n number of characters to remove from the start of the view
+ */
+template <typename CharT, typename Traits>
+void
+basic_string_view<CharT, Traits>::remove_prefix(size_type n)
+{
+	data_ += n;
+	size_ -= n;
+}
+
+/**
+ * Moves the end of the view back by n characters.
+ * The behavior is undefined if n > size().
+ *
+ * @param[in] n number of characters to remove from the end of the view
+ */
+template <typename CharT, typename Traits>
+void
+basic_string_view<CharT, Traits>::remove_suffix(size_type n)
+{
+	size_ -= n;
+}
+
+/**
+ * Exchanges the view with that of v.
+ *
+ * @param[in] v view to swap with
+ */
+template <typename CharT, typename Traits>
+void
+basic_string_view<CharT, Traits>::swap(
+	basic_string_view<CharT, Traits> &v) noexcept
+{
+	std::swap(data_, v.data_);
+	std::swap(size_, v.size_);
+}
+
 /**
  * Compares this string_view with other. Works in the same way as
  * std::basic_string::compare.

tests/external/CMakeLists.txt

@@ -764,6 +764,15 @@ if (TEST_STRING)
 	build_test(string_libcxx_string_view_end libcxx/string.view/string.view.iterators/end.pass.cpp)
 	add_test_generic(NAME string_libcxx_string_view_end TRACERS none pmemcheck memcheck)
 
+	build_test(string_libcxx_string_view_swap libcxx/string.view/string.view.modifiers/swap.pass.cpp)
+	add_test_generic(NAME string_libcxx_string_view_swap TRACERS none pmemcheck memcheck)
+
+	build_test(string_libcxx_string_view_remove_prefix libcxx/string.view/string.view.modifiers/remove_prefix.pass.cpp)
+	add_test_generic(NAME string_libcxx_string_view_remove_prefix TRACERS none pmemcheck memcheck)
+
+	build_test(string_libcxx_string_view_remove_suffix libcxx/string.view/string.view.modifiers/remove_suffix.pass.cpp)
+	add_test_generic(NAME string_libcxx_string_view_remove_suffix TRACERS none pmemcheck memcheck)
+
 	if(MSVC_VERSION GREATER_EQUAL 1920)
 		build_test(string_libcxx_string_view_opeq_string_view libcxx/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp)
 		add_test_generic(NAME string_libcxx_string_view_opeq_string_view TRACERS none pmemcheck memcheck)

tests/external/libcxx/string.view/string.view.modifiers/remove_prefix.pass.cpp

@@ -0,0 +1,69 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// Copyright 2020, Intel Corporation
+//
+// Modified to test pmem::obj containers
+//
+
+// <string_view>
+
+// void remove_prefix(size_type _n)
+
+#include "unittest.hpp"
+
+#include <libpmemobj++/string_view.hpp>
+
+template <typename CharT>
+void
+test(const CharT *s, size_t len)
+{
+	typedef pmem::obj::basic_string_view<CharT> SV;
+	{
+		SV sv1(s);
+		UT_ASSERT(sv1.size() == len);
+		UT_ASSERT(sv1.data() == s);
+
+		if (len > 0) {
+			sv1.remove_prefix(1);
+			UT_ASSERT(sv1.size() == (len - 1));
+			UT_ASSERT(sv1.data() == (s + 1));
+			sv1.remove_prefix(len - 1);
+		}
+
+		UT_ASSERT(sv1.size() == 0);
+		sv1.remove_prefix(0);
+		UT_ASSERT(sv1.size() == 0);
+	}
+}
+
+static void
+run()
+{
+	test("ABCDE", 5);
+	test("a", 1);
+	test("", 0);
+
+	test(L"ABCDE", 5);
+	test(L"a", 1);
+	test(L"", 0);
+
+	test(u"ABCDE", 5);
+	test(u"a", 1);
+	test(u"", 0);
+
+	test(U"ABCDE", 5);
+	test(U"a", 1);
+	test(U"", 0);
+}
+
+int
+main(int argc, char *argv[])
+{
+	return run_test([&] { run(); });
+}

tests/external/libcxx/string.view/string.view.modifiers/remove_suffix.pass.cpp

@@ -0,0 +1,69 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// Copyright 2020, Intel Corporation
+//
+// Modified to test pmem::obj containers
+//
+
+// <string_view>
+
+// void remove_suffix(size_type _n)
+
+#include "unittest.hpp"
+
+#include <libpmemobj++/string_view.hpp>
+
+template <typename CharT>
+void
+test(const CharT *s, size_t len)
+{
+	typedef pmem::obj::basic_string_view<CharT> SV;
+	{
+		SV sv1(s);
+		UT_ASSERT(sv1.size() == len);
+		UT_ASSERT(sv1.data() == s);
+
+		if (len > 0) {
+			sv1.remove_suffix(1);
+			UT_ASSERT(sv1.size() == (len - 1));
+			UT_ASSERT(sv1.data() == s);
+			sv1.remove_suffix(len - 1);
+		}
+
+		UT_ASSERT(sv1.size() == 0);
+		sv1.remove_suffix(0);
+		UT_ASSERT(sv1.size() == 0);
+	}
+}
+
+static void
+run()
+{
+	test("ABCDE", 5);
+	test("a", 1);
+	test("", 0);
+
+	test(L"ABCDE", 5);
+	test(L"a", 1);
+	test(L"", 0);
+
+	test(u"ABCDE", 5);
+	test(u"a", 1);
+	test(u"", 0);
+
+	test(U"ABCDE", 5);
+	test(U"a", 1);
+	test(U"", 0);
+}
+
+int
+main(int argc, char *argv[])
+{
+	return run_test([&] { run(); });
+}

tests/external/libcxx/string.view/string.view.modifiers/swap.pass.cpp

@@ -0,0 +1,66 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// Copyright 2020, Intel Corporation
+//
+// Modified to test pmem::obj containers
+//
+
+// <string_view>
+
+// void swap(basic_string_view& _other) noexcept
+
+#include "unittest.hpp"
+
+#include <libpmemobj++/string_view.hpp>
+
+template <typename CharT>
+void
+test(const CharT *s, size_t len)
+{
+	typedef pmem::obj::basic_string_view<CharT> SV;
+	{
+		SV sv1(s);
+		SV sv2;
+
+		UT_ASSERT(sv1.size() == len);
+		UT_ASSERT(sv1.data() == s);
+		UT_ASSERT(sv2.size() == 0);
+
+		sv1.swap(sv2);
+		UT_ASSERT(sv1.size() == 0);
+		UT_ASSERT(sv2.size() == len);
+		UT_ASSERT(sv2.data() == s);
+	}
+}
+
+static void
+run()
+{
+	test("ABCDE", 5);
+	test("a", 1);
+	test("", 0);
+
+	test(L"ABCDE", 5);
+	test(L"a", 1);
+	test(L"", 0);
+
+	test(u"ABCDE", 5);
+	test(u"a", 1);
+	test(u"", 0);
+
+	test(U"ABCDE", 5);
+	test(U"a", 1);
+	test(U"", 0);
+}
+
+int
+main(int argc, char *argv[])
+{
+	return run_test([&] { run(); });
+}