From 2514eb97748fc8d5b89f7021ca52d7231ea7092c Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sat, 21 Mar 2009 09:20:21 +0000 Subject: [PATCH] Tests: Fix StringDiffs tests to behave like they really should be - earlier we just tweaked tests to behave like current implementation. Now when we have a patch fixing some bugs (#2636551). --- .../GoogleTest/StringDiffs/stringdiffs_test.cpp | 27 +++++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/Testing/GoogleTest/StringDiffs/stringdiffs_test.cpp b/Testing/GoogleTest/StringDiffs/stringdiffs_test.cpp index 60e945da9..8f6fee700 100644 --- a/Testing/GoogleTest/StringDiffs/stringdiffs_test.cpp +++ b/Testing/GoogleTest/StringDiffs/stringdiffs_test.cpp @@ -135,11 +135,12 @@ namespace } // Identical strings, no case sensitivity, ignore whitespace change, words, word-level + // Whitespace at begin of first string is a difference TEST_F(StringDiffsTest, IgnoreWhitespace6) { std::vector diffs; sd_ComputeWordDiffs(" abcde abcde", "abcde abcde", false, 1, 0, false, &diffs); - EXPECT_EQ(0, diffs.size()); + EXPECT_EQ(1, diffs.size()); } // Identical strings, no case sensitivity, ignore all whitespace, words, word-level @@ -179,7 +180,7 @@ namespace { std::vector diffs; sd_ComputeWordDiffs("abcde abcde", "abcdeabcde", true, 2, 0, false, &diffs); - EXPECT_EQ(1, diffs.size()); + EXPECT_EQ(0, diffs.size()); } // Identical strings, no case sensitivity, ignore all whitespace, words, word-level @@ -229,7 +230,6 @@ namespace EXPECT_EQ(10, pDiff->end[0]); EXPECT_EQ(10, pDiff->end[1]); } - } // Identical strings, case sensitivity, no whitespace, words, word-level @@ -238,10 +238,15 @@ namespace { std::vector diffs; sd_ComputeWordDiffs("abcde fghij", "ABcde fGhij", true, 0, 0, false, &diffs); - EXPECT_EQ(1, diffs.size()); + EXPECT_EQ(2, diffs.size()); wdiff *pDiff = diffs[0]; EXPECT_EQ(0, pDiff->start[0]); EXPECT_EQ(0, pDiff->start[1]); + EXPECT_EQ(4, pDiff->end[0]); + EXPECT_EQ(4, pDiff->end[1]); + pDiff = diffs[1]; + EXPECT_EQ(6, pDiff->start[0]); + EXPECT_EQ(6, pDiff->start[1]); EXPECT_EQ(10, pDiff->end[0]); EXPECT_EQ(10, pDiff->end[1]); } @@ -286,10 +291,15 @@ namespace { std::vector diffs; sd_ComputeWordDiffs("abcDE fGHij klmno", "abcde fghij klmno", true, 0, 0, false, &diffs); - EXPECT_EQ(1, diffs.size()); + EXPECT_EQ(2, diffs.size()); wdiff *pDiff = diffs[0]; EXPECT_EQ(0, pDiff->start[0]); EXPECT_EQ(0, pDiff->start[1]); + EXPECT_EQ(4, pDiff->end[0]); + EXPECT_EQ(4, pDiff->end[1]); + pDiff = diffs[1]; + EXPECT_EQ(6, pDiff->start[0]); + EXPECT_EQ(6, pDiff->start[1]); EXPECT_EQ(10, pDiff->end[0]); EXPECT_EQ(10, pDiff->end[1]); } @@ -300,10 +310,15 @@ namespace { std::vector diffs; sd_ComputeWordDiffs("abcde fghij klmno", "abcDE fGHij klmno", true, 0, 0, false, &diffs); - EXPECT_EQ(1, diffs.size()); + EXPECT_EQ(2, diffs.size()); wdiff *pDiff = diffs[0]; EXPECT_EQ(0, pDiff->start[0]); EXPECT_EQ(0, pDiff->start[1]); + EXPECT_EQ(4, pDiff->end[0]); + EXPECT_EQ(4, pDiff->end[1]); + pDiff = diffs[1]; + EXPECT_EQ(6, pDiff->start[0]); + EXPECT_EQ(6, pDiff->start[1]); EXPECT_EQ(10, pDiff->end[0]); EXPECT_EQ(10, pDiff->end[1]); } -- 2.11.0