vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-12-12 22:11:07 +01:00
Code Issues Releases Wiki Activity

Remove xmlunit-lagacy and add xmlunit-assertj

Browse source
This commit is contained in:
Florian Schmaus 2019-05-07 18:51:52 +02:00
parent 95dbf5bb36
commit e1ed035beb
27 changed files with 163 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

4
smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotCreateTest.java
View file

@ -16,7 +16,7 @@
*/
package org.jivesoftware.smackx.httpfileupload;
import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
@ -44,6 +44,6 @@ public class SlotCreateTest {
assertEquals(new URL("https://download.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/my_juliet.png"),
slot.getGetUrl());
assertXMLEqual(testSlot, slot.getChildElementXML().toString());
assertXmlSimilar(testSlot, slot.getChildElementXML().toString());
}
}

6
smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotRequestCreateTest.java
View file

@ -16,7 +16,7 @@
*/
package org.jivesoftware.smackx.httpfileupload;
import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
@ -51,7 +51,7 @@ public class SlotRequestCreateTest {
assertEquals(23456, slotRequest.getSize());
assertEquals("image/jpeg", slotRequest.getContentType());
assertXMLEqual(testRequest, slotRequest.getChildElementXML().toString());
assertXmlSimilar(testRequest, slotRequest.getChildElementXML().toString());
}
@Test
@ -62,7 +62,7 @@ public class SlotRequestCreateTest {
assertEquals(52523, slotRequest.getSize());
assertEquals(null, slotRequest.getContentType());
assertXMLEqual(testRequestWithoutContentType, slotRequest.getChildElementXML().toString());
assertXmlSimilar(testRequestWithoutContentType, slotRequest.getChildElementXML().toString());
}
@Test

8
smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProviderTest.java
View file

@ -16,7 +16,7 @@
*/
package org.jivesoftware.smackx.httpfileupload.provider;
import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.net.MalformedURLException;
@ -69,7 +69,7 @@ public class SlotProviderTest {
checkUrls(slot);
assertXMLEqual(SLOT_IQ, slot.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
assertXmlSimilar(SLOT_IQ, slot.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
}
private static final String SLOT_V0_2_IQ =
@ -90,7 +90,7 @@ public class SlotProviderTest {
checkUrls(slot);
String slotXml = slot.toXML(StreamOpen.CLIENT_NAMESPACE).toString();
assertXMLEqual(SLOT_V0_2_IQ, slotXml);
assertXmlSimilar(SLOT_V0_2_IQ, slotXml);
}
private static final String SLOT_WITH_HEADERS_IQ =
@ -114,7 +114,7 @@ public class SlotProviderTest {
checkUrls(slot);
String slotXml = slot.toXML(StreamOpen.CLIENT_NAMESPACE).toString();
assertXMLEqual(SLOT_WITH_HEADERS_IQ, slotXml);
assertXmlSimilar(SLOT_WITH_HEADERS_IQ, slotXml);
}
private static void checkUrls(Slot slot) {