Skip to content

Commit 5f6e2d0

Browse files
AlexHaxeAlexHaxe
committed
reworked unittests to check all messages instead of just last one
1 parent bbf482a commit 5f6e2d0

35 files changed

+706
-201
lines changed

‎test/checkstyle/checks/CheckTestCase.hx‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ class CheckTestCase<T:String> {
1818

1919
function assertMsg(check:Check, testCase:T, expected:String, ?defines:Array<Array<String>>, ?fileName:String, allowFailingAST:Bool = false,
2020
?pos:PosInfos) {
21+
assertMessages(check, testCase, [expected], defines, fileName, allowFailingAST, pos);
22+
}
23+
24+
function assertMessages(check:Check, testCase:T, expected:Array<String>, ?defines:Array<Array<String>>, ?fileName:String, allowFailingAST:Bool = false,
25+
?pos:PosInfos) {
2126
var re = ~/abstractAndClass ([a-zA-Z0-9]*)/g;
2227
if (re.match(testCase)) {
2328
actualAssertMsg(check, re.replace(testCase, "class $1"), expected, fileName, allowFailingAST, pos);
@@ -27,17 +32,26 @@ class CheckTestCase<T:String> {
2732
}
2833

2934
function assertNoMsg(check:Check, testCase:T, ?fileName:String, allowFailingAST:Bool = false, ?pos:PosInfos) {
30-
assertMsg(check, testCase, "", null, fileName, allowFailingAST, pos);
35+
assertMessages(check, testCase, [], null, fileName, allowFailingAST, pos);
3136
}
3237

33-
function actualAssertMsg(check:Check, testCase:String, expected:String, ?defines:Array<Array<String>>, ?fileName:String, allowFailingAST:Bool = false,
34-
?pos:PosInfos) {
35-
var msg = checkMessage(testCase, check, defines, fileName, allowFailingAST, pos);
36-
Assert.areEqual(expected, msg, pos);
38+
function actualAssertMsg(check:Check, testCase:String, expected:Array<String>, ?defines:Array<Array<String>>, ?fileName:String,
39+
allowFailingAST:Bool = false, ?pos:PosInfos) {
40+
var messages:Array<CheckMessage> = checkMessages(testCase, check, defines, fileName, allowFailingAST, pos);
41+
if ((expected.length == 1) && (expected.length != messages.length)) {
42+
for (i in 0...messages.length) {
43+
Assert.areEqual(expected[0], messages[i].message, pos);
44+
}
45+
}
46+
47+
Assert.areEqual(expected.length, messages.length, pos);
48+
for (i in 0...expected.length) {
49+
Assert.areEqual(expected[i], messages[i].message, pos);
50+
}
3751
}
3852

39-
function checkMessage(src:String, check:Check, defines:Array<Array<String>>, fileName:String = FILE_NAME, allowFailingAST:Bool = false,
40-
?pos:PosInfos):String {
53+
function checkMessages(src:String, check:Check, defines:Array<Array<String>>, fileName:String = FILE_NAME, allowFailingAST:Bool = false,
54+
?pos:PosInfos):Array<CheckMessage> {
4155
// a fresh Checker and Reporter for every checkMessage
4256
// to allow multiple independent checkMessage calls in a single test
4357
checker = new Checker(allowFailingAST);
@@ -49,7 +63,7 @@ class CheckTestCase<T:String> {
4963
ReporterManager.INSTANCE.clear();
5064
ReporterManager.INSTANCE.addReporter(reporter);
5165
checker.process([{name: fileName, content: ByteData.ofString(src), index: 0}]);
52-
return reporter.message;
66+
return reporter.messages;
5367
}
5468

5569
@After
@@ -60,10 +74,10 @@ class CheckTestCase<T:String> {
6074
}
6175

6276
class TestReporter implements IReporter {
63-
public var message:String;
77+
public var messages:Array<CheckMessage>;
6478

6579
public function new() {
66-
message = "";
80+
messages = [];
6781
}
6882

6983
public function start() {}
@@ -75,6 +89,6 @@ class TestReporter implements IReporter {
7589
public function fileFinish(f:CheckFile) {}
7690

7791
public function addMessage(m:CheckMessage) {
78-
message = m.message;
92+
messages.push(m);
7993
}
8094
}

‎test/checkstyle/checks/block/BlockBreakingConditionalCheckTest.hx‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package checkstyle.checks.block;
22

33
class BlockBreakingConditionalCheckTest extends CheckTestCase<BlockBreakingConditionalCheckTests> {
4+
static inline var MSG_LEFT_CURLY:String = "Left curly has no matching right curly";
45
static inline var MSG_RIGHT_CURLY:String = "Right curly has no matching left curly";
56

67
@Test
@@ -14,11 +15,21 @@ class BlockBreakingConditionalCheckTest extends CheckTestCase<BlockBreakingCondi
1415
@Test
1516
public function testBlockBreakingConditionals() {
1617
var check:BlockBreakingConditionalCheck = new BlockBreakingConditionalCheck();
17-
assertMsg(check, CONDITIONAL_IF, MSG_RIGHT_CURLY);
18-
assertMsg(check, CONDITIONAL_IF_2, MSG_RIGHT_CURLY);
19-
assertMsg(check, CONDITIONAL_IF_ELSE, MSG_RIGHT_CURLY);
20-
assertMsg(check, CONDITIONAL_NESTED, MSG_RIGHT_CURLY);
21-
assertMsg(check, CONDITIONAL_NESTED_2, MSG_RIGHT_CURLY);
18+
assertMessages(check, CONDITIONAL_IF, [MSG_LEFT_CURLY, MSG_RIGHT_CURLY]);
19+
assertMessages(check, CONDITIONAL_IF_2, [MSG_LEFT_CURLY, MSG_RIGHT_CURLY]);
20+
assertMessages(check, CONDITIONAL_IF_ELSE, [MSG_LEFT_CURLY, MSG_LEFT_CURLY, MSG_RIGHT_CURLY]);
21+
assertMessages(check, CONDITIONAL_NESTED, [MSG_LEFT_CURLY, MSG_LEFT_CURLY, MSG_RIGHT_CURLY]);
22+
assertMessages(check, CONDITIONAL_NESTED_2, [
23+
MSG_LEFT_CURLY,
24+
MSG_LEFT_CURLY,
25+
MSG_LEFT_CURLY,
26+
MSG_LEFT_CURLY,
27+
MSG_RIGHT_CURLY,
28+
MSG_LEFT_CURLY,
29+
MSG_LEFT_CURLY,
30+
MSG_RIGHT_CURLY,
31+
MSG_RIGHT_CURLY
32+
]);
2233
}
2334
}
2435

‎test/checkstyle/checks/block/LeftCurlyCheckTest.hx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class LeftCurlyCheckTest extends CheckTestCase<LeftCurlyCheckTests> {
3535
assertMsg(check, TEST5, MSG_EOL);
3636
assertMsg(check, TEST7, MSG_EOL);
3737
assertMsg(check, TEST10, MSG_EOL);
38-
assertMsg(check, NL_CASEBLOCK, MSG_EOL);
38+
assertMessages(check, NL_CASEBLOCK, [MSG_EOL, MSG_EOL, MSG_EOL]);
3939
assertMsg(check, NLOW_CASEBLOCK, MSG_EOL);
4040
}
4141

@@ -44,16 +44,16 @@ class LeftCurlyCheckTest extends CheckTestCase<LeftCurlyCheckTests> {
4444
var check = new LeftCurlyCheck();
4545
check.option = NL;
4646

47-
assertMsg(check, TEST, MSG_NL);
47+
assertMessages(check, TEST, [MSG_NL, MSG_NL, MSG_NL, MSG_NL, MSG_NL, MSG_NL, MSG_NL, MSG_NL]);
4848
assertNoMsg(check, TEST13);
4949

5050
check.tokens = [OBJECT_DECL];
5151
assertMsg(check, TEST4, MSG_NL);
5252
assertNoMsg(check, TEST14);
53-
assertMsg(check, NESTED_OBJECT_LITERAL, MSG_NL);
53+
assertMessages(check, NESTED_OBJECT_LITERAL, [MSG_NL, MSG_NL]);
5454

5555
check.tokens = [TYPEDEF_DEF];
56-
assertMsg(check, TEST14, MSG_NL);
56+
assertMessages(check, TEST14, [MSG_NL, MSG_NL]);
5757

5858
check.tokens = [IF];
5959
assertNoMsg(check, TEST1);
@@ -73,8 +73,8 @@ class LeftCurlyCheckTest extends CheckTestCase<LeftCurlyCheckTests> {
7373
check.option = NL;
7474
assertNoMsg(check, TEST15);
7575
assertNoMsg(check, NL_CASEBLOCK);
76-
assertMsg(check, EOL_CASEBLOCK, MSG_NL);
77-
assertMsg(check, NLOW_CASEBLOCK, MSG_NL);
76+
assertMessages(check, EOL_CASEBLOCK, [MSG_NL, MSG_NL, MSG_NL]);
77+
assertMessages(check, NLOW_CASEBLOCK, [MSG_NL, MSG_NL]);
7878
}
7979

8080
@Test
@@ -85,7 +85,7 @@ class LeftCurlyCheckTest extends CheckTestCase<LeftCurlyCheckTests> {
8585
assertNoMsg(check, TEST12);
8686
assertNoMsg(check, TEST16);
8787
assertNoMsg(check, NLOW_CASEBLOCK);
88-
assertMsg(check, TEST17, MSG_NLOW);
88+
assertMessages(check, TEST17, [MSG_NLOW, MSG_NLOW]);
8989
assertMsg(check, TEST18, MSG_NL_SPLIT);
9090
assertMsg(check, TEST19, MSG_NL_SPLIT);
9191
assertMsg(check, WRAPPED_FUNCTION, MSG_NL_SPLIT);
@@ -95,7 +95,7 @@ class LeftCurlyCheckTest extends CheckTestCase<LeftCurlyCheckTests> {
9595
public function testReification() {
9696
var check = new LeftCurlyCheck();
9797
check.tokens = [REIFICATION];
98-
assertMsg(check, MACRO_REIFICATION, MSG_EOL);
98+
assertMessages(check, MACRO_REIFICATION, [MSG_EOL, MSG_EOL]);
9999
}
100100

101101
@Test
@@ -116,16 +116,16 @@ class LeftCurlyCheckTest extends CheckTestCase<LeftCurlyCheckTests> {
116116
var check = new LeftCurlyCheck();
117117
check.tokens = [ARRAY_COMPREHENSION, OBJECT_DECL];
118118
assertNoMsg(check, ARRAY_COMPREHENSION_2_ISSUE_114);
119-
assertMsg(check, ARRAY_COMPREHENSION_ISSUE_114, MSG_EOL);
119+
assertMessages(check, ARRAY_COMPREHENSION_ISSUE_114, [MSG_EOL, MSG_EOL]);
120120

121121
check.option = NLOW;
122122
assertNoMsg(check, ARRAY_COMPREHENSION_2_ISSUE_114);
123123
assertNoMsg(check, ARRAY_COMPREHENSION_NLOW_ISSUE_114);
124-
assertMsg(check, ARRAY_COMPREHENSION_ISSUE_114, MSG_NL);
124+
assertMessages(check, ARRAY_COMPREHENSION_ISSUE_114, [MSG_NL, MSG_NL]);
125125

126126
check.option = NL;
127-
assertMsg(check, ARRAY_COMPREHENSION_2_ISSUE_114, MSG_NL);
128-
assertMsg(check, ARRAY_COMPREHENSION_ISSUE_114, MSG_NL);
127+
assertMessages(check, ARRAY_COMPREHENSION_2_ISSUE_114, [MSG_NL, MSG_NL]);
128+
assertMessages(check, ARRAY_COMPREHENSION_ISSUE_114, [MSG_NL, MSG_NL]);
129129
}
130130
}
131131

‎test/checkstyle/checks/block/NeedBracesCheckTest.hx‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,17 @@ class NeedBracesCheckTest extends CheckTestCase<NeedBracesCheckTests> {
4646
var check = new NeedBracesCheck();
4747
check.allowSingleLineStatement = false;
4848

49-
assertMsg(check, TEST, MSG_SAME_LINE_WHILE);
49+
assertMessages(check, TEST, [
50+
MSG_SAME_LINE_IF,
51+
MSG_SAME_LINE_IF,
52+
MSG_SAME_LINE_ELSE,
53+
MSG_SAME_LINE_IF,
54+
MSG_SAME_LINE_IF,
55+
MSG_SAME_LINE_FOR,
56+
MSG_SAME_LINE_WHILE
57+
]);
5058
assertMsg(check, TEST1, MSG_IF);
51-
assertMsg(check, TEST2, MSG_ELSE);
59+
assertMessages(check, TEST2, [MSG_SAME_LINE_IF, MSG_ELSE]);
5260
assertNoMsg(check, TEST3);
5361
assertMsg(check, TEST4, MSG_IF);
5462
assertNoMsg(check, TEST5);
@@ -57,7 +65,7 @@ class NeedBracesCheckTest extends CheckTestCase<NeedBracesCheckTests> {
5765
assertNoMsg(check, TEST8);
5866
assertMsg(check, TEST9, MSG_SAME_LINE_FOR);
5967
assertMsg(check, TEST10, MSG_SAME_LINE_IF);
60-
assertMsg(check, TEST11, MSG_SAME_LINE_ELSE);
68+
assertMessages(check, TEST11, [MSG_IF, MSG_SAME_LINE_ELSE]);
6169
assertMsg(check, TEST12, MSG_SAME_LINE_IF);
6270
assertMsg(check, TEST13, MSG_SAME_LINE_IF);
6371
assertNoMsg(check, TEST14);
@@ -113,9 +121,15 @@ class NeedBracesCheckTest extends CheckTestCase<NeedBracesCheckTests> {
113121
assertNoMsg(check, TEST14);
114122

115123
check.allowSingleLineStatement = false;
116-
assertMsg(check, TEST, MSG_SAME_LINE_IF);
124+
assertMessages(check, TEST, [
125+
MSG_SAME_LINE_IF,
126+
MSG_SAME_LINE_IF,
127+
MSG_SAME_LINE_ELSE,
128+
MSG_SAME_LINE_IF,
129+
MSG_SAME_LINE_IF
130+
]);
117131
assertMsg(check, TEST10, MSG_SAME_LINE_IF);
118-
assertMsg(check, TEST11, MSG_SAME_LINE_ELSE);
132+
assertMessages(check, TEST11, [MSG_IF, MSG_SAME_LINE_ELSE]);
119133
assertMsg(check, TEST13, MSG_SAME_LINE_IF);
120134
assertNoMsg(check, TEST14);
121135
assertMsg(check, TEST16, MSG_SAME_LINE_ELSE);
@@ -143,9 +157,15 @@ class NeedBracesCheckTest extends CheckTestCase<NeedBracesCheckTests> {
143157
assertNoMsg(check, TEST14);
144158

145159
check.allowSingleLineStatement = false;
146-
assertMsg(check, TEST, MSG_SAME_LINE_IF);
160+
assertMessages(check, TEST, [
161+
MSG_SAME_LINE_IF,
162+
MSG_SAME_LINE_IF,
163+
MSG_SAME_LINE_ELSE,
164+
MSG_SAME_LINE_IF,
165+
MSG_SAME_LINE_IF
166+
]);
147167
assertMsg(check, TEST10, MSG_SAME_LINE_IF);
148-
assertMsg(check, TEST11, MSG_SAME_LINE_ELSE);
168+
assertMessages(check, TEST11, [MSG_IF, MSG_SAME_LINE_ELSE]);
149169
assertMsg(check, TEST12, MSG_SAME_LINE_IF);
150170
assertMsg(check, TEST13, MSG_SAME_LINE_IF);
151171
assertNoMsg(check, TEST14);

‎test/checkstyle/checks/block/RightCurlyCheckTest.hx‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class RightCurlyCheckTest extends CheckTestCase<RightCurlyCheckTests> {
5353
var check = new RightCurlyCheck();
5454
assertMsg(check, SAMELINE_IF, MSG_ALONE);
5555
assertMsg(check, SAMELINE_TRY_CATCH, MSG_ALONE);
56-
assertMsg(check, SAMELINE_NESTED_OBJECT, MSG_ALONE);
56+
assertMessages(check, SAMELINE_NESTED_OBJECT, [MSG_ALONE, MSG_ALONE]);
5757
}
5858

5959
@Test
@@ -84,19 +84,19 @@ class RightCurlyCheckTest extends CheckTestCase<RightCurlyCheckTests> {
8484
public function testIncorrectSame() {
8585
var check = new RightCurlyCheck();
8686
check.option = SAME;
87-
assertMsg(check, SINGLELINE_IF, MSG_NOT_SAME_LINE);
87+
assertMessages(check, SINGLELINE_IF, [MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE]);
8888
assertMsg(check, SINGLELINE_FOR, MSG_NOT_SAME_LINE);
8989
assertMsg(check, SINGLELINE_WHILE, MSG_NOT_SAME_LINE);
90-
assertMsg(check, SINGLELINE_TRY_CATCH, MSG_NOT_SAME_LINE);
90+
assertMessages(check, SINGLELINE_TRY_CATCH, [MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE]);
9191
assertMsg(check, SINGLELINE_INTERFACE, MSG_NOT_SAME_LINE);
92-
assertMsg(check, SINGLELINE_CLASS, MSG_NOT_SAME_LINE);
92+
assertMessages(check, SINGLELINE_CLASS, [MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE]);
9393
assertMsg(check, SINGLELINE_TYPEDEF, MSG_NOT_SAME_LINE);
9494
assertMsg(check, SINGLELINE_SWITCH, MSG_NOT_SAME_LINE);
95-
assertMsg(check, SINGLELINE_CASE, MSG_NOT_SAME_LINE);
95+
assertMessages(check, SINGLELINE_CASE, [MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE]);
9696
assertMsg(check, SINGLELINE_OBJECT, MSG_NOT_SAME_LINE);
97-
assertMsg(check, SINGLELINE_ABSTRACT, MSG_NOT_SAME_LINE);
97+
assertMessages(check, SINGLELINE_ABSTRACT, [MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE]);
9898
assertMsg(check, SINGLELINE_ENUM, MSG_NOT_SAME_LINE);
99-
assertMsg(check, SINGLELINE_NESTED_OBJECT, MSG_NOT_SAME_LINE);
99+
assertMessages(check, SINGLELINE_NESTED_OBJECT, [MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE]);
100100

101101
assertMsg(check, ALONE_IF, MSG_SAME_LINE);
102102
assertMsg(check, ALONE_TRY_CATCH, MSG_SAME_LINE);
@@ -127,24 +127,24 @@ class RightCurlyCheckTest extends CheckTestCase<RightCurlyCheckTests> {
127127
public function testIncorrectAlone() {
128128
var check = new RightCurlyCheck();
129129
check.option = ALONE;
130-
assertMsg(check, SINGLELINE_IF, MSG_NOT_SAME_LINE);
130+
assertMessages(check, SINGLELINE_IF, [MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE]);
131131
assertMsg(check, SINGLELINE_FUNCTION, MSG_NOT_SAME_LINE);
132132
assertMsg(check, SINGLELINE_FOR, MSG_NOT_SAME_LINE);
133133
assertMsg(check, SINGLELINE_WHILE, MSG_NOT_SAME_LINE);
134-
assertMsg(check, SINGLELINE_TRY_CATCH, MSG_NOT_SAME_LINE);
134+
assertMessages(check, SINGLELINE_TRY_CATCH, [MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE]);
135135
assertMsg(check, SINGLELINE_INTERFACE, MSG_NOT_SAME_LINE);
136-
assertMsg(check, SINGLELINE_CLASS, MSG_NOT_SAME_LINE);
136+
assertMessages(check, SINGLELINE_CLASS, [MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE]);
137137
assertMsg(check, SINGLELINE_TYPEDEF, MSG_NOT_SAME_LINE);
138138
assertMsg(check, SINGLELINE_SWITCH, MSG_NOT_SAME_LINE);
139-
assertMsg(check, SINGLELINE_CASE, MSG_NOT_SAME_LINE);
139+
assertMessages(check, SINGLELINE_CASE, [MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE]);
140140
assertMsg(check, SINGLELINE_OBJECT, MSG_NOT_SAME_LINE);
141-
assertMsg(check, SINGLELINE_ABSTRACT, MSG_NOT_SAME_LINE);
141+
assertMessages(check, SINGLELINE_ABSTRACT, [MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE]);
142142
assertMsg(check, SINGLELINE_ENUM, MSG_NOT_SAME_LINE);
143-
assertMsg(check, SINGLELINE_NESTED_OBJECT, MSG_NOT_SAME_LINE);
143+
assertMessages(check, SINGLELINE_NESTED_OBJECT, [MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE]);
144144

145145
assertMsg(check, SAMELINE_IF, MSG_ALONE);
146146
assertMsg(check, SAMELINE_TRY_CATCH, MSG_ALONE);
147-
assertMsg(check, SAMELINE_NESTED_OBJECT, MSG_ALONE);
147+
assertMessages(check, SAMELINE_NESTED_OBJECT, [MSG_ALONE, MSG_ALONE]);
148148
}
149149

150150
@Test
@@ -159,15 +159,15 @@ class RightCurlyCheckTest extends CheckTestCase<RightCurlyCheckTests> {
159159
assertNoMsg(check, ALONE_FOR);
160160

161161
check.option = SAME;
162-
assertMsg(check, SINGLELINE_IF, MSG_NOT_SAME_LINE);
162+
assertMessages(check, SINGLELINE_IF, [MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE]);
163163
assertNoMsg(check, SINGLELINE_FOR);
164164
assertNoMsg(check, SAMELINE_IF);
165165
assertNoMsg(check, SAMELINE_TRY_CATCH);
166166
assertMsg(check, ALONE_IF, MSG_SAME_LINE);
167167
assertNoMsg(check, ALONE_FOR);
168168

169169
check.option = ALONE;
170-
assertMsg(check, SINGLELINE_IF, MSG_NOT_SAME_LINE);
170+
assertMessages(check, SINGLELINE_IF, [MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE]);
171171
assertNoMsg(check, SINGLELINE_FOR);
172172
assertMsg(check, SAMELINE_IF, MSG_ALONE);
173173
assertNoMsg(check, SAMELINE_TRY_CATCH);
@@ -182,10 +182,10 @@ class RightCurlyCheckTest extends CheckTestCase<RightCurlyCheckTests> {
182182
assertNoMsg(check, MACRO_REIFICATION);
183183

184184
check.option = SAME;
185-
assertMsg(check, MACRO_REIFICATION, MSG_NOT_SAME_LINE);
185+
assertMessages(check, MACRO_REIFICATION, [MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE]);
186186

187187
check.option = ALONE;
188-
assertMsg(check, MACRO_REIFICATION, MSG_NOT_SAME_LINE);
188+
assertMessages(check, MACRO_REIFICATION, [MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE]);
189189
}
190190

191191
@Test
@@ -196,11 +196,11 @@ class RightCurlyCheckTest extends CheckTestCase<RightCurlyCheckTests> {
196196
assertNoMsg(check, ARRAY_COMPREHENSION_2_ISSUE_114);
197197

198198
check.option = SAME;
199-
assertMsg(check, ARRAY_COMPREHENSION_ISSUE_114, MSG_NOT_SAME_LINE);
199+
assertMessages(check, ARRAY_COMPREHENSION_ISSUE_114, [MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE]);
200200
assertNoMsg(check, ARRAY_COMPREHENSION_2_ISSUE_114);
201201

202202
check.option = ALONE;
203-
assertMsg(check, ARRAY_COMPREHENSION_ISSUE_114, MSG_NOT_SAME_LINE);
203+
assertMessages(check, ARRAY_COMPREHENSION_ISSUE_114, [MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE]);
204204
assertNoMsg(check, ARRAY_COMPREHENSION_2_ISSUE_114);
205205

206206
check.tokens = [ARRAY_COMPREHENSION];
@@ -223,7 +223,7 @@ class RightCurlyCheckTest extends CheckTestCase<RightCurlyCheckTests> {
223223
check.tokens = [IF];
224224
check.option = ALONE;
225225

226-
assertMsg(check, SINGLELINE_IF, MSG_NOT_SAME_LINE);
226+
assertMessages(check, SINGLELINE_IF, [MSG_NOT_SAME_LINE, MSG_NOT_SAME_LINE]);
227227

228228
assertNoMsg(check, SINGLELINE_FUNCTION);
229229
assertNoMsg(check, SINGLELINE_FOR);

0 commit comments

Comments
 (0)