diff --git a/test/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java b/test/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java index 9fb993126..db6bf10dd 100644 --- a/test/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java +++ b/test/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java @@ -52,11 +52,16 @@ package org.jivesoftware.smackx.packet; -import java.util.*; +import java.util.Iterator; -import org.jivesoftware.smack.*; -import org.jivesoftware.smack.filter.*; -import org.jivesoftware.smack.packet.*; +import org.jivesoftware.smack.Chat; +import org.jivesoftware.smack.PacketCollector; +import org.jivesoftware.smack.PacketListener; +import org.jivesoftware.smack.filter.PacketExtensionFilter; +import org.jivesoftware.smack.filter.PacketFilter; +import org.jivesoftware.smack.filter.ThreadFilter; +import org.jivesoftware.smack.packet.Message; +import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.test.SmackTestCase; /** @@ -70,7 +75,7 @@ public class XHTMLExtensionTest extends SmackTestCase { private int bodiesReceived; public XHTMLExtensionTest(String name) { - super(name); + super(name); } /** @@ -79,27 +84,27 @@ public class XHTMLExtensionTest extends SmackTestCase { * 1. User_1 will send a message with formatted text (XHTML) to user_2 */ public void testSendSimpleXHTMLMessage() { - // User1 creates a chat with user2 - Chat chat1 = getConnection(0).getChatManager().createChat(getBareJID(1), null); + // User1 creates a chat with user2 + Chat chat1 = getConnection(0).getChatManager().createChat(getBareJID(1), null); - // User1 creates a message to send to user2 - Message msg = new Message(); - msg.setSubject("Any subject you want"); - msg.setBody("Hey John, this is my new green!!!!"); - // Create a XHTMLExtension Package and add it to the message - XHTMLExtension xhtmlExtension = new XHTMLExtension(); - xhtmlExtension.addBody( - "

Hey John, this is my new green!!!!

"); - msg.addExtension(xhtmlExtension); + // User1 creates a message to send to user2 + Message msg = new Message(); + msg.setSubject("Any subject you want"); + msg.setBody("Hey John, this is my new green!!!!"); + // Create a XHTMLExtension Package and add it to the message + XHTMLExtension xhtmlExtension = new XHTMLExtension(); + xhtmlExtension.addBody( + "

Hey John, this is my new green!!!!

"); + msg.addExtension(xhtmlExtension); - // User1 sends the message that contains the XHTML to user2 - try { - chat1.sendMessage(msg); - Thread.sleep(200); - } - catch (Exception e) { - fail("An error occured sending the message with XHTML"); - } + // User1 sends the message that contains the XHTML to user2 + try { + chat1.sendMessage(msg); + Thread.sleep(200); + } + catch (Exception e) { + fail("An error occured sending the message with XHTML"); + } } /** @@ -111,48 +116,48 @@ public class XHTMLExtensionTest extends SmackTestCase { * something is wrong */ public void testSendSimpleXHTMLMessageAndDisplayReceivedXHTMLMessage() { - // Create a chat for each connection - Chat chat1 = getConnection(0).getChatManager().createChat(getBareJID(1), null); - final PacketCollector chat2 = getConnection(1).createPacketCollector( - new ThreadFilter(chat1.getThreadID())); + // Create a chat for each connection + Chat chat1 = getConnection(0).getChatManager().createChat(getBareJID(1), null); + final PacketCollector chat2 = getConnection(1).createPacketCollector( + new ThreadFilter(chat1.getThreadID())); - // User1 creates a message to send to user2 - Message msg = new Message(); - msg.setSubject("Any subject you want"); - msg.setBody("Hey John, this is my new green!!!!"); - // Create a XHTMLExtension Package and add it to the message - XHTMLExtension xhtmlExtension = new XHTMLExtension(); - xhtmlExtension.addBody( - "

Hey John, this is my new green!!!!

"); - msg.addExtension(xhtmlExtension); + // User1 creates a message to send to user2 + Message msg = new Message(); + msg.setSubject("Any subject you want"); + msg.setBody("Hey John, this is my new green!!!!"); + // Create a XHTMLExtension Package and add it to the message + XHTMLExtension xhtmlExtension = new XHTMLExtension(); + xhtmlExtension.addBody( + "

Hey John, this is my new green!!!!

"); + msg.addExtension(xhtmlExtension); - // User1 sends the message that contains the XHTML to user2 - try { - chat1.sendMessage(msg); - } - catch (Exception e) { - fail("An error occured sending the message with XHTML"); - } - Packet packet = chat2.nextResult(2000); - Message message = (Message) packet; - assertNotNull("Body is null", message.getBody()); - try { - xhtmlExtension = - (XHTMLExtension) message.getExtension( - "html", - "http://jabber.org/protocol/xhtml-im"); - assertNotNull( - "Message without extension \"http://jabber.org/protocol/xhtml-im\"", - xhtmlExtension); - assertTrue("Message without XHTML bodies", xhtmlExtension.getBodiesCount() > 0); - for (Iterator it = xhtmlExtension.getBodies(); it.hasNext();) { - String body = (String) it.next(); - System.out.println(body); - } - } - catch (ClassCastException e) { - fail("ClassCastException - Most probable cause is that smack providers is misconfigured"); - } + // User1 sends the message that contains the XHTML to user2 + try { + chat1.sendMessage(msg); + } + catch (Exception e) { + fail("An error occured sending the message with XHTML"); + } + Packet packet = chat2.nextResult(2000); + Message message = (Message) packet; + assertNotNull("Body is null", message.getBody()); + try { + xhtmlExtension = + (XHTMLExtension) message.getExtension( + "html", + "http://jabber.org/protocol/xhtml-im"); + assertNotNull( + "Message without extension \"http://jabber.org/protocol/xhtml-im\"", + xhtmlExtension); + assertTrue("Message without XHTML bodies", xhtmlExtension.getBodiesCount() > 0); + for (Iterator it = xhtmlExtension.getBodies(); it.hasNext();) { + String body = (String) it.next(); + System.out.println(body); + } + } + catch (ClassCastException e) { + fail("ClassCastException - Most probable cause is that smack providers is misconfigured"); + } } /** @@ -164,77 +169,79 @@ public class XHTMLExtensionTest extends SmackTestCase { * something is wrong */ public void testSendComplexXHTMLMessageAndDisplayReceivedXHTMLMessage() { - // Create a chat for each connection - Chat chat1 = getConnection(0).getChatManager().createChat(getBareJID(1), null); - final PacketCollector chat2 = getConnection(1).createPacketCollector( - new ThreadFilter(chat1.getThreadID())); + // Create a chat for each connection + Chat chat1 = getConnection(0).getChatManager().createChat(getBareJID(1), null); + final PacketCollector chat2 = getConnection(1).createPacketCollector( + new ThreadFilter(chat1.getThreadID())); - // Create a Listener that listens for Messages with the extension - //"http://jabber.org/protocol/xhtml-im" - // This listener will listen on the conn2 and answer an ACK if everything is ok - PacketFilter packetFilter = - new PacketExtensionFilter("html", "http://jabber.org/protocol/xhtml-im"); - PacketListener packetListener = new PacketListener() { - public void processPacket(Packet packet) { + // Create a Listener that listens for Messages with the extension + //"http://jabber.org/protocol/xhtml-im" + // This listener will listen on the conn2 and answer an ACK if everything is ok + PacketFilter packetFilter = + new PacketExtensionFilter("html", "http://jabber.org/protocol/xhtml-im"); + PacketListener packetListener = new PacketListener() { + @Override + public void processPacket(Packet packet) { - } - }; - getConnection(1).addPacketListener(packetListener, packetFilter); + } + }; + getConnection(1).addPacketListener(packetListener, packetFilter); - // User1 creates a message to send to user2 - Message msg = new Message(); - msg.setSubject("Any subject you want"); - msg.setBody( - "awesome! As Emerson once said: A foolish consistency is the hobgoblin of little minds."); - // Create an XHTMLExtension and add it to the message - XHTMLExtension xhtmlExtension = new XHTMLExtension(); - xhtmlExtension.addBody( - "

impresionante!

Como Emerson dijo una vez:

Una consistencia ridícula es el espantajo de mentes pequeñas.

"); - xhtmlExtension.addBody( - "

awesome!

As Emerson once said:

A foolish consistency is the hobgoblin of little minds.

"); - msg.addExtension(xhtmlExtension); + // User1 creates a message to send to user2 + Message msg = new Message(); + msg.setSubject("Any subject you want"); + msg.setBody( + "awesome! As Emerson once said: A foolish consistency is the hobgoblin of little minds."); + // Create an XHTMLExtension and add it to the message + XHTMLExtension xhtmlExtension = new XHTMLExtension(); + xhtmlExtension.addBody( + "

impresionante!

Como Emerson dijo una vez:

Una consistencia ridicula es el espantajo de mentes pequenas.

"); + xhtmlExtension.addBody( + "

awesome!

As Emerson once said:

A foolish consistency is the hobgoblin of little minds.

"); + msg.addExtension(xhtmlExtension); - // User1 sends the message that contains the XHTML to user2 - try { - bodiesSent = xhtmlExtension.getBodiesCount(); - bodiesReceived = 0; - chat1.sendMessage(msg); - } - catch (Exception e) { - fail("An error occured sending the message with XHTML"); - } - Packet packet = chat2.nextResult(2000); - int received = 0; - Message message = (Message) packet; - assertNotNull("Body is null", message.getBody()); - try { - xhtmlExtension = - (XHTMLExtension) message.getExtension( - "html", - "http://jabber.org/protocol/xhtml-im"); - assertNotNull( - "Message without extension \"http://jabber.org/protocol/xhtml-im\"", - xhtmlExtension); - assertTrue("Message without XHTML bodies", xhtmlExtension.getBodiesCount() > 0); - for (Iterator it = xhtmlExtension.getBodies(); it.hasNext();) { - received++; - System.out.println((String) it.next()); - } - bodiesReceived = received; - } - catch (ClassCastException e) { - fail("ClassCastException - Most probable cause is that smack providers is " + - "misconfigured"); - } - // Wait half second so that the complete test can run - assertEquals( - "Number of sent and received XHTMP bodies does not match", - bodiesSent, - bodiesReceived); + // User1 sends the message that contains the XHTML to user2 + try { + bodiesSent = xhtmlExtension.getBodiesCount(); + bodiesReceived = 0; + chat1.sendMessage(msg); + } + catch (Exception e) { + fail("An error occured sending the message with XHTML"); + } + Packet packet = chat2.nextResult(2000); + int received = 0; + Message message = (Message) packet; + assertNotNull("Body is null", message.getBody()); + try { + xhtmlExtension = + (XHTMLExtension) message.getExtension( + "html", + "http://jabber.org/protocol/xhtml-im"); + assertNotNull( + "Message without extension \"http://jabber.org/protocol/xhtml-im\"", + xhtmlExtension); + assertTrue("Message without XHTML bodies", xhtmlExtension.getBodiesCount() > 0); + for (Iterator it = xhtmlExtension.getBodies(); it.hasNext();) { + received++; + System.out.println((String) it.next()); + } + bodiesReceived = received; + } + catch (ClassCastException e) { + fail("ClassCastException - Most probable cause is that smack providers is " + + "misconfigured"); + } + // Wait half second so that the complete test can run + assertEquals( + "Number of sent and received XHTMP bodies does not match", + bodiesSent, + bodiesReceived); } + @Override protected int getMaxConnections() { - return 2; + return 2; } }