Move generated js tests from a servlet to a handler

shs96c · shs96c · commit 620c9a6dfa7f · 2020-11-24T14:44:26.000Z
diff --git a/java/client/test/org/openqa/selenium/environment/webserver/GeneratedJsTestHandler.java b/java/client/test/org/openqa/selenium/environment/webserver/GeneratedJsTestHandler.java
@@ -19,48 +19,64 @@
 
 import com.google.common.base.Strings;
 import com.google.common.net.MediaType;
+import org.openqa.selenium.remote.http.Contents;
+import org.openqa.selenium.remote.http.HttpHandler;
+import org.openqa.selenium.remote.http.HttpRequest;
+import org.openqa.selenium.remote.http.HttpResponse;
 
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+public class GeneratedJsTestHandler implements HttpHandler {
 
-public class GeneratedJsTestServlet extends HttpServlet {
+  private final String stripPrefix;
+
+  public GeneratedJsTestHandler(String stripPrefix) {
+    this.stripPrefix = stripPrefix;
+  }
 
   @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-      throws IOException {
-    String symbol = Strings.nullToEmpty(req.getPathInfo()).replace("../", "").replace("/", "$");
-    byte[] data =
+  public HttpResponse execute(HttpRequest req) throws UncheckedIOException {
+    String path = req.getUri();
+    if (path.startsWith(stripPrefix)) {
+      path = path.substring(stripPrefix.length());
+    }
+    String symbol = path.replace("../", "").replace("/", "$");
+    String data =
         ("<!DOCTYPE html>\n"
          + "<html>\n"
          + "<head>\n"
          + "<meta http-equiv=\"X-UA-Compatible\" content=\"IE-Edge\">\n"
          + "<!-- File generated by " + getClass().getName() + " -->\n"
-         + "<title>" + req.getPathInfo() + "</title>\n"
+         + "<title>" + path + "</title>\n"
          + "<script src=\"/third_party/closure/goog/base.js\"></script>\n"
          + "<script src=\"/javascript/deps.js\"></script>\n"
          + "<script>\n"
          + "  (function() {\n"
-         + "    var path = '../../.." + req.getPathInfo() + "';\n"
+         + "    var path = '../../.." + path + "';\n"
          + "    var loadFlags = goog.dependencies_.loadFlags[path];\n"
          + "    goog.addDependency(path, ['" + symbol + "'],\n"
-         + "        goog.dependencies_.requires['../../.." + req.getPathInfo() + "'] || [],\n"
+         + "        goog.dependencies_.requires['../../.." + path + "'] || [],\n"
          + "        (loadFlags && loadFlags['module'] == 'goog'));\n"
          + "    goog.require('" + symbol + "');\n"
          + "  })()\n"
-         + "</script></head><body></body></html>").getBytes(StandardCharsets.UTF_8);
-
-    resp.setStatus(HttpServletResponse.SC_OK);
-    resp.setContentType(MediaType.HTML_UTF_8.toString());
-    resp.setContentLength(data.length);
-
-    OutputStream stream = resp.getOutputStream();
-    stream.write(data);
-    stream.flush();
-    stream.close();
+         + "</script></head><body></body></html>");
+//
+//    resp.setStatus(HttpServletResponse.SC_OK);
+//    resp.setContentType(MediaType.HTML_UTF_8.toString());
+//    resp.setContentLength(data.length);
+//
+//    OutputStream stream = resp.getOutputStream();
+//    stream.write(data);
+//    stream.flush();
+//    stream.close();
+    return new HttpResponse()
+      .setHeader("Content-Type", MediaType.HTML_UTF_8.toString())
+      .setContent(Contents.utf8String(data));
   }
 }
diff --git a/java/client/test/org/openqa/selenium/environment/webserver/JettyAppServer.java b/java/client/test/org/openqa/selenium/environment/webserver/JettyAppServer.java
@@ -140,7 +140,6 @@ public JettyAppServer(String hostName, int httpPort, int httpsPort) {
     defaultContext.setInitParameter("webSrc", webSrc.toAbsolutePath().toString());
 
     addServlet(defaultContext, "/quitquitquit", KillSwitchServlet.class);
-    addServlet(defaultContext, "/generated/*", GeneratedJsTestServlet.class);
 
     CreatePageHandler createPageHandler = new CreatePageHandler(
       tempPageDir.toPath(),
@@ -154,6 +153,7 @@ public JettyAppServer(String hostName, int httpPort, int httpsPort) {
       Route.get("/basicAuth").to(BasicAuthHandler::new),
       Route.get("/cookie").to(CookieHandler::new),
       Route.get("/encoding").to(EncodingHandler::new),
+      Route.matching(req -> req.getUri().startsWith("/generated/")).to(() -> new GeneratedJsTestHandler("/generated")),
       Route.matching(req -> req.getUri().startsWith("/page/") && req.getMethod() == GET).to(PageHandler::new),
       Route.post("/createPage").to(() -> createPageHandler),
       Route.get("/redirect").to(RedirectHandler::new),
