diff --git a/string/test/Jamfile b/string/test/Jamfile index 4c7860c..9173388 100644 --- a/string/test/Jamfile +++ b/string/test/Jamfile @@ -16,56 +16,56 @@ import testing ; DEPENDS all : test ; { - test-suite string_algo - : [ run - container_test.cpp - : : - : - : container - ] - [ run - trim_test.cpp - : : - : - : trim - ] - [ run - conv_test.cpp - : : - : - : conv - ] - [ run - predicate_test.cpp - : : - : - : predicate - ] - [ run - find_test.cpp - : : - : - : find - ] - [ run - split_test.cpp - : : - : - : split - ] - [ run - replace_test.cpp - : : - : - : replace - ] - [ run - regex_test.cpp - ../../../regex/build/boost_regex - : : - : - : regex - ] - ; + test-suite string_algo + : [ run + container_test.cpp + : : + : + : container + ] + [ run + trim_test.cpp + : : + : + : trim + ] + [ run + conv_test.cpp + : : + : + : conv + ] + [ run + predicate_test.cpp + : : + : + : predicate + ] + [ run + find_test.cpp + : : + : + : find + ] + [ run + split_test.cpp + : : + : + : split + ] + [ run + replace_test.cpp + : : + : + : replace + ] + [ run + regex_test.cpp + ../../../regex/build/boost_regex + : : + : + : regex + ] + ; } diff --git a/string/test/conv_test.cpp b/string/test/conv_test.cpp index 2e6b489..852e8c0 100644 --- a/string/test/conv_test.cpp +++ b/string/test/conv_test.cpp @@ -11,8 +11,8 @@ #include #include -#include #include +#include #include #include @@ -24,8 +24,13 @@ void conv_test() string str1("AbCdEfG 123 xxxYYYzZzZ"); string str2("AbCdEfG 123 xxxYYYzZzZ"); string str3(""); - char* pch1=strdup("AbCdEfG 123 xxxYYYzZzZ"); - char* pch2=strdup("AbCdEfG 123 xxxYYYzZzZ"); + const char pch[]="AbCdEfG 123 xxxYYYzZzZ"; + unsigned int pchlen=sizeof(pch); + + char* pch1=new char[pchlen]; + std::copy(pch, pch+pchlen, pch1); + char* pch2=new char[pchlen]; + std::copy(pch, pch+pchlen, pch2); // *** iterator tests *** // diff --git a/string/test/predicate_test.cpp b/string/test/predicate_test.cpp index 378349a..644a53f 100644 --- a/string/test/predicate_test.cpp +++ b/string/test/predicate_test.cpp @@ -101,7 +101,7 @@ void classification_test() TEST_CLASS( is_digit(), "1234567890", "abc" ); TEST_CLASS( is_graph(), "123abc.,", " \t" ); TEST_CLASS( is_lower(), "abc", "Aasdf" ); - TEST_CLASS( is_print(), "abs", "\nasdf" ); + TEST_CLASS( is_print(), "abs", "\003\004asdf" ); TEST_CLASS( is_punct(), ".,;\"", "abc" ); TEST_CLASS( is_upper(), "ABC", "aBc" ); TEST_CLASS( is_xdigit(), "ABC123", "XFD" ); diff --git a/string/test/replace_test.cpp b/string/test/replace_test.cpp index 0877bca..85d9c55 100644 --- a/string/test/replace_test.cpp +++ b/string/test/replace_test.cpp @@ -53,21 +53,26 @@ void sequence_traits_test() // Combine tests for all variants of the algorithm #define TEST_ALGO( Algo, Input, Params, Output ) \ {\ - BOOST_CHECKPOINT( #Input );\ + BOOST_CHECKPOINT( #Algo " - Copy" );\ \ string str1(Input);\ \ /* Copy test */ \ BOOST_CHECK( Algo##_copy( str1, BOOST_PP_SEQ_ENUM( Params ) )==Output );\ \ + BOOST_CHECKPOINT( #Algo " - Iterator" );\ /* Iterator test */\ string strout;\ Algo##_copy( back_inserter(strout), str1, BOOST_PP_SEQ_ENUM( Params ) );\ BOOST_CHECK( strout==Output ); \ \ /* In-place test */\ + BOOST_CHECKPOINT( #Algo " - Inplace(vector)" );\ vector vec1( str1.begin(), str1.end() );\ +\ + BOOST_CHECKPOINT( #Algo " - Inplace(list)" );\ list list1( str1.begin(), str1.end() );\ +\ Algo( str1, BOOST_PP_SEQ_ENUM( Params ) ); \ BOOST_CHECK( equals( str1, Output ) );\ Algo( vec1, BOOST_PP_SEQ_ENUM( Params ) ); \