Skip to content

Commit a227c90

Browse files
guwirthguwirth
committed
Merge pull request #864 from guwirth/rule-mock
replace deprecated Rule.mock
2 parents baa54e6 + 15b11b4 commit a227c90

13 files changed

+376
-365
lines changed

‎cxx-squid/src/test/java/org/sonar/cxx/parser/BalancedTokensTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class BalancedTokensTest extends ParserBaseTest {
3232
@Test
3333
public void attributeSpecifierSeq() {
3434
p.setRootRule(g.rule(CxxGrammarImpl.attributeSpecifierSeq));
35-
g.rule(CxxGrammarImpl.attributeSpecifier).mock();
35+
mockRule(CxxGrammarImpl.attributeSpecifier);
3636

3737
assertThat(p)
3838
.matches("attributeSpecifier")
@@ -49,7 +49,7 @@ public void attributeSpecifierSeqXXXX() {
4949
@Test
5050
public void attributeSpecifier() {
5151
p.setRootRule(g.rule(CxxGrammarImpl.attributeSpecifier));
52-
g.rule(CxxGrammarImpl.attributeList).mock();
52+
mockRule(CxxGrammarImpl.attributeList);
5353

5454
assertThat(p).matches("[ [ attributeList ] ]");
5555
}
@@ -64,8 +64,8 @@ public void attributeSpecifierXXXX() {
6464
@Test
6565
public void alignmentSpecifier() {
6666
p.setRootRule(g.rule(CxxGrammarImpl.alignmentSpecifier));
67-
g.rule(CxxGrammarImpl.typeId).mock();
68-
g.rule(CxxGrammarImpl.assignmentExpression).mock();
67+
mockRule(CxxGrammarImpl.typeId);
68+
mockRule(CxxGrammarImpl.assignmentExpression);
6969

7070
assertThat(p)
7171
.matches("alignas ( typeId )")
@@ -77,7 +77,7 @@ public void alignmentSpecifier() {
7777
@Test
7878
public void attributeList() {
7979
p.setRootRule(g.rule(CxxGrammarImpl.attributeList));
80-
g.rule(CxxGrammarImpl.attribute).mock();
80+
mockRule(CxxGrammarImpl.attribute);
8181

8282
assertThat(p)
8383
.matches("")
@@ -101,8 +101,8 @@ public void attributeListXXXX() {
101101
@Test
102102
public void attribute() {
103103
p.setRootRule(g.rule(CxxGrammarImpl.attribute));
104-
g.rule(CxxGrammarImpl.attributeToken).mock();
105-
g.rule(CxxGrammarImpl.attributeArgumentClause).mock();
104+
mockRule(CxxGrammarImpl.attributeToken);
105+
mockRule(CxxGrammarImpl.attributeArgumentClause);
106106

107107
assertThat(p)
108108
.matches("attributeToken attributeArgumentClause")
@@ -119,7 +119,7 @@ public void attributeXXXX() {
119119
@Test
120120
public void attributeToken() {
121121
p.setRootRule(g.rule(CxxGrammarImpl.attributeToken));
122-
g.rule(CxxGrammarImpl.attributeScopedToken).mock();
122+
mockRule(CxxGrammarImpl.attributeScopedToken);
123123

124124
assertThat(p)
125125
.matches("foo")
@@ -129,7 +129,7 @@ public void attributeToken() {
129129
@Test
130130
public void attributeScopedToken() {
131131
p.setRootRule(g.rule(CxxGrammarImpl.attributeScopedToken));
132-
g.rule(CxxGrammarImpl.attributeNamespace).mock();
132+
mockRule(CxxGrammarImpl.attributeNamespace);
133133

134134
assertThat(p).matches("attributeNamespace :: foo");
135135
}
@@ -151,7 +151,7 @@ public void attributeNamespace() {
151151
@Test
152152
public void attributeArgumentClause() {
153153
p.setRootRule(g.rule(CxxGrammarImpl.attributeArgumentClause));
154-
g.rule(CxxGrammarImpl.balancedTokenSeq).mock();
154+
mockRule(CxxGrammarImpl.balancedTokenSeq);
155155

156156
assertThat(p).matches("balancedTokenSeq");
157157
}
@@ -165,7 +165,7 @@ public void attributeArgumentClauseXXXX() {
165165
@Test
166166
public void balancedTokenSeq() {
167167
p.setRootRule(g.rule(CxxGrammarImpl.balancedTokenSeq));
168-
g.rule(CxxGrammarImpl.balancedToken).mock();
168+
mockRule(CxxGrammarImpl.balancedToken);
169169

170170
assertThat(p)
171171
.matches("balancedToken")
@@ -183,7 +183,7 @@ public void balancedTokenSeqXXXX() {
183183
@Test
184184
public void balancedToken() {
185185
p.setRootRule(g.rule(CxxGrammarImpl.balancedToken));
186-
g.rule(CxxGrammarImpl.balancedTokenSeq).mock();
186+
mockRule(CxxGrammarImpl.balancedTokenSeq);
187187

188188
assertThat(p).matches("foo")
189189
.matches("( balancedTokenSeq )")

‎cxx-squid/src/test/java/org/sonar/cxx/parser/ClassesTest.java‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ public void classSpecifier_reallife() {
4545
public void classHead() {
4646
p.setRootRule(g.rule(CxxGrammarImpl.classHead));
4747

48-
g.rule(CxxGrammarImpl.classKey).mock(); //@todo deprecated
49-
g.rule(CxxGrammarImpl.classHeadName).mock(); //@todo deprecated
50-
g.rule(CxxGrammarImpl.attributeSpecifierSeq).mock(); //@todo deprecated
51-
g.rule(CxxGrammarImpl.baseClause).mock(); //@todo deprecated
52-
g.rule(CxxGrammarImpl.classVirtSpecifier).mock(); //@todo deprecated
48+
mockRule(CxxGrammarImpl.classKey);
49+
mockRule(CxxGrammarImpl.classHeadName);
50+
mockRule(CxxGrammarImpl.attributeSpecifierSeq);
51+
mockRule(CxxGrammarImpl.baseClause);
52+
mockRule(CxxGrammarImpl.classVirtSpecifier);
5353

5454
assertThat(p).matches("classKey classHeadName");
5555
assertThat(p).matches("classKey attributeSpecifierSeq classHeadName");
@@ -65,8 +65,8 @@ public void classHead() {
6565
public void classHeadName() {
6666
p.setRootRule(g.rule(CxxGrammarImpl.classHeadName));
6767

68-
g.rule(CxxGrammarImpl.nestedNameSpecifier).mock(); //@todo deprecated
69-
g.rule(CxxGrammarImpl.className).mock(); //@todo deprecated
68+
mockRule(CxxGrammarImpl.nestedNameSpecifier);
69+
mockRule(CxxGrammarImpl.className);
7070

7171
assertThat(p).matches("className");
7272
assertThat(p).matches("nestedNameSpecifier className");
@@ -76,8 +76,8 @@ public void classHeadName() {
7676
public void memberSpecification() {
7777
p.setRootRule(g.rule(CxxGrammarImpl.memberSpecification));
7878

79-
g.rule(CxxGrammarImpl.memberDeclaration).mock(); //@todo deprecated
80-
g.rule(CxxGrammarImpl.accessSpecifier).mock(); //@todo deprecated
79+
mockRule(CxxGrammarImpl.memberDeclaration);
80+
mockRule(CxxGrammarImpl.accessSpecifier);
8181

8282
assertThat(p).matches("memberDeclaration");
8383
assertThat(p).matches("memberDeclaration accessSpecifier :");
@@ -100,20 +100,20 @@ public void memberSpecification_reallife() {
100100
public void memberDeclaration() {
101101
p.setRootRule(g.rule(CxxGrammarImpl.memberDeclaration));
102102

103-
g.rule(CxxGrammarImpl.attributeSpecifierSeq).mock(); //@todo deprecated
104-
g.rule(CxxGrammarImpl.memberDeclSpecifierSeq).mock();
105-
g.rule(CxxGrammarImpl.memberDeclaratorList).mock();
106-
g.rule(CxxGrammarImpl.functionDefinition).mock();
107-
g.rule(CxxGrammarImpl.nestedNameSpecifier).mock();
108-
g.rule(CxxGrammarImpl.unqualifiedId).mock();
109-
g.rule(CxxGrammarImpl.usingDeclaration).mock();
110-
g.rule(CxxGrammarImpl.staticAssertDeclaration).mock();
111-
g.rule(CxxGrammarImpl.templateDeclaration).mock();
112-
g.rule(CxxGrammarImpl.aliasDeclaration).mock();
113-
g.rule(CxxGrammarImpl.cliPropertyDefinition).mock();
114-
g.rule(CxxGrammarImpl.cliEventDefinition).mock();
115-
g.rule(CxxGrammarImpl.cliDelegateSpecifier).mock();
116-
g.rule(CxxGrammarImpl.cliGenericDeclaration).mock(); //@todo deprecated
103+
mockRule(CxxGrammarImpl.attributeSpecifierSeq);
104+
mockRule(CxxGrammarImpl.memberDeclSpecifierSeq);
105+
mockRule(CxxGrammarImpl.memberDeclaratorList);
106+
mockRule(CxxGrammarImpl.functionDefinition);
107+
mockRule(CxxGrammarImpl.nestedNameSpecifier);
108+
mockRule(CxxGrammarImpl.unqualifiedId);
109+
mockRule(CxxGrammarImpl.usingDeclaration);
110+
mockRule(CxxGrammarImpl.staticAssertDeclaration);
111+
mockRule(CxxGrammarImpl.templateDeclaration);
112+
mockRule(CxxGrammarImpl.aliasDeclaration);
113+
mockRule(CxxGrammarImpl.cliPropertyDefinition);
114+
mockRule(CxxGrammarImpl.cliEventDefinition);
115+
mockRule(CxxGrammarImpl.cliDelegateSpecifier);
116+
mockRule(CxxGrammarImpl.cliGenericDeclaration);
117117

118118
assertThat(p).matches(";");
119119
assertThat(p).matches("attributeSpecifierSeq memberDeclSpecifierSeq memberDeclaratorList ;");
@@ -178,7 +178,7 @@ public void memberDeclaration_reallife() {
178178
public void memberDeclaratorList() {
179179
p.setRootRule(g.rule(CxxGrammarImpl.memberDeclaratorList));
180180

181-
g.rule(CxxGrammarImpl.memberDeclarator).mock();
181+
mockRule(CxxGrammarImpl.memberDeclarator);
182182

183183
assertThat(p).matches("memberDeclarator");
184184
assertThat(p).matches("memberDeclarator , memberDeclarator");
@@ -195,12 +195,12 @@ public void memberDeclaratorList_reallife() {
195195
public void memberDeclarator() {
196196
p.setRootRule(g.rule(CxxGrammarImpl.memberDeclarator));
197197

198-
g.rule(CxxGrammarImpl.declarator).mock(); //@todo deprecated
199-
g.rule(CxxGrammarImpl.pureSpecifier).mock();
200-
g.rule(CxxGrammarImpl.braceOrEqualInitializer).mock();
201-
g.rule(CxxGrammarImpl.constantExpression).mock();
202-
g.rule(CxxGrammarImpl.attributeSpecifierSeq).mock();
203-
g.rule(CxxGrammarImpl.virtSpecifierSeq).mock(); //@todo deprecated
198+
mockRule(CxxGrammarImpl.declarator);
199+
mockRule(CxxGrammarImpl.pureSpecifier);
200+
mockRule(CxxGrammarImpl.braceOrEqualInitializer);
201+
mockRule(CxxGrammarImpl.constantExpression);
202+
mockRule(CxxGrammarImpl.attributeSpecifierSeq);
203+
mockRule(CxxGrammarImpl.virtSpecifierSeq);
204204

205205
assertThat(p).matches("declarator");
206206
assertThat(p).matches("declarator virtSpecifierSeq");
@@ -225,7 +225,7 @@ public void memberDeclarator_reallife() {
225225
public void virtSpecifierSeq() {
226226
p.setRootRule(g.rule(CxxGrammarImpl.virtSpecifierSeq));
227227

228-
g.rule(CxxGrammarImpl.virtSpecifier).mock(); //@todo deprecated
228+
mockRule(CxxGrammarImpl.virtSpecifier);
229229

230230
assertThat(p).matches("virtSpecifier");
231231
assertThat(p).matches("virtSpecifier virtSpecifier");
@@ -262,7 +262,7 @@ public void virtSpecifier() {
262262
public void baseSpecifierList() {
263263
p.setRootRule(g.rule(CxxGrammarImpl.baseSpecifierList));
264264

265-
g.rule(CxxGrammarImpl.baseSpecifier).mock(); //@todo deprecated
265+
mockRule(CxxGrammarImpl.baseSpecifier);
266266

267267
assertThat(p).matches("baseSpecifier");
268268
assertThat(p).matches("baseSpecifier ...");
@@ -276,9 +276,9 @@ public void baseSpecifierList() {
276276
public void baseSpecifier() {
277277
p.setRootRule(g.rule(CxxGrammarImpl.baseSpecifier));
278278

279-
g.rule(CxxGrammarImpl.baseTypeSpecifier).mock(); //@todo deprecated
280-
g.rule(CxxGrammarImpl.attributeSpecifierSeq).mock();
281-
g.rule(CxxGrammarImpl.accessSpecifier).mock(); //@todo deprecated
279+
mockRule(CxxGrammarImpl.baseTypeSpecifier);
280+
mockRule(CxxGrammarImpl.attributeSpecifierSeq);
281+
mockRule(CxxGrammarImpl.accessSpecifier);
282282

283283
assertThat(p).matches("baseTypeSpecifier");
284284
assertThat(p).matches("attributeSpecifierSeq baseTypeSpecifier");
@@ -294,9 +294,9 @@ public void baseSpecifier() {
294294
public void classOrDecltype() {
295295
p.setRootRule(g.rule(CxxGrammarImpl.classOrDecltype));
296296

297-
g.rule(CxxGrammarImpl.className).mock(); //@todo deprecated
298-
g.rule(CxxGrammarImpl.nestedNameSpecifier).mock();
299-
g.rule(CxxGrammarImpl.decltypeSpecifier).mock(); //@todo deprecated
297+
mockRule(CxxGrammarImpl.className);
298+
mockRule(CxxGrammarImpl.nestedNameSpecifier);
299+
mockRule(CxxGrammarImpl.decltypeSpecifier);
300300

301301
assertThat(p).matches("className");
302302
assertThat(p).matches("nestedNameSpecifier className");

0 commit comments

Comments
 (0)