commit 389580ebb81c34e2a687623f625ece1437618fd4
author Dongxu <dongxu@apache.org> Thu Sep 12 05:03:12 2013 +0000
committer Dongxu <dongxu@apache.org> Thu Sep 12 05:03:12 2013 +0000
tree 31929f0dde99a05e83a7a5ed700a7f4ef6ee6135
parent d012ea8eb1aeb9ee53fea891b8fa9b9af8deabcf

Fix tests

git-svn-id: https://svn.apache.org/repos/asf/james/hupa/trunk@1522436 13f79535-47bb-0310-9956-ffa450edef68

server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java

diff --git a/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java b/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java
index 30cf2e6..7f10738 100644
--- a/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java
+++ b/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java
@@ -80,10 +80,14 @@
         assertNotSame(msg, res);
         assertEquals("...\n...<img   \n   src='" + 
 <<<<<<< HEAD
+<<<<<<< HEAD
                 SConsts.HUPA + SConsts.SERVLET_DOWNLOAD + "?mode=inline&" 
 =======
                 SConsts.HUPA + SConsts.SERVLET_DOWNLOAD + "?" 
 >>>>>>> re-add server unit tests
+=======
+                SConsts.HUPA + SConsts.SERVLET_DOWNLOAD + "?mode=inline&" 
+>>>>>>> Fix tests
                 + SConsts.PARAM_FOLDER + "=aFolder&" 
                 + SConsts.PARAM_UID + "=9999&"
                 + SConsts.PARAM_NAME + "=1.1934304663@web28309.mail.ukl.yahoo.com' name='cid:1.1934304663@web28309.mail.ukl.yahoo.com' width=200\n....", res);
@@ -198,10 +202,14 @@
         // inline images have to be downloaded from the server
         assertTrue(details.getText().contains("img src=\'" + 
 <<<<<<< HEAD
+<<<<<<< HEAD
                 SConsts.HUPA + SConsts.SERVLET_DOWNLOAD + "?mode=inline&" +
 =======
                 SConsts.HUPA + SConsts.SERVLET_DOWNLOAD + "?" +
 >>>>>>> re-add server unit tests
+=======
+                SConsts.HUPA + SConsts.SERVLET_DOWNLOAD + "?mode=inline&" +
+>>>>>>> Fix tests
                 SConsts.PARAM_FOLDER + "=WHATEVER&" + 
                 SConsts.PARAM_UID + "=0&" + 
                 SConsts.PARAM_NAME + "=1.1934304663@web28309.mail.ukl.yahoo.com'"));