commit 01e9408ecbf1a33e9a2401b98f45f1b06ba52633
author Dave Borowitz <dborowitz@google.com> Wed Jul 30 21:05:37 2014 -0700
committer Dave Borowitz <dborowitz@google.com> Wed Jul 30 21:08:14 2014 -0700
tree 55ecf3f9f8966261570c5b23b3866970b0ab8947
parent 32ec5b90f4a02cdefd9af284dbc8f6a7ab5a8456

Use DefaultRenderer in TestGitilesServlet

This uses resources from the classpath for loading Soy template files,
which is appropriate behavior for tests. Unfortunately it does slow
down servlet setup in each test method slightly, as all the templates
need to be parsed. If this becomes an issue we can switch to using a
single servlet per test class.

Change-Id: I4aa2448c7e7d438420e7301f2bcc5e97ef182fa9

gitiles-servlet/src/test/java/com/google/gitiles/TestGitilesServlet.java

diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/TestGitilesServlet.java b/gitiles-servlet/src/test/java/com/google/gitiles/TestGitilesServlet.java
index 0b8512f..b2574a7 100644
--- a/gitiles-servlet/src/test/java/com/google/gitiles/TestGitilesServlet.java
+++ b/gitiles-servlet/src/test/java/com/google/gitiles/TestGitilesServlet.java
@@ -14,13 +14,7 @@
 
 package com.google.gitiles;
 
-import java.util.Collections;
-import java.util.Enumeration;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import com.google.common.collect.ImmutableList;
 
 import org.eclipse.jgit.errors.RepositoryNotFoundException;
 import org.eclipse.jgit.internal.storage.dfs.DfsRepository;
@@ -29,7 +23,14 @@
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.transport.resolver.RepositoryResolver;
 
-import com.google.common.collect.ImmutableList;
+import java.net.URL;
+import java.util.Collections;
+import java.util.Enumeration;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
 
 /** Static utility methods for creating {@link GitilesServlet}s for testing. */
 public class TestGitilesServlet {
@@ -57,8 +58,8 @@
     final String repoName =
         repo.getRepository().getDescription().getRepositoryName();
     GitilesServlet servlet =
-        new GitilesServlet(new Config(), new DebugRenderer(GitilesServlet.STATIC_PREFIX,
-              ImmutableList.<String> of(), null, repoName + " test site"),
+        new GitilesServlet(new Config(), new DefaultRenderer(GitilesServlet.STATIC_PREFIX,
+              ImmutableList.<URL> of(), repoName + " test site"),
             TestGitilesUrls.URLS, new TestGitilesAccess(repo.getRepository()),
             new RepositoryResolver<HttpServletRequest>() {
               @Override