From 4d617393dc2b0895bf60eee82f9832ffaa1020bb Mon Sep 17 00:00:00 2001 From: Benoit Pradelle Date: Mon, 4 Feb 2008 15:33:02 +0000 Subject: [PATCH] Fix some problems with message encoding --- .../TestOperationSetBasicInstantMessaging.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetBasicInstantMessaging.java b/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetBasicInstantMessaging.java index c2665caa5..1a6d138cf 100644 --- a/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetBasicInstantMessaging.java +++ b/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetBasicInstantMessaging.java @@ -8,6 +8,7 @@ import java.net.*; import java.util.*; +import java.io.*; import junit.framework.*; import net.java.sip.communicator.service.protocol.*; @@ -416,11 +417,20 @@ public void testCreateMessage2() body.getBytes(), contentType, encoding, subject); assertEquals("message body", body, msg.getContent()); - assertTrue("message body bytes" - , Arrays.equals(body.getBytes(), msg.getRawData())); - assertEquals("message length", body.length(), msg.getSize()); - assertEquals("message content type", contentType, msg.getContentType()); assertEquals("message encoding", encoding, msg.getEncoding()); + try { + assertTrue("message body bytes" + , Arrays.equals(body.getBytes(encoding), msg.getRawData())); + assertEquals("message length", body.getBytes(encoding).length, + msg.getSize()); + } catch (UnsupportedEncodingException e) { + logger.warn("The current content encoding isn't supported", e); + assertTrue("message body bytes" + , Arrays.equals(body.getBytes(), msg.getRawData())); + assertEquals("message length", body.getBytes().length, + msg.getSize()); + } + assertEquals("message content type", contentType, msg.getContentType()); assertNotNull("message uid", msg.getMessageUID()); //a further test on message uid.