Skip to content

Commit 0ea8686

Browse files
rbrirbri
committed
working on junit5 update (@nested)
1 parent 4d98ce3 commit 0ea8686

2 files changed

Lines changed: 165 additions & 166 deletions

File tree

‎src/test/java/org/htmlunit/NoHttpResponseTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class NoHttpResponseTest {
5454
* Test using WebDriver.
5555
*/
5656
@Nested
57-
public static class WithWebDriverTest extends WebDriverTestCase {
57+
public class WithWebDriverTest extends WebDriverTestCase {
5858

5959
/**
6060
* Resets the {@link MiniServer}.
@@ -130,7 +130,7 @@ public void callSubmitInButtonAndReturnTrue() throws Exception {
130130
* Test using WebClient with default configuration allowing to throw exception.
131131
*/
132132
@Nested
133-
public static class WithWebClientTest extends SimpleWebTestCase {
133+
public class WithWebClientTest extends SimpleWebTestCase {
134134

135135
/**
136136
* Resets the {@link MiniServer}.

‎src/test/java/org/htmlunit/javascript/host/xml/XMLHttpRequestLifeCycleTest.java‎

Lines changed: 163 additions & 164 deletions
Original file line numberDiff line numberDiff line change
@@ -130,169 +130,7 @@ private enum Execution {
130130
* Test using our JettyServer.
131131
*/
132132
@Nested
133-
public static class JettyServerTest extends WebDriverTestCase {
134-
135-
/**
136-
* Helper servlet.
137-
*/
138-
public static class Xml200Servlet extends HttpServlet {
139-
140-
@Override
141-
protected void doOptions(final HttpServletRequest request, final HttpServletResponse response) {
142-
response.setHeader("Access-Control-Allow-Origin", "*");
143-
response.setHeader("Access-Control-Allow-Methods", "*");
144-
response.setHeader("Access-Control-Allow-Headers", "X-PINGOTHER");
145-
}
146-
147-
@Override
148-
protected void doGet(final HttpServletRequest request, final HttpServletResponse response)
149-
throws ServletException, IOException {
150-
response.setHeader("Access-Control-Allow-Origin", "*");
151-
response.setHeader("Access-Control-Allow-Methods", "*");
152-
response.setHeader("Access-Control-Allow-Headers", "X-PINGOTHER");
153-
154-
response.setContentType(MimeType.TEXT_XML);
155-
response.setContentLength(RETURN_XML.length());
156-
response.setStatus(HttpStatus.OK_200);
157-
final ServletOutputStream outputStream = response.getOutputStream();
158-
try (Writer writer = new OutputStreamWriter(outputStream)) {
159-
writer.write(RETURN_XML);
160-
}
161-
}
162-
}
163-
164-
/**
165-
* Helper servlet.
166-
*/
167-
public static class Xml200ServletWithoutOriginHeader extends HttpServlet {
168-
169-
@Override
170-
protected void doOptions(final HttpServletRequest request, final HttpServletResponse response) {
171-
response.setHeader("Access-Control-Allow-Origin", "*");
172-
response.setHeader("Access-Control-Allow-Methods", "*");
173-
response.setHeader("Access-Control-Allow-Headers", "X-PINGOTHER");
174-
}
175-
176-
@Override
177-
protected void doGet(final HttpServletRequest request, final HttpServletResponse response)
178-
throws ServletException, IOException {
179-
response.setContentType(MimeType.TEXT_XML);
180-
response.setContentLength(RETURN_XML.length());
181-
response.setStatus(HttpStatus.OK_200);
182-
final ServletOutputStream outputStream = response.getOutputStream();
183-
try (Writer writer = new OutputStreamWriter(outputStream)) {
184-
writer.write(RETURN_XML);
185-
}
186-
}
187-
}
188-
189-
/**
190-
* Helper servlet.
191-
*/
192-
public static class Xml403Servlet extends HttpServlet {
193-
194-
@Override
195-
protected void doOptions(final HttpServletRequest request, final HttpServletResponse response) {
196-
response.setHeader("Access-Control-Allow-Origin", "*");
197-
response.setHeader("Access-Control-Allow-Methods", "*");
198-
response.setHeader("Access-Control-Allow-Headers", "X-PINGOTHER");
199-
}
200-
201-
@Override
202-
protected void doGet(final HttpServletRequest request, final HttpServletResponse response)
203-
throws ServletException, IOException {
204-
response.setHeader("Access-Control-Allow-Origin", "*");
205-
response.setHeader("Access-Control-Allow-Methods", "*");
206-
response.setHeader("Access-Control-Allow-Headers", "X-PINGOTHER");
207-
208-
response.setContentType(MimeType.TEXT_XML);
209-
response.setContentLength(RETURN_XML.length());
210-
response.setStatus(HttpStatus.FORBIDDEN_403);
211-
final ServletOutputStream outputStream = response.getOutputStream();
212-
try (Writer writer = new OutputStreamWriter(outputStream)) {
213-
writer.write(RETURN_XML);
214-
}
215-
}
216-
}
217-
218-
/**
219-
* Helper servlet.
220-
*/
221-
public static class Xml500Servlet extends HttpServlet {
222-
223-
@Override
224-
protected void doOptions(final HttpServletRequest request, final HttpServletResponse response) {
225-
response.setHeader("Access-Control-Allow-Origin", "*");
226-
response.setHeader("Access-Control-Allow-Methods", "*");
227-
response.setHeader("Access-Control-Allow-Headers", "X-PINGOTHER");
228-
}
229-
230-
@Override
231-
protected void doGet(final HttpServletRequest request, final HttpServletResponse response)
232-
throws ServletException, IOException {
233-
response.setHeader("Access-Control-Allow-Origin", "*");
234-
response.setHeader("Access-Control-Allow-Methods", "*");
235-
response.setHeader("Access-Control-Allow-Headers", "X-PINGOTHER");
236-
237-
response.setContentType(MimeType.TEXT_XML);
238-
response.setContentLength(RETURN_XML.length());
239-
response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR_500);
240-
final ServletOutputStream outputStream = response.getOutputStream();
241-
try (Writer writer = new OutputStreamWriter(outputStream)) {
242-
writer.write(RETURN_XML);
243-
}
244-
}
245-
}
246-
247-
/**
248-
* Helper servlet.
249-
*/
250-
public static class Preflight403Servlet extends HttpServlet {
251-
252-
@Override
253-
protected void doOptions(final HttpServletRequest request, final HttpServletResponse response) {
254-
response.setStatus(HttpStatus.FORBIDDEN_403);
255-
}
256-
}
257-
258-
/**
259-
* Helper servlet.
260-
*/
261-
public static class Preflight500Servlet extends HttpServlet {
262-
263-
@Override
264-
protected void doOptions(final HttpServletRequest request, final HttpServletResponse response) {
265-
response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR_500);
266-
}
267-
}
268-
269-
/**
270-
* Helper servlet.
271-
*/
272-
@Nested
273-
public static class XmlTimeoutServlet extends HttpServlet {
274-
275-
@Override
276-
protected void doGet(final HttpServletRequest req, final HttpServletResponse response)
277-
throws ServletException, IOException {
278-
response.setHeader("Access-Control-Allow-Origin", "*");
279-
response.setHeader("Access-Control-Allow-Methods", "*");
280-
response.setHeader("Access-Control-Allow-Headers", "X-PINGOTHER");
281-
282-
response.setContentType(MimeType.TEXT_XML);
283-
response.setContentLength(RETURN_XML.length());
284-
response.setStatus(HttpStatus.OK_200);
285-
final ServletOutputStream outputStream = response.getOutputStream();
286-
try (Writer writer = new OutputStreamWriter(outputStream)) {
287-
writer.flush();
288-
Thread.sleep(500);
289-
writer.write(RETURN_XML);
290-
}
291-
catch (final Exception ignored) {
292-
// ignore
293-
}
294-
}
295-
}
133+
public class JettyServerTest extends WebDriverTestCase {
296134

297135
private final Map<String, Class<? extends Servlet>> servlets_ = new HashMap<>();
298136

@@ -1222,7 +1060,7 @@ public void onKeyWord_async_timeout() throws Exception {
12221060
* Test using our MiniServer to be able to simulate special error conditions.
12231061
*/
12241062
@Nested
1225-
public static class MiniServerTest extends WebDriverTestCase {
1063+
public class MiniServerTest extends WebDriverTestCase {
12261064

12271065
/**
12281066
* Shoutdown all web browsers and reset the {@link MiniServer}.
@@ -1801,4 +1639,165 @@ static void registerEventListener(final StringBuffer buffer, final Mode mode, fi
18011639

18021640
private XMLHttpRequestLifeCycleTest() {
18031641
}
1642+
1643+
/**
1644+
* Helper servlet.
1645+
*/
1646+
public static class Xml200Servlet extends HttpServlet {
1647+
1648+
@Override
1649+
protected void doOptions(final HttpServletRequest request, final HttpServletResponse response) {
1650+
response.setHeader("Access-Control-Allow-Origin", "*");
1651+
response.setHeader("Access-Control-Allow-Methods", "*");
1652+
response.setHeader("Access-Control-Allow-Headers", "X-PINGOTHER");
1653+
}
1654+
1655+
@Override
1656+
protected void doGet(final HttpServletRequest request, final HttpServletResponse response)
1657+
throws ServletException, IOException {
1658+
response.setHeader("Access-Control-Allow-Origin", "*");
1659+
response.setHeader("Access-Control-Allow-Methods", "*");
1660+
response.setHeader("Access-Control-Allow-Headers", "X-PINGOTHER");
1661+
1662+
response.setContentType(MimeType.TEXT_XML);
1663+
response.setContentLength(RETURN_XML.length());
1664+
response.setStatus(HttpStatus.OK_200);
1665+
final ServletOutputStream outputStream = response.getOutputStream();
1666+
try (Writer writer = new OutputStreamWriter(outputStream)) {
1667+
writer.write(RETURN_XML);
1668+
}
1669+
}
1670+
}
1671+
1672+
/**
1673+
* Helper servlet.
1674+
*/
1675+
public static class Xml200ServletWithoutOriginHeader extends HttpServlet {
1676+
1677+
@Override
1678+
protected void doOptions(final HttpServletRequest request, final HttpServletResponse response) {
1679+
response.setHeader("Access-Control-Allow-Origin", "*");
1680+
response.setHeader("Access-Control-Allow-Methods", "*");
1681+
response.setHeader("Access-Control-Allow-Headers", "X-PINGOTHER");
1682+
}
1683+
1684+
@Override
1685+
protected void doGet(final HttpServletRequest request, final HttpServletResponse response)
1686+
throws ServletException, IOException {
1687+
response.setContentType(MimeType.TEXT_XML);
1688+
response.setContentLength(RETURN_XML.length());
1689+
response.setStatus(HttpStatus.OK_200);
1690+
final ServletOutputStream outputStream = response.getOutputStream();
1691+
try (Writer writer = new OutputStreamWriter(outputStream)) {
1692+
writer.write(RETURN_XML);
1693+
}
1694+
}
1695+
}
1696+
1697+
/**
1698+
* Helper servlet.
1699+
*/
1700+
public static class Xml403Servlet extends HttpServlet {
1701+
1702+
@Override
1703+
protected void doOptions(final HttpServletRequest request, final HttpServletResponse response) {
1704+
response.setHeader("Access-Control-Allow-Origin", "*");
1705+
response.setHeader("Access-Control-Allow-Methods", "*");
1706+
response.setHeader("Access-Control-Allow-Headers", "X-PINGOTHER");
1707+
}
1708+
1709+
@Override
1710+
protected void doGet(final HttpServletRequest request, final HttpServletResponse response)
1711+
throws ServletException, IOException {
1712+
response.setHeader("Access-Control-Allow-Origin", "*");
1713+
response.setHeader("Access-Control-Allow-Methods", "*");
1714+
response.setHeader("Access-Control-Allow-Headers", "X-PINGOTHER");
1715+
1716+
response.setContentType(MimeType.TEXT_XML);
1717+
response.setContentLength(RETURN_XML.length());
1718+
response.setStatus(HttpStatus.FORBIDDEN_403);
1719+
final ServletOutputStream outputStream = response.getOutputStream();
1720+
try (Writer writer = new OutputStreamWriter(outputStream)) {
1721+
writer.write(RETURN_XML);
1722+
}
1723+
}
1724+
}
1725+
1726+
/**
1727+
* Helper servlet.
1728+
*/
1729+
public static class Xml500Servlet extends HttpServlet {
1730+
1731+
@Override
1732+
protected void doOptions(final HttpServletRequest request, final HttpServletResponse response) {
1733+
response.setHeader("Access-Control-Allow-Origin", "*");
1734+
response.setHeader("Access-Control-Allow-Methods", "*");
1735+
response.setHeader("Access-Control-Allow-Headers", "X-PINGOTHER");
1736+
}
1737+
1738+
@Override
1739+
protected void doGet(final HttpServletRequest request, final HttpServletResponse response)
1740+
throws ServletException, IOException {
1741+
response.setHeader("Access-Control-Allow-Origin", "*");
1742+
response.setHeader("Access-Control-Allow-Methods", "*");
1743+
response.setHeader("Access-Control-Allow-Headers", "X-PINGOTHER");
1744+
1745+
response.setContentType(MimeType.TEXT_XML);
1746+
response.setContentLength(RETURN_XML.length());
1747+
response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR_500);
1748+
final ServletOutputStream outputStream = response.getOutputStream();
1749+
try (Writer writer = new OutputStreamWriter(outputStream)) {
1750+
writer.write(RETURN_XML);
1751+
}
1752+
}
1753+
}
1754+
1755+
/**
1756+
* Helper servlet.
1757+
*/
1758+
public static class Preflight403Servlet extends HttpServlet {
1759+
1760+
@Override
1761+
protected void doOptions(final HttpServletRequest request, final HttpServletResponse response) {
1762+
response.setStatus(HttpStatus.FORBIDDEN_403);
1763+
}
1764+
}
1765+
1766+
/**
1767+
* Helper servlet.
1768+
*/
1769+
public static class Preflight500Servlet extends HttpServlet {
1770+
1771+
@Override
1772+
protected void doOptions(final HttpServletRequest request, final HttpServletResponse response) {
1773+
response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR_500);
1774+
}
1775+
}
1776+
1777+
/**
1778+
* Helper servlet.
1779+
*/
1780+
public static class XmlTimeoutServlet extends HttpServlet {
1781+
1782+
@Override
1783+
protected void doGet(final HttpServletRequest req, final HttpServletResponse response)
1784+
throws ServletException, IOException {
1785+
response.setHeader("Access-Control-Allow-Origin", "*");
1786+
response.setHeader("Access-Control-Allow-Methods", "*");
1787+
response.setHeader("Access-Control-Allow-Headers", "X-PINGOTHER");
1788+
1789+
response.setContentType(MimeType.TEXT_XML);
1790+
response.setContentLength(RETURN_XML.length());
1791+
response.setStatus(HttpStatus.OK_200);
1792+
final ServletOutputStream outputStream = response.getOutputStream();
1793+
try (Writer writer = new OutputStreamWriter(outputStream)) {
1794+
writer.flush();
1795+
Thread.sleep(500);
1796+
writer.write(RETURN_XML);
1797+
}
1798+
catch (final Exception ignored) {
1799+
// ignore
1800+
}
1801+
}
1802+
}
18041803
}

0 commit comments

Comments
 (0)