mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2024-11-27 00:32:07 +01:00
SMACK-277: Update XMLUnit for unit tests to the latest stable release 1.2
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@11232 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
parent
87b3f805c7
commit
7d4389c544
4 changed files with 18 additions and 14 deletions
|
@ -1,5 +1,5 @@
|
||||||
jar | version
|
jar | version
|
||||||
----------------------------------------
|
----------------------------------------
|
||||||
xmlunit | 1.1beta1
|
xmlunit | 1.2
|
||||||
jstun | 0.7.2
|
jstun | 0.7.2
|
||||||
xpp | 1.1.4c
|
xpp | 1.1.4c
|
||||||
|
|
Binary file not shown.
|
@ -8,21 +8,23 @@
|
||||||
package org.jivesoftware.smack.packet;
|
package org.jivesoftware.smack.packet;
|
||||||
|
|
||||||
import static org.custommonkey.xmlunit.XMLAssert.*;
|
import static org.custommonkey.xmlunit.XMLAssert.*;
|
||||||
import org.xml.sax.SAXException;
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
import org.xml.sax.SAXException;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import javax.xml.parsers.ParserConfigurationException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class MessageTest {
|
public class MessageTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void setMessageTypeTest() throws IOException, SAXException {
|
public void setMessageTypeTest() throws IOException, SAXException, ParserConfigurationException {
|
||||||
Message.Type type = Message.Type.chat;
|
Message.Type type = Message.Type.chat;
|
||||||
Message.Type type2 = Message.Type.headline;
|
Message.Type type2 = Message.Type.headline;
|
||||||
|
|
||||||
|
@ -66,7 +68,7 @@ public class MessageTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void setMessageSubjectTest() throws IOException, SAXException {
|
public void setMessageSubjectTest() throws IOException, SAXException, ParserConfigurationException {
|
||||||
final String messageSubject = "This is a test of the emergency broadcast system.";
|
final String messageSubject = "This is a test of the emergency broadcast system.";
|
||||||
|
|
||||||
StringBuilder controlBuilder = new StringBuilder();
|
StringBuilder controlBuilder = new StringBuilder();
|
||||||
|
@ -85,7 +87,7 @@ public class MessageTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void oneMessageBodyTest() throws IOException, SAXException {
|
public void oneMessageBodyTest() throws IOException, SAXException, ParserConfigurationException {
|
||||||
final String messageBody = "This is a test of the emergency broadcast system.";
|
final String messageBody = "This is a test of the emergency broadcast system.";
|
||||||
|
|
||||||
StringBuilder controlBuilder = new StringBuilder();
|
StringBuilder controlBuilder = new StringBuilder();
|
||||||
|
@ -104,7 +106,7 @@ public class MessageTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void multipleMessageBodiesTest() throws IOException, SAXException {
|
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.";
|
||||||
final String lang2 = "ru";
|
final String lang2 = "ru";
|
||||||
final String messageBody2 = "This is a test of the emergency broadcast system, 2.";
|
final String messageBody2 = "This is a test of the emergency broadcast system, 2.";
|
||||||
|
@ -162,7 +164,7 @@ public class MessageTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void setMessageThreadTest() throws IOException, SAXException {
|
public void setMessageThreadTest() throws IOException, SAXException, ParserConfigurationException {
|
||||||
final String messageThread = "1234";
|
final String messageThread = "1234";
|
||||||
|
|
||||||
StringBuilder controlBuilder = new StringBuilder();
|
StringBuilder controlBuilder = new StringBuilder();
|
||||||
|
@ -181,7 +183,7 @@ public class MessageTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void messageXmlLangTest() throws IOException, SAXException {
|
public void messageXmlLangTest() throws IOException, SAXException, ParserConfigurationException {
|
||||||
final String lang = "sp";
|
final String lang = "sp";
|
||||||
|
|
||||||
StringBuilder controlBuilder = new StringBuilder();
|
StringBuilder controlBuilder = new StringBuilder();
|
||||||
|
|
|
@ -15,12 +15,14 @@ import static junit.framework.Assert.assertEquals;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
|
import javax.xml.parsers.ParserConfigurationException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class PresenceTest {
|
public class PresenceTest {
|
||||||
@Test
|
@Test
|
||||||
public void setPresenceTypeTest() throws IOException, SAXException {
|
public void setPresenceTypeTest() throws IOException, SAXException, ParserConfigurationException {
|
||||||
Presence.Type type = Presence.Type.unavailable;
|
Presence.Type type = Presence.Type.unavailable;
|
||||||
Presence.Type type2 = Presence.Type.subscribe;
|
Presence.Type type2 = Presence.Type.subscribe;
|
||||||
|
|
||||||
|
@ -67,7 +69,7 @@ public class PresenceTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void setPresenceStatusTest() throws IOException, SAXException {
|
public void setPresenceStatusTest() throws IOException, SAXException, ParserConfigurationException {
|
||||||
final String status = "This is a test of the emergency broadcast system.";
|
final String status = "This is a test of the emergency broadcast system.";
|
||||||
|
|
||||||
StringBuilder controlBuilder = new StringBuilder();
|
StringBuilder controlBuilder = new StringBuilder();
|
||||||
|
@ -86,7 +88,7 @@ public class PresenceTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void setPresencePriorityTest() throws IOException, SAXException {
|
public void setPresencePriorityTest() throws IOException, SAXException, ParserConfigurationException {
|
||||||
final int priority = 10;
|
final int priority = 10;
|
||||||
|
|
||||||
StringBuilder controlBuilder = new StringBuilder();
|
StringBuilder controlBuilder = new StringBuilder();
|
||||||
|
@ -110,7 +112,7 @@ public class PresenceTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void setPresenceModeTest() throws IOException, SAXException {
|
public void setPresenceModeTest() throws IOException, SAXException, ParserConfigurationException {
|
||||||
Presence.Mode mode1 = Presence.Mode.dnd;
|
Presence.Mode mode1 = Presence.Mode.dnd;
|
||||||
final int priority = 10;
|
final int priority = 10;
|
||||||
final String status = "This is a test of the emergency broadcast system.";
|
final String status = "This is a test of the emergency broadcast system.";
|
||||||
|
@ -161,7 +163,7 @@ public class PresenceTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void presenceXmlLangTest() throws IOException, SAXException {
|
public void presenceXmlLangTest() throws IOException, SAXException, ParserConfigurationException {
|
||||||
final String lang = "sp";
|
final String lang = "sp";
|
||||||
|
|
||||||
StringBuilder controlBuilder = new StringBuilder();
|
StringBuilder controlBuilder = new StringBuilder();
|
||||||
|
|
Loading…
Reference in a new issue