|
26 | 26 | import org.htmlunit.junit.annotation.Alerts; |
27 | 27 | import org.htmlunit.junit.annotation.HtmlUnitNYI; |
28 | 28 | import org.htmlunit.util.NameValuePair; |
29 | | -import org.junit.jupiter.api.Assertions; |
30 | 29 | import org.junit.jupiter.api.Test; |
31 | 30 |
|
32 | 31 | /** |
@@ -98,15 +97,16 @@ private void sendBlobWithMimeTypeAndAssertContentType(final String desiredMimeTy |
98 | 97 | setExpectedAlerts(); |
99 | 98 | loadPageWithAlerts2(html); |
100 | 99 |
|
101 | | - Assertions.assertEquals(URL_SECOND, getMockWebConnection().getLastWebRequest().getUrl(), |
102 | | - "Never received a call to URL_SECOND"); |
| 100 | + assertEquals("Never received a call to URL_SECOND", URL_SECOND, |
| 101 | + getMockWebConnection().getLastWebRequest().getUrl()); |
103 | 102 |
|
104 | 103 | final String contentType = getMockWebConnection().getLastWebRequest() |
105 | 104 | .getAdditionalHeader(HttpHeader.CONTENT_TYPE); |
106 | 105 |
|
107 | 106 | final String requestBody = getMockWebConnection().getLastWebRequest().getRequestBody(); |
108 | 107 |
|
109 | | - assertEquals(desiredMimeType, contentType == null ? "null" : contentType, "Unexpected Content-Type header"); |
| 108 | + assertEquals("Unexpected Content-Type header", desiredMimeType, |
| 109 | + contentType == null ? "null" : contentType); |
110 | 110 | assertEquals(expectedBody, requestBody == null ? "null" : requestBody); |
111 | 111 | } |
112 | 112 |
|
@@ -146,18 +146,18 @@ public void sendBlob307() throws Exception { |
146 | 146 |
|
147 | 147 | loadPage2(html); |
148 | 148 |
|
149 | | - Assertions.assertEquals(responseUrl, getMockWebConnection().getLastWebRequest().getUrl(), |
150 | | - "Never received a call to '" + responseUrl + "'"); |
| 149 | + assertEquals("Never received a call to '" + responseUrl + "'", responseUrl, |
| 150 | + getMockWebConnection().getLastWebRequest().getUrl()); |
151 | 151 |
|
152 | 152 | assertEquals(3, getMockWebConnection().getRequestCount()); |
153 | 153 | final String contentType = getMockWebConnection().getLastWebRequest() |
154 | 154 | .getAdditionalHeader(HttpHeader.CONTENT_TYPE); |
155 | 155 |
|
156 | 156 | final String requestBody = getMockWebConnection().getLastWebRequest().getRequestBody(); |
157 | 157 |
|
158 | | - assertEquals(getExpectedAlerts()[0], contentType == null ? "null" : contentType, |
159 | | - "Unexpected Content-Type header"); |
160 | | - assertEquals(requestBody == null ? "null" : requestBody, getExpectedAlerts()[1]); |
| 158 | + assertEquals("Unexpected Content-Type header", getExpectedAlerts()[0], |
| 159 | + contentType == null ? "null" : contentType); |
| 160 | + assertEquals(getExpectedAlerts()[1], requestBody == null ? "null" : requestBody); |
161 | 161 | } |
162 | 162 |
|
163 | 163 | /** |
@@ -538,16 +538,16 @@ private void sendXMLDocument(final String doctype, final String createXmlDoc, |
538 | 538 | setExpectedAlerts(); |
539 | 539 | loadPageWithAlerts2(html); |
540 | 540 |
|
541 | | - Assertions.assertEquals(URL_SECOND, getMockWebConnection().getLastWebRequest().getUrl(), |
542 | | - "Never received a call to URL_SECOND"); |
| 541 | + assertEquals("Never received a call to URL_SECOND", URL_SECOND, |
| 542 | + getMockWebConnection().getLastWebRequest().getUrl()); |
543 | 543 |
|
544 | 544 | final String contentType = getMockWebConnection().getLastWebRequest() |
545 | 545 | .getAdditionalHeader(HttpHeader.CONTENT_TYPE); |
546 | 546 |
|
547 | 547 | final String requestBody = getMockWebConnection().getLastWebRequest().getRequestBody(); |
548 | 548 |
|
549 | | - assertEquals(expectedMimeType, contentType == null ? "null" : contentType, |
550 | | - "Unexpected Content-Type header"); |
| 549 | + assertEquals("Unexpected Content-Type header", expectedMimeType, |
| 550 | + contentType == null ? "null" : contentType); |
551 | 551 | assertEquals(expectedBody, requestBody == null ? "null" : requestBody); |
552 | 552 | } |
553 | 553 | } |
0 commit comments