@@ -70,10 +70,10 @@ TEST_F(SpecialCaseListTest, Basic) {
70
70
EXPECT_FALSE (SCL->inSection (" " , " fun" , " hello" ));
71
71
EXPECT_FALSE (SCL->inSection (" " , " src" , " hello" , " category" ));
72
72
73
- EXPECT_EQ (4u , SCL->inSectionBlame (" " , " src" , " hello" ));
74
- EXPECT_EQ (5u , SCL->inSectionBlame (" " , " src" , " bye" ));
75
- EXPECT_EQ (6u , SCL->inSectionBlame (" " , " src" , " hi" , " category" ));
76
- EXPECT_EQ (7u , SCL->inSectionBlame (" " , " src" , " zzzz" , " category" ));
73
+ EXPECT_EQ (3u , SCL->inSectionBlame (" " , " src" , " hello" ));
74
+ EXPECT_EQ (4u , SCL->inSectionBlame (" " , " src" , " bye" ));
75
+ EXPECT_EQ (5u , SCL->inSectionBlame (" " , " src" , " hi" , " category" ));
76
+ EXPECT_EQ (6u , SCL->inSectionBlame (" " , " src" , " zzzz" , " category" ));
77
77
EXPECT_EQ (0u , SCL->inSectionBlame (" " , " src" , " hi" ));
78
78
EXPECT_EQ (0u , SCL->inSectionBlame (" " , " fun" , " hello" ));
79
79
EXPECT_EQ (0u , SCL->inSectionBlame (" " , " src" , " hello" , " category" ));
@@ -85,12 +85,12 @@ TEST_F(SpecialCaseListTest, CorrectErrorLineNumberWithBlankLine) {
85
85
" \n "
86
86
" [not valid\n " ,
87
87
Error));
88
- EXPECT_THAT (Error, StartsWith (" malformed section header on line 4 :" ));
88
+ EXPECT_THAT (Error, StartsWith (" malformed section header on line 3 :" ));
89
89
90
90
EXPECT_EQ (nullptr , makeSpecialCaseList (" \n\n\n "
91
91
" [not valid\n " ,
92
92
Error));
93
- EXPECT_THAT (Error, StartsWith (" malformed section header on line 5 :" ));
93
+ EXPECT_THAT (Error, StartsWith (" malformed section header on line 4 :" ));
94
94
}
95
95
96
96
TEST_F (SpecialCaseListTest, SectionGlobErrorHandling) {
@@ -101,7 +101,7 @@ TEST_F(SpecialCaseListTest, SectionGlobErrorHandling) {
101
101
EXPECT_EQ (makeSpecialCaseList (" [[]" , Error), nullptr );
102
102
EXPECT_EQ (
103
103
Error,
104
- " malformed section at line 2 : '[': invalid glob pattern, unmatched '['" );
104
+ " malformed section at line 1 : '[': invalid glob pattern, unmatched '['" );
105
105
106
106
EXPECT_EQ (makeSpecialCaseList (" src:=" , Error), nullptr );
107
107
EXPECT_THAT (Error, HasSubstr (" Supplied glob was blank" ));
@@ -163,10 +163,10 @@ TEST_F(SpecialCaseListTest, Substring) {
163
163
TEST_F (SpecialCaseListTest, InvalidSpecialCaseList) {
164
164
std::string Error;
165
165
EXPECT_EQ (nullptr , makeSpecialCaseList (" badline" , Error));
166
- EXPECT_EQ (" malformed line 2 : 'badline'" , Error);
166
+ EXPECT_EQ (" malformed line 1 : 'badline'" , Error);
167
167
EXPECT_EQ (nullptr , makeSpecialCaseList (" src:bad[a-" , Error));
168
168
EXPECT_EQ (
169
- " malformed glob in line 2 : 'bad[a-': invalid glob pattern, unmatched '['" ,
169
+ " malformed glob in line 1 : 'bad[a-': invalid glob pattern, unmatched '['" ,
170
170
Error);
171
171
std::vector<std::string> Files (1 , " unexisting" );
172
172
EXPECT_EQ (nullptr ,
0 commit comments