Skip to content

Commit ae75354

Browse files
vlsivlsi
committed
refactor: replace org.junit.Assert with org.junit.jupiter.api.Assertions
It is a step towards removing junit:junit:4.x dependency
1 parent e5355de commit ae75354

106 files changed

Lines changed: 1095 additions & 1095 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717

1818
package org.apache.jmeter.assertions;
1919

20-
import static org.junit.Assert.assertEquals;
21-
import static org.junit.Assert.assertFalse;
22-
import static org.junit.Assert.assertNotNull;
23-
import static org.junit.Assert.assertNull;
24-
import static org.junit.Assert.assertTrue;
20+
import static org.junit.jupiter.api.Assertions.assertEquals;
21+
import static org.junit.jupiter.api.Assertions.assertFalse;
22+
import static org.junit.jupiter.api.Assertions.assertNotEquals;
23+
import static org.junit.jupiter.api.Assertions.assertNotNull;
24+
import static org.junit.jupiter.api.Assertions.assertNull;
25+
import static org.junit.jupiter.api.Assertions.assertTrue;
2526

2627
import java.net.MalformedURLException;
2728
import java.net.URL;
@@ -115,14 +116,13 @@ public void testMalformedCachePatternException() throws Exception{
115116
assertion.addTestString("[]");
116117
result = assertion.getResult(sample);
117118
assertNotNull(result.getFailureMessage());
118-
assertFalse("Should not be: Response was null","Response was null".equals(result.getFailureMessage()));
119-
assertTrue("Not expecting error: "+result.getFailureMessage(),result.isError());
119+
assertNotEquals("Response was null", result.getFailureMessage(), "Should not be: Response was null");
120+
assertTrue(result.isError(), "Not expecting error: "+result.getFailureMessage());
120121

121122
assertion.setCustomFailureMessage("Custom failure message");
122123
result = assertion.getResult(sample);
123-
assertTrue("Did not get expected error: "+result.getFailureMessage(),result.isError());
124-
assertFalse("Failure message must not be custom failure message for error",
125-
"Custom failure message".equals(result.getFailureMessage()));
124+
assertTrue(result.isError(), "Did not get expected error: "+result.getFailureMessage());
125+
assertNotEquals("Custom failure message", result.getFailureMessage(), "Failure message must not be custom failure message for error");
126126

127127
}
128128

