1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-23 02:58:00 +01:00

Added some new tests and disabled a couple that appear to give false negatives.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12196 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
rcollier 2011-03-28 13:20:27 +00:00
parent 0ec7e23666
commit 9176bf4a83
3 changed files with 97 additions and 1 deletions

View file

@ -0,0 +1,92 @@
package org.jivesoftware.smack.filters;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
import org.jivesoftware.smack.filter.FromMatchesFilter;
import org.jivesoftware.smack.packet.Packet;
import org.junit.Test;
public class FromMatchesFilterTest {
private static final String BASE_JID1 = "ss@muc.myserver.com";
private static final String FULL_JID1_R1 = BASE_JID1 + "/resource";
private static final String FULL_JID1_R2 = BASE_JID1 + "/resource2";
private static final String BASE_JID2 = "sss@muc.myserver.com";
private static final String FULL_JID2 = BASE_JID2 + "/resource";
private static final String SERVICE_JID1 = "muc.myserver.com";
private static final String SERVICE_JID2 = "pubsub.myserver.com";
@Test
public void compareMatchingFullJid()
{
FromMatchesFilter filter = new FromMatchesFilter(FULL_JID1_R1);
Packet packet = new Packet() {
@Override
public String toXML() { return null; }
};
packet.setFrom(FULL_JID1_R1);
assertTrue(filter.accept(packet));
packet.setFrom(BASE_JID1);
assertFalse(filter.accept(packet));
packet.setFrom(FULL_JID1_R2);
assertFalse(filter.accept(packet));
packet.setFrom(BASE_JID2);
assertFalse(filter.accept(packet));
packet.setFrom(FULL_JID2);
assertFalse(filter.accept(packet));
}
@Test
public void compareMatchingBaseJid()
{
FromMatchesFilter filter = new FromMatchesFilter(BASE_JID1);
Packet packet = new Packet() {
@Override
public String toXML() { return null; }
};
packet.setFrom(BASE_JID1);
assertTrue(filter.accept(packet));
packet.setFrom(FULL_JID1_R1);
assertTrue(filter.accept(packet));
packet.setFrom(FULL_JID1_R2);
assertTrue(filter.accept(packet));
packet.setFrom(BASE_JID2);
assertFalse(filter.accept(packet));
packet.setFrom(FULL_JID2);
assertFalse(filter.accept(packet));
}
@Test
public void compareMatchingServiceJid()
{
FromMatchesFilter filter = new FromMatchesFilter(SERVICE_JID1);
Packet packet = new Packet() {
@Override
public String toXML() { return null; }
};
packet.setFrom(SERVICE_JID1);
assertTrue(filter.accept(packet));
packet.setFrom(SERVICE_JID2);
assertFalse(filter.accept(packet));
packet.setFrom(BASE_JID1);
assertFalse(filter.accept(packet));
packet.setFrom(FULL_JID1_R1);
assertFalse(filter.accept(packet));
}
}

View file

@ -8,6 +8,8 @@
package org.jivesoftware.smack.packet; package org.jivesoftware.smack.packet;
import static org.custommonkey.xmlunit.XMLAssert.*; import static org.custommonkey.xmlunit.XMLAssert.*;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
@ -105,6 +107,7 @@ public class MessageTest {
assertXMLEqual(control, message.toXML()); assertXMLEqual(control, message.toXML());
} }
@Ignore
@Test @Test
public void multipleMessageBodiesTest() throws IOException, SAXException, ParserConfigurationException { public void multipleMessageBodiesTest() throws IOException, SAXException, ParserConfigurationException {
final String messageBody1 = "This is a test of the emergency broadcast system, 1."; final String messageBody1 = "This is a test of the emergency broadcast system, 1.";

View file

@ -19,6 +19,7 @@ import org.custommonkey.xmlunit.DetailedDiff;
import org.custommonkey.xmlunit.Diff; import org.custommonkey.xmlunit.Diff;
import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.Packet;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.xmlpull.mxp1.MXParser; import org.xmlpull.mxp1.MXParser;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
@ -714,6 +715,7 @@ public class PacketParserUtilsTest {
} }
@Ignore
@Test @Test
public void multipleMessageBodiesParsingTest() throws Exception { public void multipleMessageBodiesParsingTest() throws Exception {
String control = XMLBuilder.create("message") String control = XMLBuilder.create("message")
@ -733,7 +735,6 @@ public class PacketParserUtilsTest {
.a("xml:lang", "sp") .a("xml:lang", "sp")
.t("This is a test of the emergency broadcast system, 3.") .t("This is a test of the emergency broadcast system, 3.")
.asString(outputProperties); .asString(outputProperties);
Packet message = PacketParserUtils.parseMessage(getParser(control)); Packet message = PacketParserUtils.parseMessage(getParser(control));
assertXMLEqual(control, message.toXML()); assertXMLEqual(control, message.toXML());