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 +
"[email protected]'
name='cid:[email protected]' 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 +
"[email protected]'"));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
