[Winmerge-svn] SF.net SVN: winmerge:[6613] trunk/Testing/GoogleTest/StringDiffs/ stringdiffs_test_b
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2009-03-29 09:59:43
|
Revision: 6613 http://winmerge.svn.sourceforge.net/winmerge/?rev=6613&view=rev Author: kimmov Date: 2009-03-29 09:59:36 +0000 (Sun, 29 Mar 2009) Log Message: ----------- Tests: Stringdiff: Fix wrong assumptions in the test (fixing the test at the same time). Modified Paths: -------------- trunk/Testing/GoogleTest/StringDiffs/stringdiffs_test_bugs.cpp Modified: trunk/Testing/GoogleTest/StringDiffs/stringdiffs_test_bugs.cpp =================================================================== --- trunk/Testing/GoogleTest/StringDiffs/stringdiffs_test_bugs.cpp 2009-03-29 09:41:24 UTC (rev 6612) +++ trunk/Testing/GoogleTest/StringDiffs/stringdiffs_test_bugs.cpp 2009-03-29 09:59:36 UTC (rev 6613) @@ -62,17 +62,18 @@ TEST_F(StringDiffsBugsTest, Bug_1685466_1) { std::vector<wdiff*> diffs; - sd_ComputeWordDiffs("if (EnumResourceLanguages(hinstLang, RT_VERSION, MAKEINTRESOURCE(VS_VERSION_INFO), (ENUMRESLANGPROC)FindNextResLang, (LPARAM)&wLangID) == 0)", - "if (EnumResourceLanguages(hinstLang, RT_VERSION, MAKEINTRESOURCE(VS_VERSION_INFO), FindNextResLang, (LPARAM)&wLangID) == 0)", + sd_ComputeWordDiffs( + "if (EnumResourceLanguages(hinstLang, RT_VERSION, MAKEINTRESOURCE(VS_VERSION_INFO), (ENUMRESLANGPROC)FindNextResLang, (LPARAM)&wLangID) == 0)", + "if (EnumResourceLanguages(hinstLang, RT_VERSION, MAKEINTRESOURCE(VS_VERSION_INFO), FindNextResLang, (LPARAM)&wLangID) == 0)", false, 0, 1, true, &diffs); EXPECT_EQ(1, diffs.size()); if (diffs.size() > 0) { wdiff *pDiff = diffs[0]; EXPECT_EQ(83, pDiff->start[0]); - EXPECT_EQ(0, pDiff->start[1]); + EXPECT_EQ(83, pDiff->start[1]); EXPECT_EQ(99, pDiff->end[0]); - EXPECT_EQ(-1, pDiff->end[1]); + EXPECT_EQ(82, pDiff->end[1]); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |