[Winmerge-svn] SF.net SVN: winmerge:[6736] trunk/Testing/GoogleTest/StringDiffs
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2009-05-13 06:56:05
|
Revision: 6736 http://winmerge.svn.sourceforge.net/winmerge/?rev=6736&view=rev Author: kimmov Date: 2009-05-13 06:55:56 +0000 (Wed, 13 May 2009) Log Message: ----------- Tests: stringdiff: remove new line chars from strings to test. Modified Paths: -------------- trunk/Testing/GoogleTest/StringDiffs/stringdiffs_test.cpp trunk/Testing/GoogleTest/StringDiffs/stringdiffs_test_bytelevel.cpp Modified: trunk/Testing/GoogleTest/StringDiffs/stringdiffs_test.cpp =================================================================== --- trunk/Testing/GoogleTest/StringDiffs/stringdiffs_test.cpp 2009-05-12 21:41:56 UTC (rev 6735) +++ trunk/Testing/GoogleTest/StringDiffs/stringdiffs_test.cpp 2009-05-13 06:55:56 UTC (rev 6736) @@ -227,7 +227,7 @@ TEST_F(StringDiffsTest, IgnoreAllWhitespace7) { std::vector<wdiff*> diffs; - sd_ComputeWordDiffs("abcde\nabcde", "abcde abcde", true, 2, 0, false, &diffs); + sd_ComputeWordDiffs("abcde\tabcde", "abcde abcde", true, 2, 0, false, &diffs); EXPECT_EQ(0, diffs.size()); } Modified: trunk/Testing/GoogleTest/StringDiffs/stringdiffs_test_bytelevel.cpp =================================================================== --- trunk/Testing/GoogleTest/StringDiffs/stringdiffs_test_bytelevel.cpp 2009-05-12 21:41:56 UTC (rev 6735) +++ trunk/Testing/GoogleTest/StringDiffs/stringdiffs_test_bytelevel.cpp 2009-05-13 06:55:56 UTC (rev 6736) @@ -59,7 +59,7 @@ { std::vector<wdiff*> diffs; sd_SetBreakChars(",;"); - sd_ComputeWordDiffs( " wsprintf(buf, _T(left= %s, %d,%d, right= %s, %d,%d \n),", + sd_ComputeWordDiffs( " wsprintf(buf, _T(left= %s, %d,%d, right= %s, %d,%d ),", " if (len2 < 50)", true, 0, 1, true, &diffs); EXPECT_EQ(10, diffs.size()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |