@@ -2649,8 +2649,8 @@ TEST(IsSubstringTest, GeneratesCorrectMessageForCString) {
26492649// Tests that IsSubstring returns the correct result when the input
26502650// argument type is ::std::string.
26512651TEST (IsSubstringTest, ReturnsCorrectResultsForStdString) {
2652- EXPECT_TRUE (IsSubstring (" " , " " , std::string ( " hello" ) , " ahellob" ));
2653- EXPECT_FALSE (IsSubstring (" " , " " , " hello" , std::string ( " world" ) ));
2652+ EXPECT_TRUE (IsSubstring (" " , " " , " hello" , " ahellob" ));
2653+ EXPECT_FALSE (IsSubstring (" " , " " , " hello" , " world" ));
26542654}
26552655
26562656#if GTEST_HAS_STD_WSTRING
@@ -2707,8 +2707,8 @@ TEST(IsNotSubstringTest, GeneratesCorrectMessageForWideCString) {
27072707// Tests that IsNotSubstring returns the correct result when the input
27082708// argument type is ::std::string.
27092709TEST (IsNotSubstringTest, ReturnsCorrectResultsForStdString) {
2710- EXPECT_FALSE (IsNotSubstring (" " , " " , std::string ( " hello" ) , " ahellob" ));
2711- EXPECT_TRUE (IsNotSubstring (" " , " " , " hello" , std::string ( " world" ) ));
2710+ EXPECT_FALSE (IsNotSubstring (" " , " " , " hello" , " ahellob" ));
2711+ EXPECT_TRUE (IsNotSubstring (" " , " " , " hello" , " world" ));
27122712}
27132713
27142714// Tests that IsNotSubstring() generates the correct message when the input
@@ -2719,8 +2719,7 @@ TEST(IsNotSubstringTest, GeneratesCorrectMessageForStdString) {
27192719 " Actual: \" needle\"\n "
27202720 " Expected: not a substring of haystack_expr\n "
27212721 " Which is: \" two needles\" " ,
2722- IsNotSubstring (" needle_expr" , " haystack_expr" , ::std::string (" needle" ),
2723- " two needles" )
2722+ IsNotSubstring (" needle_expr" , " haystack_expr" , " needle" , " two needles" )
27242723 .failure_message ());
27252724}
27262725
@@ -3655,8 +3654,7 @@ TEST(AssertionTest, EqFailure) {
36553654 msg4.c_str ());
36563655
36573656 const std::string msg5 (
3658- EqFailure (" foo" , " bar" , std::string (" \" x\" " ), std::string (" \" y\" " ), true )
3659- .failure_message ());
3657+ EqFailure (" foo" , " bar" , " \" x\" " , " \" y\" " , true ).failure_message ());
36603658 EXPECT_STREQ (
36613659 " Expected equality of these values:\n "
36623660 " foo\n "
0 commit comments