commit 3e8299c1df211e8268fd5978bb82c2d073f80810
author Dave Borowitz <dborowitz@google.com> Tue Jul 29 18:04:40 2014 -0700
committer Dave Borowitz <dborowitz@google.com> Wed Jul 30 21:08:14 2014 -0700
tree 2aaa6ed81aad9cd92dc1b80a72833d81779d4d67
parent 01e9408ecbf1a33e9a2401b98f45f1b06ba52633

Add simple test for diff HTML output

Change-Id: Ia2e11f99751fd0e238f046f4b13069ccc4a7d692

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

diff --git a/gitiles-servlet/src/test/java/com/google/gitiles/DiffServletTest.java b/gitiles-servlet/src/test/java/com/google/gitiles/DiffServletTest.java
index 92a52ce..3cf8e1c 100644
--- a/gitiles-servlet/src/test/java/com/google/gitiles/DiffServletTest.java
+++ b/gitiles-servlet/src/test/java/com/google/gitiles/DiffServletTest.java
@@ -17,6 +17,7 @@
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.BaseEncoding;
@@ -49,7 +50,27 @@
   }
 
   @Test
-  public void diffFileNoParents() throws Exception {
+  public void diffFileOneParentHtml() throws Exception {
+    String contents1 = "foo\n";
+    String contents2 = "foo\ncontents\n";
+    RevCommit c1 = repo.update("master", repo.commit().add("foo", contents1));
+    RevCommit c2 = repo.update("master", repo.commit().parent(c1).add("foo", contents2));
+
+    FakeHttpServletRequest req = FakeHttpServletRequest.newRequest();
+    req.setPathInfo("/test/+diff/" + c2.name() + "^!/foo");
+    FakeHttpServletResponse res = new FakeHttpServletResponse();
+    servlet.service(req, res);
+
+    String diffHeader = String.format(
+        "diff --git <a href=\"/b/test/+/%s/foo\">a/foo</a> <a href=\"/b/test/+/%s/foo\">b/foo</a>",
+        c1.name(), c2.name());
+    String actual = res.getActualBodyString();
+    assertTrue(String.format("Expected diff body to contain [%s]:\n%s", diffHeader, actual),
+        actual.indexOf(diffHeader) >= 0);
+  }
+
+  @Test
+  public void diffFileNoParentsText() throws Exception {
     String contents = "foo\ncontents\n";
     RevCommit c = repo.update("master", repo.commit().add("foo", contents));
 
@@ -72,7 +93,7 @@
   }
 
   @Test
-  public void diffFileOneParent() throws Exception {
+  public void diffFileOneParentText() throws Exception {
     String contents1 = "foo\n";
     String contents2 = "foo\ncontents\n";
     RevCommit c1 = repo.update("master", repo.commit().add("foo", contents1));
@@ -97,7 +118,7 @@
   }
 
   @Test
-  public void diffDirectory() throws Exception {
+  public void diffDirectoryText() throws Exception {
     String contents = "contents\n";
     RevCommit c = repo.update("master", repo.commit()
         .add("dir/foo", contents)