zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-26 04:28:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add filter support to the test server

Browse source 
The lack of ObjectifyFilter means that in any tests using
RegistryTestServer the Objectify session cache persists
between "requests" in the same test method. This is wrong
but had not caused any failures because we didn't assert
anything that mattered. However, a CL I'm working on
asserts that there is a creationTime on a created resource,
which is set automatically on Datastore save, and therefore
is still null in the session cache's version of the resource
if you don't clear it before the next command. Fixing it here
separately from that CL.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=141939330
This commit is contained in:
cgoldfeder 2016-12-13 14:22:48 -08:00 • committed by Ben McIlwain
parent c281f54def
commit 5b9219fbdd
4 changed files with 29 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
javatests/google/registry/server/TestServer.java
View file

@ -31,8 +31,10 @@ import java.util.concurrent.FutureTask;
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.TimeUnit;
import javax.annotation.Nullable;
import javax.servlet.Filter;
import javax.servlet.http.HttpServlet;
import org.mortbay.jetty.Connector;
import org.mortbay.jetty.Handler;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.bio.SocketConnector;
import org.mortbay.jetty.servlet.Context;
@ -80,10 +82,14 @@ public final class TestServer {
* @param runfiles map of server paths to local directories or files, to be served statically
* @param routes list of servlet endpoints
*/
public TestServer(HostAndPort address, Map<String, Path> runfiles, Iterable<Route> routes) {
public TestServer(
HostAndPort address,
Map<String, Path> runfiles,
Iterable<Route> routes,
Iterable<Class<? extends Filter>> filters) {
urlAddress = createUrlAddress(address);
server.addConnector(createConnector(address));
server.addHandler(createHandler(runfiles, routes));
server.addHandler(createHandler(runfiles, routes, filters));
}
/** Starts the HTTP server in a new thread and returns once it's online. */
@ -143,7 +149,10 @@ public final class TestServer {
}
}
private Context createHandler(Map<String, Path> runfiles, Iterable<Route> routes) {
private Context createHandler(
Map<String, Path> runfiles,
Iterable<Route> routes,
Iterable<Class<? extends Filter>> filters) {
Context context = new Context(server, CONTEXT_PATH, Context.SESSIONS);
context.addServlet(new ServletHolder(HealthzServlet.class), "/healthz");
for (Map.Entry<String, Path> runfile : runfiles.entrySet()) {
@ -154,6 +163,9 @@ public final class TestServer {
for (Route route : routes) {
context.addServlet(new ServletHolder(wrapServlet(route.servletClass())), route.path());
}
for (Class<? extends Filter> filter : filters) {
context.addFilter(filter, "/*", Handler.REQUEST);
}
ServletHolder holder = new ServletHolder(DefaultServlet.class);
holder.setInitParameter("aliases", "1");
context.addServlet(holder, "/*");