Skip to content

Commit b49d6bb

Browse files
dawidkwieciendawidkwiecien
authored
Fix assertion argument order (expected, actual) flagged by SonarQube S3415 (#6718)
Swap assertEquals(actual, expected) to the JUnit order assertEquals(expected, actual) across the test suite (~90 occurrences flagged by SonarQube rule java:S3415), which improves assertion failure messages. Test-only change; assertion semantics unchanged.
1 parent f3c6d5c commit b49d6bb

7 files changed

Lines changed: 91 additions & 91 deletions

File tree

‎src/components/src/test/java/org/apache/jmeter/assertions/ResponseAssertionTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ public void testThreadSafety() throws Exception {
338338
thread.start();
339339
}
340340
latch.await();
341-
assertEquals(failed.get(), 0);
341+
assertEquals(0, failed.get());
342342
}
343343

344344
class TestThread extends Thread {

‎src/components/src/test/java/org/apache/jmeter/control/TestIfController.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ void testProcessingTrue() throws Exception {
172172
assertEquals(order[counter], sampler.getName());
173173
counter++;
174174
}
175-
assertEquals(counter, 6);
175+
assertEquals(6, counter);
176176
}
177177

178178
@Test
@@ -200,7 +200,7 @@ void testProcessingTrueWithExpression() throws Exception {
200200
assertEquals(order[counter], sampler.getName());
201201
counter++;
202202
}
203-
assertEquals(counter, 6);
203+
assertEquals(6, counter);
204204
}
205205

206206

@@ -237,7 +237,7 @@ void testEvaluateAllChildrenWithoutSubController() throws Exception {
237237
assertEquals(order[counter], sampler.getName());
238238
counter++;
239239
}
240-
assertEquals(counter, 6);
240+
assertEquals(6, counter);
241241
}
242242

