Author: manolo
Date: Thu May 10 08:06:01 2012
New Revision: 1336525
URL: http://svn.apache.org/viewvc?rev=1336525&view=rev
Log:
fix tests
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java?rev=1336525&r1=1336524&r2=1336525&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/utils/MessageUtils.java
Thu May 10 08:06:01 2012
@@ -191,7 +191,6 @@ public class MessageUtils {
} catch (UnsupportedEncodingException e) {
System.out.println(e.getMessage());
}
- System.out.println(s + " " + ret);
ret = ret
// Remove quotes around names in email addresses
.replaceFirst("^[<\"' ]+([^\"<>]*)[>\"' ]+<", "$1 <");
Modified:
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java?rev=1336525&r1=1336524&r2=1336525&view=diff
==============================================================================
---
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java
(original)
+++
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/utils/MessageUtilsTest.java
Thu May 10 08:06:01 2012
@@ -58,7 +58,7 @@ public class MessageUtilsTest extends Hu
}
public void testGetRecipients () throws Exception {
- String encodedEmail = "=?ISO-8859-1?Q?Manolo=20Pe=F1a?=
<[email protected]>";
+ String encodedEmail = "=?ISO-8859-1?Q?Manolo_Pe=F1a?=
<[email protected]>";
String decodedEmail = MessageUtils.decodeText(encodedEmail);
assertFalse(encodedEmail.equals(decodedEmail));
Modified:
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java?rev=1336525&r1=1336524&r2=1336525&view=diff
==============================================================================
---
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
(original)
+++
james/hupa/trunk/shared/src/main/java/org/apache/hupa/shared/rpc/ContactsResult.java
Thu May 10 08:06:01 2012
@@ -34,12 +34,16 @@ public class ContactsResult implements R
}
public Contact(String address) {
- mail = address.replaceAll("^.*<([^>]+)>", "$1");
+ mail = address.replaceAll("^.*<([^>]+)>\\s*$", "$1");
realname = mail.equals(address) ? mail : address
- .replaceAll("<.+$", "")
- .replaceAll("^[\\s\"']+", "")
- .replaceAll("[\\s\"']+$", "");
+ // remove the email part
+ .replaceAll("<[^<>]+>\\s*$", "")
+ // remove start symbols in the name
+ .replaceAll("^[\\s\"'<]+", "")
+ // remove end symbols in the name
+ .replaceAll("[\\s\"'>]+$", "")
+ ;
if (realname.isEmpty())
realname = mail;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