@@ -311,17 +311,17 @@ public void testResponseAssertionSubstring() throws Exception{
311311
//TODO - need a lot more tests
312312

313313
private void assertPassed() throws Exception{
314-
assertNull(result.getFailureMessage(),result.getFailureMessage());
315-
assertFalse("Not expecting error: "+result.getFailureMessage(),result.isError());
316-
assertFalse("Not expecting error",result.isError());
317-
assertFalse("Not expecting failure",result.isFailure());
314+
assertNull(result.getFailureMessage(), result.getFailureMessage());
315+
assertFalse(result.isError(), "Not expecting error: "+result.getFailureMessage());
316+
assertFalse(result.isError(), "Not expecting error");
317+
assertFalse(result.isFailure(), "Not expecting failure");
318318
}
319319

320320
private void assertFailed() throws Exception{
321321
assertNotNull(result.getFailureMessage());
322-
assertFalse("Should not be: Response was null","Response was null".equals(result.getFailureMessage()));
323-
assertFalse("Not expecting error: "+result.getFailureMessage(),result.isError());
324-
assertTrue("Expecting failure",result.isFailure());
322+
assertNotEquals("Response was null", result.getFailureMessage(), "Should not be: Response was null");
323+
assertFalse(result.isError(), "Not expecting error: "+result.getFailureMessage());
324+
assertTrue(result.isFailure(), "Expecting failure");
325325

326326
}
327327
private AtomicInteger failed;

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

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.apache.jmeter.assertions;
1919

20-
import static org.junit.Assert.assertFalse;
20+
import static org.junit.jupiter.api.Assertions.assertFalse;
2121

2222
import java.io.ByteArrayOutputStream;
2323
import java.io.File;
@@ -111,9 +111,8 @@ public void testSignature() {
111111
testElement.setVerifySignature(true);
112112
AssertionResult result = SMIMEAssertion.getResult(testElement, parent,
113113
"Test");
114-
assertFalse("Result should not be an error", result.isError());
115-
assertFalse("Result should not fail: " + result.getFailureMessage(),
116-
result.isFailure());
114+
assertFalse(result.isError(), "Result should not be an error");
115+
assertFalse(result.isFailure(), "Result should not fail: " + result.getFailureMessage());
117116
}
118117

119118
@Test
@@ -123,9 +122,8 @@ public void testSignerEmail() {
123122
testElement.setSignerEmail("bob@b.example.com");
124123
AssertionResult result = SMIMEAssertion.getResult(testElement, parent,
125124
"Test");
126-
assertFalse("Result should not be an error", result.isError());
127-
assertFalse("Result should not fail: " + result.getFailureMessage(),
128-
result.isFailure());
125+
assertFalse(result.isError(), "Result should not be an error");
126+
assertFalse(result.isFailure(), "Result should not fail: " + result.getFailureMessage());
129127
}
130128

131129
@Test
@@ -135,9 +133,8 @@ public void testSignerSerial() {
135133
testElement.setSignerSerial("0xc8c46f8fbf9ebea4");
136134
AssertionResult result = SMIMEAssertion.getResult(testElement, parent,
137135
"Test");
138-
assertFalse("Result should not be an error", result.isError());
139-
assertFalse("Result should not fail: " + result.getFailureMessage(),
140-
result.isFailure());
136+
assertFalse(result.isError(), "Result should not be an error");
137+
assertFalse(result.isFailure(), "Result should not fail: " + result.getFailureMessage());
141138
}
142139

143140
@Test
@@ -149,9 +146,8 @@ public void testSignerSignerDN() {
149146
.setSignerDn(signerDn);
150147
AssertionResult result = SMIMEAssertion.getResult(testElement, parent,
151148
"Test");
152-
assertFalse("Result should not be an error", result.isError());
153-
assertFalse("Result should not fail: " + result.getFailureMessage(),
154-
result.isFailure());
149+
assertFalse(result.isError(), "Result should not be an error");
150+
assertFalse(result.isFailure(), "Result should not fail: " + result.getFailureMessage());
155151
}
156152

157153
@Test
@@ -163,9 +159,8 @@ public void testSignerIssuerDN() {
163159
.setIssuerDn(issuerDn);
164160
AssertionResult result = SMIMEAssertion.getResult(testElement, parent,
165161
"Test");
166-
assertFalse("Result should not be an error", result.isError());
167-
assertFalse("Result should not fail: " + result.getFailureMessage(),
168-
result.isFailure());
162+
assertFalse(result.isError(), "Result should not be an error");
163+
assertFalse(result.isFailure(), "Result should not fail: " + result.getFailureMessage());
169164
}
170165

171166
@Test
@@ -176,9 +171,8 @@ public void testSignerCert() throws Exception {
176171
testElement.setSignerCertFile(new File(getClass().getResource("email.pem").toURI()).getAbsolutePath());
177172
AssertionResult result = SMIMEAssertion.getResult(testElement, parent,
178173
"Test");
179-
assertFalse("Result should not be an error", result.isError());
180-
assertFalse("Result should not fail: " + result.getFailureMessage(),
181-
result.isFailure());
174+
assertFalse(result.isError(), "Result should not be an error");
175+
assertFalse(result.isFailure(), "Result should not fail: " + result.getFailureMessage());
182176
}
183177

184178
private SampleResult createChildSample() throws MessagingException,

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@
1717

1818
package org.apache.jmeter.assertions;
1919

20-
import static org.junit.Assert.assertFalse;
21-
import static org.junit.Assert.assertNotNull;
22-
import static org.junit.Assert.assertNull;
23-
import static org.junit.Assert.assertTrue;
20+
import static org.junit.jupiter.api.Assertions.assertFalse;
21+
import static org.junit.jupiter.api.Assertions.assertNotEquals;
22+
import static org.junit.jupiter.api.Assertions.assertNotNull;
23+
import static org.junit.jupiter.api.Assertions.assertNull;
24+
import static org.junit.jupiter.api.Assertions.assertTrue;
2425

2526
import org.apache.jmeter.junit.JMeterTestCase;
2627
import org.apache.jmeter.samplers.SampleResult;
@@ -162,14 +163,14 @@ public void testSizeAssertionLessThanEqual() throws Exception {
162163
// TODO - need a lot more tests
163164

164165
private void assertPassed() throws Exception {
165-
assertNull("Failure message should be null", result.getFailureMessage());
166+
assertNull(result.getFailureMessage(), "Failure message should be null");
166167
assertFalse(result.isError());
167168
assertFalse(result.isFailure());
168169
}
169170

170171
private void assertFailed() throws Exception {
171-
assertNotNull("Failure message should not be null", result.getFailureMessage());
172-
assertFalse("Should not be: Response was null", "Response was null".equals(result.getFailureMessage()));
172+
assertNotNull(result.getFailureMessage(), "Failure message should not be null");
173+
assertNotEquals("Response was null", result.getFailureMessage(), "Should not be: Response was null");
173174
assertFalse(result.isError());
174175
assertTrue(result.isFailure());
175176
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
package org.apache.jmeter.assertions;
1919

20-
import static org.junit.Assert.assertEquals;
21-
import static org.junit.Assert.assertFalse;
22-
import static org.junit.Assert.assertTrue;
20+
import static org.junit.jupiter.api.Assertions.assertEquals;
21+
import static org.junit.jupiter.api.Assertions.assertFalse;
22+
import static org.junit.jupiter.api.Assertions.assertTrue;
2323

2424
import java.io.BufferedInputStream;
2525
import java.io.ByteArrayOutputStream;
@@ -77,8 +77,8 @@ public void testAssertionOK() throws Exception {
7777
AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
7878
testLog.debug("isError() " + res.isError() + " isFailure() " + res.isFailure());
7979
testLog.debug("failure " + res.getFailureMessage());
80-
assertFalse("Should not be an error", res.isError());
81-
assertFalse("Should not be a failure", res.isFailure());
80+
assertFalse(res.isError(), "Should not be an error");
81+
assertFalse(res.isFailure(), "Should not be a failure");
8282
}
8383

8484
@Test

0 commit comments

Comments
 (0)