From 09044f58d6f640f610e99597faaa4da35ccb92a3 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Wed, 6 Oct 2021 04:58:36 +0300 Subject: [PATCH] Add sv_find_test --- include/boost/core/string_view.hpp | 2 +- test/Jamfile.v2 | 1 + test/sv_find_test.cpp | 130 +++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 test/sv_find_test.cpp diff --git a/include/boost/core/string_view.hpp b/include/boost/core/string_view.hpp index 3117e7d..e9f9059 100644 --- a/include/boost/core/string_view.hpp +++ b/include/boost/core/string_view.hpp @@ -351,7 +351,7 @@ public: p = traits_type::find( p, last - p, s[0] ); if( p == 0 ) break; - if( last - p < n ) break; + if( static_cast( last - p ) < n ) break; if( traits_type::compare( p, s, n ) == 0 ) return p - data(); diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index bb41d02..89d40ac 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -256,6 +256,7 @@ run sv_substr_test.cpp ; run sv_compare_test.cpp ; run sv_starts_with_test.cpp ; run sv_ends_with_test.cpp ; +run sv_find_test.cpp ; use-project /boost/core/swap : ./swap ; build-project ./swap ; diff --git a/test/sv_find_test.cpp b/test/sv_find_test.cpp new file mode 100644 index 0000000..537c975 --- /dev/null +++ b/test/sv_find_test.cpp @@ -0,0 +1,130 @@ +// Copyright 2021 Peter Dimov +// Distributed under the Boost Software License, Version 1.0. +// https://www.boost.org/LICENSE_1_0.txt + +#include +#include +#include + +int main() +{ + std::size_t const npos = boost::core::string_view::npos; + + { + boost::core::string_view sv( "" ); + + BOOST_TEST_EQ( sv.find( boost::core::string_view() ), 0 ); + BOOST_TEST_EQ( sv.find( boost::core::string_view(), 1 ), npos ); + + BOOST_TEST_EQ( sv.find( boost::core::string_view( "" ) ), 0 ); + BOOST_TEST_EQ( sv.find( boost::core::string_view( "" ), 1 ), npos ); + + BOOST_TEST_EQ( sv.find( boost::core::string_view( "1" ) ), npos ); + BOOST_TEST_EQ( sv.find( boost::core::string_view( "1" ), 1 ), npos ); + + BOOST_TEST_EQ( sv.find( '1' ), npos ); + BOOST_TEST_EQ( sv.find( '1', 1 ), npos ); + + BOOST_TEST_EQ( sv.find( "" ), 0 ); + BOOST_TEST_EQ( sv.find( "", 1 ), npos ); + + BOOST_TEST_EQ( sv.find( "1" ), npos ); + BOOST_TEST_EQ( sv.find( "1", 1 ), npos ); + + BOOST_TEST_EQ( sv.find( "1", 0, 0 ), 0 ); + BOOST_TEST_EQ( sv.find( "1", 1, 0 ), npos ); + + BOOST_TEST_EQ( sv.find( "1", 0, 1 ), npos ); + BOOST_TEST_EQ( sv.find( "1", 1, 1 ), npos ); + } + + { + boost::core::string_view sv( "123123" ); + + BOOST_TEST_EQ( sv.find( boost::core::string_view() ), 0 ); + BOOST_TEST_EQ( sv.find( boost::core::string_view(), 1 ), 1 ); + BOOST_TEST_EQ( sv.find( boost::core::string_view(), 6 ), 6 ); + BOOST_TEST_EQ( sv.find( boost::core::string_view(), 7 ), npos ); + + BOOST_TEST_EQ( sv.find( boost::core::string_view( "" ) ), 0 ); + BOOST_TEST_EQ( sv.find( boost::core::string_view( "" ), 1 ), 1 ); + BOOST_TEST_EQ( sv.find( boost::core::string_view( "" ), 6 ), 6 ); + BOOST_TEST_EQ( sv.find( boost::core::string_view( "" ), 7 ), npos ); + + BOOST_TEST_EQ( sv.find( boost::core::string_view( "1" ) ), 0 ); + BOOST_TEST_EQ( sv.find( boost::core::string_view( "1" ), 1 ), 3 ); + BOOST_TEST_EQ( sv.find( boost::core::string_view( "1" ), 3 ), 3 ); + BOOST_TEST_EQ( sv.find( boost::core::string_view( "1" ), 4 ), npos ); + BOOST_TEST_EQ( sv.find( boost::core::string_view( "1" ), 6 ), npos ); + BOOST_TEST_EQ( sv.find( boost::core::string_view( "1" ), 7 ), npos ); + + BOOST_TEST_EQ( sv.find( boost::core::string_view( "23" ) ), 1 ); + BOOST_TEST_EQ( sv.find( boost::core::string_view( "23" ), 1 ), 1 ); + BOOST_TEST_EQ( sv.find( boost::core::string_view( "23" ), 2 ), 4 ); + BOOST_TEST_EQ( sv.find( boost::core::string_view( "23" ), 4 ), 4 ); + BOOST_TEST_EQ( sv.find( boost::core::string_view( "23" ), 5 ), npos ); + BOOST_TEST_EQ( sv.find( boost::core::string_view( "23" ), 6 ), npos ); + BOOST_TEST_EQ( sv.find( boost::core::string_view( "23" ), 7 ), npos ); + + BOOST_TEST_EQ( sv.find( '1' ), 0 ); + BOOST_TEST_EQ( sv.find( '1', 1 ), 3 ); + BOOST_TEST_EQ( sv.find( '1', 2 ), 3 ); + BOOST_TEST_EQ( sv.find( '1', 3 ), 3 ); + BOOST_TEST_EQ( sv.find( '1', 4 ), npos ); + BOOST_TEST_EQ( sv.find( '1', 5 ), npos ); + BOOST_TEST_EQ( sv.find( '1', 6 ), npos ); + BOOST_TEST_EQ( sv.find( '1', 7 ), npos ); + + BOOST_TEST_EQ( sv.find( '3' ), 2 ); + BOOST_TEST_EQ( sv.find( '3', 1 ), 2 ); + BOOST_TEST_EQ( sv.find( '3', 2 ), 2 ); + BOOST_TEST_EQ( sv.find( '3', 3 ), 5 ); + BOOST_TEST_EQ( sv.find( '3', 4 ), 5 ); + BOOST_TEST_EQ( sv.find( '3', 5 ), 5 ); + BOOST_TEST_EQ( sv.find( '3', 6 ), npos ); + BOOST_TEST_EQ( sv.find( '3', 7 ), npos ); + + BOOST_TEST_EQ( sv.find( '9' ), npos ); + + BOOST_TEST_EQ( sv.find( "" ), 0 ); + BOOST_TEST_EQ( sv.find( "", 1 ), 1 ); + BOOST_TEST_EQ( sv.find( "", 6 ), 6 ); + BOOST_TEST_EQ( sv.find( "", 7 ), npos ); + + BOOST_TEST_EQ( sv.find( "1" ), 0 ); + BOOST_TEST_EQ( sv.find( "1", 1 ), 3 ); + BOOST_TEST_EQ( sv.find( "1", 3 ), 3 ); + BOOST_TEST_EQ( sv.find( "1", 4 ), npos ); + BOOST_TEST_EQ( sv.find( "1", 6 ), npos ); + BOOST_TEST_EQ( sv.find( "1", 7 ), npos ); + + BOOST_TEST_EQ( sv.find( "23" ), 1 ); + BOOST_TEST_EQ( sv.find( "23", 1 ), 1 ); + BOOST_TEST_EQ( sv.find( "23", 2 ), 4 ); + BOOST_TEST_EQ( sv.find( "23", 4 ), 4 ); + BOOST_TEST_EQ( sv.find( "23", 5 ), npos ); + BOOST_TEST_EQ( sv.find( "23", 6 ), npos ); + BOOST_TEST_EQ( sv.find( "23", 7 ), npos ); + + BOOST_TEST_EQ( sv.find( "123", 0, 0 ), 0 ); + BOOST_TEST_EQ( sv.find( "123", 1, 0 ), 1 ); + BOOST_TEST_EQ( sv.find( "123", 6, 0 ), 6 ); + BOOST_TEST_EQ( sv.find( "123", 7, 0 ), npos ); + + BOOST_TEST_EQ( sv.find( "123", 0, 1 ), 0 ); + BOOST_TEST_EQ( sv.find( "123", 1, 1 ), 3 ); + BOOST_TEST_EQ( sv.find( "123", 3, 1 ), 3 ); + BOOST_TEST_EQ( sv.find( "123", 4, 1 ), npos ); + BOOST_TEST_EQ( sv.find( "123", 6, 1 ), npos ); + BOOST_TEST_EQ( sv.find( "123", 7, 1 ), npos ); + + BOOST_TEST_EQ( sv.find( "123", 0, 3 ), 0 ); + BOOST_TEST_EQ( sv.find( "123", 1, 3 ), 3 ); + BOOST_TEST_EQ( sv.find( "123", 3, 3 ), 3 ); + BOOST_TEST_EQ( sv.find( "123", 4, 3 ), npos ); + BOOST_TEST_EQ( sv.find( "123", 6, 3 ), npos ); + BOOST_TEST_EQ( sv.find( "123", 7, 3 ), npos ); + } + + return boost::report_errors(); +}