243243
/**
@@ -276,7 +276,7 @@ void testEvaluateAllChildrenWithSubController() throws Exception {
276276
assertEquals(order[counter], sampler.getName());
277277
counter++;
278278
}
279-
assertEquals(counter, 6);
279+
assertEquals(6, counter);
280280
}
281281

282282
@Test

‎src/functions/src/test/java/org/apache/jmeter/functions/TestDateTimeConvertFunction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void testDateConvertErrorFormat() throws Exception {
123123
params.add(new CompoundVariable("yyyy-MM-dd"));
124124
params.add(new CompoundVariable("abcd"));
125125
dateConvert.setParameters(params);
126-
Assertions.assertEquals(dateConvert.execute(result, null), "");
126+
Assertions.assertEquals("", dateConvert.execute(result, null));
127127
}
128128

129129
@Test
@@ -132,6 +132,6 @@ void testDateConvertDateError() throws Exception {
132132
params.add(new CompoundVariable("yyyy-MM-dd"));
133133
params.add(new CompoundVariable("dd-MM-yyyy HH:mm:ss"));
134134
dateConvert.setParameters(params);
135-
Assertions.assertEquals(dateConvert.execute(result, null), "");
135+
Assertions.assertEquals("", dateConvert.execute(result, null));
136136
}
137137
}

‎src/jorphan/src/test/java/org/apache/commons/cli/avalon/ClutilTestCase.java‎

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ public void testOptionalArgWithSpace() {
127127
assertNull(option0.getArgument(0), "Option Arg: " + option0.getArgument(0));
128128

129129
final CLOption option1 = clOptions.get(1);
130-
assertEquals(option1.getDescriptor().getId(), CLOption.TEXT_ARGUMENT);
131-
assertEquals(option1.getArgument(0), "param");
130+
assertEquals(CLOption.TEXT_ARGUMENT, option1.getDescriptor().getId());
131+
assertEquals("param", option1.getArgument(0));
132132

133133
final CLOption option2 = clOptions.get(2);
134-
assertEquals(option2.getDescriptor().getId(), ALL_OPT);
134+
assertEquals(ALL_OPT, option2.getDescriptor().getId());
135135
assertNull(option2.getArgument(0));
136136
}
137137

@@ -160,7 +160,7 @@ public void testOptionalArgLong() {
160160
assertEquals("param", option1.getArgument(0));
161161

162162
final CLOption option2 = clOptions.get(2);
163-
assertEquals(option2.getDescriptor().getId(), ALL_OPT);
163+
assertEquals(ALL_OPT, option2.getDescriptor().getId());
164164
assertNull(option2.getArgument(0));
165165
}
166166

@@ -185,7 +185,7 @@ public void testOptionalArgLongEquals() {
185185
assertEquals("param", option0.getArgument(0), "Option Arg: " + option0.getArgument(0));
186186

187187
final CLOption option2 = clOptions.get(1);
188-
assertEquals(option2.getDescriptor().getId(), ALL_OPT);
188+
assertEquals(ALL_OPT, option2.getDescriptor().getId());
189189
assertNull(option2.getArgument(0));
190190
}
191191

@@ -209,7 +209,7 @@ public void testShortOptArgUnenteredBeforeOtherOpt() {
209209
assertNull(option0.getArgument(0), "Option Arg: " + option0.getArgument(0));
210210

211211
final CLOption option1 = clOptions.get(1);
212-
assertEquals(option1.getDescriptor().getId(), ALL_OPT);
212+
assertEquals(ALL_OPT, option1.getDescriptor().getId());
213213
assertNull(option1.getArgument(0));
214214
}
215215

@@ -227,10 +227,10 @@ public void testOptionalArgsWithArgShortBeforeOtherOpt() {
227227
final List<CLOption> clOptions = parser.getArguments();
228228
final int size = clOptions.size();
229229

230-
assertEquals(size, 2);
230+
assertEquals(2, size);
231231
final CLOption option0 = clOptions.get(0);
232-
assertEquals(option0.getDescriptor().getId(), TAINT_OPT);
233-
assertEquals(option0.getArgument(0), "3");
232+
assertEquals(TAINT_OPT, option0.getDescriptor().getId());
233+
assertEquals("3", option0.getArgument(0));
234234

235235
final CLOption option1 = clOptions.get(1);
236236
assertEquals(ALL_OPT, option1.getDescriptor().getId());
@@ -251,10 +251,10 @@ public void testOptionalArgsWithArgShortEqualsBeforeOtherOpt() {
251251
final List<CLOption> clOptions = parser.getArguments();
252252
final int size = clOptions.size();
253253

254-
assertEquals(size, 2);
254+
assertEquals(2, size);
255255
final CLOption option0 = clOptions.get(0);
256-
assertEquals(option0.getDescriptor().getId(), TAINT_OPT);
257-
assertEquals(option0.getArgument(0), "3");
256+
assertEquals(TAINT_OPT, option0.getDescriptor().getId());
257+
assertEquals("3", option0.getArgument(0));
258258

259259
final CLOption option1 = clOptions.get(1);
260260
assertEquals(ALL_OPT, option1.getDescriptor().getId());
@@ -275,7 +275,7 @@ public void testOptionalArgsNoArgShortBeforeOtherOpt() {
275275
final List<CLOption> clOptions = parser.getArguments();
276276
final int size = clOptions.size();
277277

278-
assertEquals(size, 2);
278+
assertEquals(2, size);
279279
final CLOption option0 = clOptions.get(0);
280280
assertEquals(TAINT_OPT, option0.getDescriptor().getId());
281281
assertNull(option0.getArgument(0));
@@ -296,15 +296,15 @@ public void testFullParse() {
296296
final List<CLOption> clOptions = parser.getArguments();
297297
final int size = clOptions.size();
298298

299-
assertEquals(size, 8);
300-
assertEquals(clOptions.get(0).getDescriptor().getId(), YOU_OPT);
301-
assertEquals(clOptions.get(1).getDescriptor().getId(), 0);
302-
assertEquals(clOptions.get(2).getDescriptor().getId(), ALL_OPT);
303-
assertEquals(clOptions.get(3).getDescriptor().getId(), CLEAR1_OPT);
304-
assertEquals(clOptions.get(4).getDescriptor().getId(), CLEAR2_OPT);
305-
assertEquals(clOptions.get(5).getDescriptor().getId(), CLEAR3_OPT);
306-
assertEquals(clOptions.get(6).getDescriptor().getId(), CLEAR5_OPT);
307-
assertEquals(clOptions.get(7).getDescriptor().getId(), 0);
299+
assertEquals(8, size);
300+
assertEquals(YOU_OPT, clOptions.get(0).getDescriptor().getId());
301+
assertEquals(0, clOptions.get(1).getDescriptor().getId());
302+
assertEquals(ALL_OPT, clOptions.get(2).getDescriptor().getId());
303+
assertEquals(CLEAR1_OPT, clOptions.get(3).getDescriptor().getId());
304+
assertEquals(CLEAR2_OPT, clOptions.get(4).getDescriptor().getId());
305+
assertEquals(CLEAR3_OPT, clOptions.get(5).getDescriptor().getId());
306+
assertEquals(CLEAR5_OPT, clOptions.get(6).getDescriptor().getId());
307+
assertEquals(0, clOptions.get(7).getDescriptor().getId());
308308
}
309309

310310
@Test
@@ -319,12 +319,12 @@ public void testDuplicateOptions() {
319319
final List<CLOption> clOptions = parser.getArguments();
320320
final int size = clOptions.size();
321321

322-
assertEquals(size, 5);
323-
assertEquals(clOptions.get(0).getDescriptor().getId(), DEFINE_OPT);
324-
assertEquals(clOptions.get(1).getDescriptor().getId(), 0);
325-
assertEquals(clOptions.get(2).getDescriptor().getId(), ALL_OPT);
326-
assertEquals(clOptions.get(3).getDescriptor().getId(), ALL_OPT);
327-
assertEquals(clOptions.get(4).getDescriptor().getId(), 0);
322+
assertEquals(5, size);
323+
assertEquals(DEFINE_OPT, clOptions.get(0).getDescriptor().getId());
324+
assertEquals(0, clOptions.get(1).getDescriptor().getId());
325+
assertEquals(ALL_OPT, clOptions.get(2).getDescriptor().getId());
326+
assertEquals(ALL_OPT, clOptions.get(3).getDescriptor().getId());
327+
assertEquals(0, clOptions.get(4).getDescriptor().getId());
328328
}
329329

330330
@Test
@@ -338,12 +338,12 @@ public void testIncompatableOptions() {
338338
final List<CLOption> clOptions = parser.getArguments();
339339
final int size = clOptions.size();
340340

341-
assertEquals(size, 5);
342-
assertEquals(clOptions.get(0).getDescriptor().getId(), DEFINE_OPT);
343-
assertEquals(clOptions.get(1).getDescriptor().getId(), 0);
344-
assertEquals(clOptions.get(2).getDescriptor().getId(), ALL_OPT);
345-
assertEquals(clOptions.get(3).getDescriptor().getId(), BLEE_OPT);
346-
assertEquals(clOptions.get(4).getDescriptor().getId(), 0);
341+
assertEquals(5, size);
342+
assertEquals(DEFINE_OPT, clOptions.get(0).getDescriptor().getId());
343+
assertEquals(0, clOptions.get(1).getDescriptor().getId());
344+
assertEquals(ALL_OPT, clOptions.get(2).getDescriptor().getId());
345+
assertEquals(BLEE_OPT, clOptions.get(3).getDescriptor().getId());
346+
assertEquals(0, clOptions.get(4).getDescriptor().getId());
347347
}
348348

349349
@Test
@@ -357,9 +357,9 @@ public void testSingleArg() {
357357
final List<CLOption> clOptions = parser.getArguments();
358358
final int size = clOptions.size();
359359

360-
assertEquals(size, 1);
361-
assertEquals(clOptions.get(0).getDescriptor().getId(), FILE_OPT);
362-
assertEquals(clOptions.get(0).getArgument(), "myfile.txt");
360+
assertEquals(1, size);
361+
assertEquals(FILE_OPT, clOptions.get(0).getDescriptor().getId());
362+
assertEquals("myfile.txt", clOptions.get(0).getArgument());
363363
}
364364

365365
@Test
@@ -560,12 +560,12 @@ public void test2ArgsParse() {
560560
final List<CLOption> clOptions = parser.getArguments();
561561
final int size = clOptions.size();
562562

563-
assertEquals(size, 5);
564-
assertEquals(clOptions.get(0).getDescriptor().getId(), DEFINE_OPT);
565-
assertEquals(clOptions.get(1).getDescriptor().getId(), 0);
566-
assertEquals(clOptions.get(2).getDescriptor().getId(), ALL_OPT);
567-
assertEquals(clOptions.get(3).getDescriptor().getId(), 0);
568-
assertEquals(clOptions.get(4).getDescriptor().getId(), CASE_CHECK_OPT);
563+
assertEquals(5, size);
564+
assertEquals(DEFINE_OPT, clOptions.get(0).getDescriptor().getId());
565+
assertEquals(0, clOptions.get(1).getDescriptor().getId());
566+
assertEquals(ALL_OPT, clOptions.get(2).getDescriptor().getId());
567+
assertEquals(0, clOptions.get(3).getDescriptor().getId());
568+
assertEquals(CASE_CHECK_OPT, clOptions.get(4).getDescriptor().getId());
569569

570570
final CLOption option = clOptions.get(0);
571571
assertEquals("stupid", option.getArgument(0));
@@ -664,8 +664,8 @@ public boolean isFinished(int lastOptionCode) {
664664
final List<CLOption> clOptions = parser.getArguments();
665665
final int size = clOptions.size();
666666

667-
assertEquals(size, 1);
668-
assertEquals(clOptions.get(0).getDescriptor().getId(), YOU_OPT);
667+
assertEquals(1, size);
668+
assertEquals(YOU_OPT, clOptions.get(0).getDescriptor().getId());
669669
}
670670

671671
@Test
@@ -688,8 +688,8 @@ public boolean isFinished(int lastOptionCode) {
688688
final List<CLOption> clOptions1 = parser1.getArguments();
689689
final int size1 = clOptions1.size();
690690

691-
assertEquals(size1, 1);
692-
assertEquals(clOptions1.get(0).getDescriptor().getId(), YOU_OPT);
691+
assertEquals(1, size1);
692+
assertEquals(YOU_OPT, clOptions1.get(0).getDescriptor().getId());
693693

694694
final CLArgsParser parser2 = new CLArgsParser(parser1.getUnparsedArgs(), options2);
695695

@@ -698,14 +698,14 @@ public boolean isFinished(int lastOptionCode) {
698698
final List<CLOption> clOptions2 = parser2.getArguments();
699699
final int size2 = clOptions2.size();
700700

701-
assertEquals(size2, 7);
702-
assertEquals(clOptions2.get(0).getDescriptor().getId(), 0);
703-
assertEquals(clOptions2.get(1).getDescriptor().getId(), ALL_OPT);
704-
assertEquals(clOptions2.get(2).getDescriptor().getId(), CLEAR1_OPT);
705-
assertEquals(clOptions2.get(3).getDescriptor().getId(), CLEAR2_OPT);
706-
assertEquals(clOptions2.get(4).getDescriptor().getId(), CLEAR3_OPT);
707-
assertEquals(clOptions2.get(5).getDescriptor().getId(), CLEAR5_OPT);
708-
assertEquals(clOptions2.get(6).getDescriptor().getId(), 0);
701+
assertEquals(7, size2);
702+
assertEquals(0, clOptions2.get(0).getDescriptor().getId());
703+
assertEquals(ALL_OPT, clOptions2.get(1).getDescriptor().getId());
704+
assertEquals(CLEAR1_OPT, clOptions2.get(2).getDescriptor().getId());
705+
assertEquals(CLEAR2_OPT, clOptions2.get(3).getDescriptor().getId());
706+
assertEquals(CLEAR3_OPT, clOptions2.get(4).getDescriptor().getId());
707+
assertEquals(CLEAR5_OPT, clOptions2.get(5).getDescriptor().getId());
708+
assertEquals(0, clOptions2.get(6).getDescriptor().getId());
709709
}
710710

711711
@Test
@@ -728,11 +728,11 @@ public boolean isFinished(final int lastOptionCode) {
728728
final List<CLOption> clOptions1 = parser1.getArguments();
729729
final int size1 = clOptions1.size();
730730

731-
assertEquals(size1, 4);
732-
assertEquals(clOptions1.get(0).getDescriptor().getId(), YOU_OPT);
733-
assertEquals(clOptions1.get(1).getDescriptor().getId(), 0);
734-
assertEquals(clOptions1.get(2).getDescriptor().getId(), ALL_OPT);
735-
assertEquals(clOptions1.get(3).getDescriptor().getId(), CLEAR1_OPT);
731+
assertEquals(4, size1);
732+
assertEquals(YOU_OPT, clOptions1.get(0).getDescriptor().getId());
733+
assertEquals(0, clOptions1.get(1).getDescriptor().getId());
734+
assertEquals(ALL_OPT, clOptions1.get(2).getDescriptor().getId());
735+
assertEquals(CLEAR1_OPT, clOptions1.get(3).getDescriptor().getId());
736736

737737
assertEquals("ler", parser1.getUnparsedArgs()[0]);
738738

@@ -743,9 +743,9 @@ public boolean isFinished(final int lastOptionCode) {
743743
final List<CLOption> clOptions2 = parser2.getArguments();
744744
final int size2 = clOptions2.size();
745745

746-
assertEquals(size2, 2);
747-
assertEquals(clOptions2.get(0).getDescriptor().getId(), 0);
748-
assertEquals(clOptions2.get(1).getDescriptor().getId(), 0);
746+
assertEquals(2, size2);
747+
assertEquals(0, clOptions2.get(0).getDescriptor().getId());
748+
assertEquals(0, clOptions2.get(1).getDescriptor().getId());
749749
}
750750

751751
@Test
@@ -769,11 +769,11 @@ public void testIncomplete2Args() {
769769
final List<CLOption> clOptions = parser.getArguments();
770770
final int size = clOptions.size();
771771

772-
assertEquals(size, 1);
772+
assertEquals(1, size);
773773
final CLOption option = clOptions.get(0);
774-
assertEquals(option.getDescriptor().getId(), DEFINE_OPT);
775-
assertEquals(option.getArgument(0), "stupid");
776-
assertEquals(option.getArgument(1), "");
774+
assertEquals(DEFINE_OPT, option.getDescriptor().getId());
775+
assertEquals("stupid", option.getArgument(0));
776+
assertEquals("", option.getArgument(1));
777777
}
778778

779779
@Test
@@ -790,12 +790,12 @@ public void testIncomplete2ArgsMixed() {
790790
final List<CLOption> clOptions = parser.getArguments();
791791
final int size = clOptions.size();
792792

793-
assertEquals(size, 2);
794-
assertEquals(clOptions.get(1).getDescriptor().getId(), CLEAR1_OPT);
793+
assertEquals(2, size);
794+
assertEquals(CLEAR1_OPT, clOptions.get(1).getDescriptor().getId());
795795
final CLOption option = clOptions.get(0);
796-
assertEquals(option.getDescriptor().getId(), DEFINE_OPT);
797-
assertEquals(option.getArgument(0), "stupid");
798-
assertEquals(option.getArgument(1), "");
796+
assertEquals(DEFINE_OPT, option.getDescriptor().getId());
797+
assertEquals("stupid", option.getArgument(0));
798+
assertEquals("", option.getArgument(1));
799799
}
800800

801801
@Test
@@ -812,12 +812,12 @@ public void testIncomplete2ArgsMixedNoEq() {
812812
final List<CLOption> clOptions = parser.getArguments();
813813
final int size = clOptions.size();
814814

815-
assertEquals(size, 2);
816-
assertEquals(clOptions.get(1).getDescriptor().getId(), CLEAR1_OPT);
815+
assertEquals(2, size);
816+
assertEquals(CLEAR1_OPT, clOptions.get(1).getDescriptor().getId());
817817
final CLOption option = clOptions.get(0);
818-
assertEquals(option.getDescriptor().getId(), DEFINE_OPT);
819-
assertEquals(option.getArgument(0), "Stupid");
820-
assertEquals(option.getArgument(1), "");
818+
assertEquals(DEFINE_OPT, option.getDescriptor().getId());
819+
assertEquals("Stupid", option.getArgument(0));
820+
assertEquals("", option.getArgument(1));
821821
}
822822

823823
/**

‎src/jorphan/src/test/java/org/apache/jorphan/collections/PackageTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ public void testAddObjectAndTree() throws Exception {
9797
ListedHashTree tree = new ListedHashTree("key");
9898
ListedHashTree newTree = new ListedHashTree("value");
9999
tree.add("key", newTree);
100-
assertEquals(tree.list().size(), 1);
100+
assertEquals(1, tree.list().size());
101101
assertEquals("key", tree.getArray()[0]);
102102
assertEquals(1, tree.getTree("key").list().size());
103103
assertEquals(0, tree.getTree("key").getTree("value").size());
104-
assertEquals(tree.getTree("key").getArray()[0], "value");
104+
assertEquals("value", tree.getTree("key").getArray()[0]);
105105
assertNotNull(tree.getTree("key").get("value"));
106106
}
107107

‎src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/config/UrlConfigTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ public void testSimpleConfig() {
6767
public void testOverRide() {
6868
JMeterProperty jmp = partialConfig.getProperty(HTTPSamplerBase.DOMAIN);
6969
assertInstanceOf(NullProperty.class, jmp);
70-
assertEquals(jmp, new NullProperty(HTTPSamplerBase.DOMAIN));
70+
assertEquals(new NullProperty(HTTPSamplerBase.DOMAIN), jmp);
7171
partialConfig.addTestElement(defaultConfig);
72-
assertEquals(partialConfig.getPropertyAsString(HTTPSamplerBase.DOMAIN), "www.xerox.com");
73-
assertEquals(partialConfig.getPropertyAsString(HTTPSamplerBase.PATH), "main.jsp");
72+
assertEquals("www.xerox.com", partialConfig.getPropertyAsString(HTTPSamplerBase.DOMAIN));
73+
assertEquals("main.jsp", partialConfig.getPropertyAsString(HTTPSamplerBase.PATH));
7474
}
7575
}

0 commit comments

Comments
 (0)