Skip to content

Commit 4fb4129

Browse files
committed
Fix tomcat11 tests
1 parent 13753c1 commit 4fb4129

File tree

2 files changed

+24
-26
lines changed

2 files changed

+24
-26
lines changed

dd-smoke-tests/rum/tomcat-11/src/main/java/com/example/HtmlServlet.java

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,20 @@
99
public class HtmlServlet extends HttpServlet {
1010
@Override
1111
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
12+
final PrintWriter writer = resp.getWriter();
1213
resp.setContentType("text/html;charset=UTF-8");
13-
try (final PrintWriter writer = resp.getWriter()) {
14-
writer.write(
15-
"<!DOCTYPE html>"
16-
+ "<html lang=\"en\">"
17-
+ "<head>"
18-
+ " <meta charset=\"UTF-8\">"
19-
+ " <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">"
20-
+ " <title>Hello Servlet</title>"
21-
+ "</head>"
22-
+ "<body>"
23-
+ " <h1>Hello from Tomcat 9 Servlet!</h1>"
24-
+ " <p>This is a demo HTML page served by Java servlet.</p>"
25-
+ "</body>"
26-
+ "</html>");
27-
}
14+
writer.write(
15+
"<!DOCTYPE html>"
16+
+ "<html lang=\"en\">"
17+
+ "<head>"
18+
+ " <meta charset=\"UTF-8\">"
19+
+ " <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">"
20+
+ " <title>Hello Servlet</title>"
21+
+ "</head>"
22+
+ "<body>"
23+
+ " <h1>Hello from Tomcat 9 Servlet!</h1>"
24+
+ " <p>This is a demo HTML page served by Java servlet.</p>"
25+
+ "</body>"
26+
+ "</html>");
2827
}
2928
}

dd-smoke-tests/rum/tomcat-11/src/main/java/com/example/XmlServlet.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,16 @@
99
public class XmlServlet extends HttpServlet {
1010
@Override
1111
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
12+
final PrintWriter out = resp.getWriter();
1213
resp.setContentType("application/xml;charset=UTF-8");
13-
try (PrintWriter out = resp.getWriter()) {
14-
out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
15-
out.println("<response>");
16-
out.println(" <status>success</status>");
17-
out.println(" <message>RUM injection test</message>");
18-
out.println(" <data>");
19-
out.println(" <item id=\"1\">Test Item 1</item>");
20-
out.println(" <item id=\"2\">Test Item 2</item>");
21-
out.println(" </data>");
22-
out.println("</response>");
23-
}
14+
out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
15+
out.println("<response>");
16+
out.println(" <status>success</status>");
17+
out.println(" <message>RUM injection test</message>");
18+
out.println(" <data>");
19+
out.println(" <item id=\"1\">Test Item 1</item>");
20+
out.println(" <item id=\"2\">Test Item 2</item>");
21+
out.println(" </data>");
22+
out.print("</response>");
2423
}
2524
}

0 commit comments

Comments
 (0)