svn commit: r1522436 - /james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java

[dongxu]

Author: dongxu
Date: Thu Sep 12 05:03:12 2013
New Revision: 1522436

URL: http://svn.apache.org/r1522436
Log:
Fix tests

Modified:
    
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java

Modified: 
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java
URL: 
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java?rev=1522436&r1=1522435&r2=1522436&view=diff
==============================================================================
--- 
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java
 (original)
+++ 
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/service/GetMessageDetailServiceTest.java
 Thu Sep 12 05:03:12 2013
@@ -80,10 +80,14 @@ public class GetMessageDetailServiceTest
         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.1934304...@web28309.mail.ukl.yahoo.com' 
name='cid:1.1934304663@web28309.mail.ukl.yahoo.com' width=200\n....", res);
@@ -198,10 +202,14 @@ public class GetMessageDetailServiceTest
         // 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.1934304...@web28309.mail.ukl.yahoo.com'"));



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org