From 18c2c37ad064e51671583885e9c3126d7a5c29ca Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Sun, 14 Jun 2020 16:53:21 +0200 Subject: [PATCH] Rename XmlUnitUtils to XmlAssertUtil --- .../org/jivesoftware/smack/compress/packet/FailureTest.java | 2 +- .../java/org/jivesoftware/smack/packet/MessageTest.java | 2 +- .../java/org/jivesoftware/smack/packet/PresenceTest.java | 2 +- .../org/jivesoftware/smack/provider/SaslProviderTest.java | 2 +- .../org/jivesoftware/smack/util/PacketParserUtilsTest.java | 4 ++-- .../org/jivesoftware/smack/util/XmlStringBuilderTest.java | 6 +++--- .../test/util/{XmlUnitUtils.java => XmlAssertUtil.java} | 5 ++--- .../jivesoftware/smackx/httpfileupload/SlotCreateTest.java | 2 +- .../smackx/httpfileupload/SlotRequestCreateTest.java | 2 +- .../smackx/httpfileupload/provider/SlotProviderTest.java | 2 +- .../org/jivesoftware/smackx/mam/RetrieveFormFieldsTest.java | 2 +- .../message_fastening/MessageFasteningElementsTest.java | 2 +- .../smackx/message_markup/MessageMarkupTest.java | 2 +- .../message_retraction/element/RetractElementTest.java | 2 +- .../message_retraction/element/RetractedElementTest.java | 2 +- .../org/jivesoftware/smackx/reference/ReferenceTest.java | 2 +- .../jivesoftware/smackx/sid/StableUniqueStanzaIdTest.java | 2 +- .../java/org/jivesoftware/smackx/spoiler/SpoilerTest.java | 2 +- .../jivesoftware/smackx/attention/AttentionElementTest.java | 2 +- .../smackx/bytestreams/ibb/packet/CloseTest.java | 2 +- .../bytestreams/ibb/packet/DataPacketExtensionTest.java | 2 +- .../smackx/bytestreams/ibb/packet/DataTest.java | 2 +- .../smackx/bytestreams/ibb/packet/OpenTest.java | 2 +- .../org/jivesoftware/smackx/last_interaction/IdleTest.java | 2 +- .../jivesoftware/smackx/mood/MoodConcretisationTest.java | 2 +- .../java/org/jivesoftware/smackx/mood/MoodElementTest.java | 2 +- .../test/java/org/jivesoftware/smackx/nick/NickTest.java | 2 +- .../smackx/pubsub/AffiliationsExtensionTest.java | 2 +- .../org/jivesoftware/smackx/pubsub/ItemValidationTest.java | 2 +- .../smackx/softwareinfo/SoftwareInfoFormTest.java | 2 +- .../jivesoftware/smackx/usertune/UserTuneElementTest.java | 2 +- .../java/org/jivesoftware/smackx/xdata/FormFieldTest.java | 2 +- .../java/org/jivesoftware/smackx/ox/OpenPgpElementTest.java | 2 +- .../java/org/jivesoftware/smackx/ox/PubkeyElementTest.java | 2 +- .../jivesoftware/smackx/ox/PublicKeysListElementTest.java | 2 +- .../org/jivesoftware/smackx/ox/SecretkeyElementTest.java | 2 +- 36 files changed, 40 insertions(+), 41 deletions(-) rename smack-core/src/testFixtures/java/org/jivesoftware/smack/test/util/{XmlUnitUtils.java => XmlAssertUtil.java} (94%) diff --git a/smack-core/src/test/java/org/jivesoftware/smack/compress/packet/FailureTest.java b/smack-core/src/test/java/org/jivesoftware/smack/compress/packet/FailureTest.java index cbc5ba88f..9e7ab3b1f 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/compress/packet/FailureTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/compress/packet/FailureTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smack.compress.packet; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import java.io.IOException; diff --git a/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java b/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java index 68d8535fa..4c45be4fe 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smack.packet; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/smack-core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java b/smack-core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java index 863e4b0ff..19bee63ec 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smack.packet; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/smack-core/src/test/java/org/jivesoftware/smack/provider/SaslProviderTest.java b/smack-core/src/test/java/org/jivesoftware/smack/provider/SaslProviderTest.java index 9252625ed..944a0503a 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/provider/SaslProviderTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/provider/SaslProviderTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smack.provider; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import java.io.IOException; diff --git a/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java b/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java index f775a4fcc..3ac5215d5 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java @@ -16,8 +16,8 @@ */ package org.jivesoftware.smack.util; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlNotSimilar; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlNotSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; diff --git a/smack-core/src/test/java/org/jivesoftware/smack/util/XmlStringBuilderTest.java b/smack-core/src/test/java/org/jivesoftware/smack/util/XmlStringBuilderTest.java index 8436a4dd2..425bdf9b3 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/util/XmlStringBuilderTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/util/XmlStringBuilderTest.java @@ -18,7 +18,7 @@ package org.jivesoftware.smack.util; import org.jivesoftware.smack.packet.StandardExtensionElement; import org.jivesoftware.smack.packet.XmlEnvironment; -import org.jivesoftware.smack.test.util.XmlUnitUtils; +import org.jivesoftware.smack.test.util.XmlAssertUtil; import org.junit.jupiter.api.Test; @@ -38,10 +38,10 @@ public class XmlStringBuilderTest { String expectedXml = ""; XmlStringBuilder actualXml = outer.toXML(XmlEnvironment.EMPTY); - XmlUnitUtils.assertXmlSimilar(expectedXml, actualXml); + XmlAssertUtil.assertXmlSimilar(expectedXml, actualXml); StringBuilder actualXmlTwo = actualXml.toXML(XmlEnvironment.EMPTY); - XmlUnitUtils.assertXmlSimilar(expectedXml, actualXmlTwo); + XmlAssertUtil.assertXmlSimilar(expectedXml, actualXmlTwo); } } diff --git a/smack-core/src/testFixtures/java/org/jivesoftware/smack/test/util/XmlUnitUtils.java b/smack-core/src/testFixtures/java/org/jivesoftware/smack/test/util/XmlAssertUtil.java similarity index 94% rename from smack-core/src/testFixtures/java/org/jivesoftware/smack/test/util/XmlUnitUtils.java rename to smack-core/src/testFixtures/java/org/jivesoftware/smack/test/util/XmlAssertUtil.java index 3d9b5ba0f..185bf4eea 100644 --- a/smack-core/src/testFixtures/java/org/jivesoftware/smack/test/util/XmlUnitUtils.java +++ b/smack-core/src/testFixtures/java/org/jivesoftware/smack/test/util/XmlAssertUtil.java @@ -1,6 +1,6 @@ /** * - * Copyright 2014-2019 Florian Schmaus + * Copyright 2014-2020 Florian Schmaus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,8 +26,7 @@ import org.xmlunit.diff.DefaultNodeMatcher; import org.xmlunit.diff.ElementSelectors; import org.xmlunit.input.NormalizedSource; -// TODO: Rename this class to XmlAssertUtil -public class XmlUnitUtils { +public class XmlAssertUtil { public static void assertXmlNotSimilar(CharSequence xmlOne, CharSequence xmlTwo) { normalizedCompare(xmlOne, xmlTwo).areNotSimilar(); diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotCreateTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotCreateTest.java index 3dc287098..26d940e39 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotCreateTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotCreateTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.httpfileupload; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotRequestCreateTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotRequestCreateTest.java index e30a60c99..3bf92210e 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotRequestCreateTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotRequestCreateTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.httpfileupload; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProviderTest.java index 17c85f32d..9aa9699d9 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProviderTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProviderTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.httpfileupload.provider; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.MalformedURLException; diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/RetrieveFormFieldsTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/RetrieveFormFieldsTest.java index 87000a6e8..f973fa719 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/RetrieveFormFieldsTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/RetrieveFormFieldsTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.mam; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertEquals; import org.jivesoftware.smack.packet.StreamOpen; diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/message_fastening/MessageFasteningElementsTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/message_fastening/MessageFasteningElementsTest.java index 7a36752da..8230f974a 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/message_fastening/MessageFasteningElementsTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/message_fastening/MessageFasteningElementsTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.message_fastening; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/message_markup/MessageMarkupTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/message_markup/MessageMarkupTest.java index 42275642c..63937453e 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/message_markup/MessageMarkupTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/message_markup/MessageMarkupTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.message_markup; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/message_retraction/element/RetractElementTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/message_retraction/element/RetractElementTest.java index 3cb8491de..1278caed4 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/message_retraction/element/RetractElementTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/message_retraction/element/RetractElementTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.message_retraction.element; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.IOException; diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/message_retraction/element/RetractedElementTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/message_retraction/element/RetractedElementTest.java index 20dcbd650..ba5acea49 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/message_retraction/element/RetractedElementTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/message_retraction/element/RetractedElementTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.message_retraction.element; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.IOException; diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/reference/ReferenceTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/reference/ReferenceTest.java index 84106e0a6..462c80acc 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/reference/ReferenceTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/reference/ReferenceTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.reference; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/sid/StableUniqueStanzaIdTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/sid/StableUniqueStanzaIdTest.java index a95e5caac..a4ccdc6ce 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/sid/StableUniqueStanzaIdTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/sid/StableUniqueStanzaIdTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.sid; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/spoiler/SpoilerTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/spoiler/SpoilerTest.java index 165c4be40..5a96059c7 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/spoiler/SpoilerTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/spoiler/SpoilerTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.spoiler; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/attention/AttentionElementTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/attention/AttentionElementTest.java index dd01b7331..755ca3ba0 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/attention/AttentionElementTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/attention/AttentionElementTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.attention; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import org.jivesoftware.smackx.attention.packet.AttentionExtension; diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java index 8fbb488fc..07dd9920e 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.bytestreams.ibb.packet; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java index 3042ae07a..beab45d02 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.bytestreams.ibb.packet; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java index aa24c043d..2e0a0cacf 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.bytestreams.ibb.packet; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.mock; diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java index 8206efbf2..d28cd617f 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.bytestreams.ibb.packet; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/last_interaction/IdleTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/last_interaction/IdleTest.java index 3a6da6b49..bf8c6ae27 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/last_interaction/IdleTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/last_interaction/IdleTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.last_interaction; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodConcretisationTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodConcretisationTest.java index 4ad647e29..f05bec4a2 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodConcretisationTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodConcretisationTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.mood; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodElementTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodElementTest.java index 31d937be8..c1cb72fd5 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodElementTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodElementTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.mood; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickTest.java index 61c7b70eb..f4379e034 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.nick; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/AffiliationsExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/AffiliationsExtensionTest.java index c584ca73c..8c1706091 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/AffiliationsExtensionTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/AffiliationsExtensionTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.pubsub; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import java.io.IOException; import java.util.ArrayList; diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java index 9dafb5334..8ed23eed8 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.pubsub; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/softwareinfo/SoftwareInfoFormTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/softwareinfo/SoftwareInfoFormTest.java index 48613cd02..ffeed72aa 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/softwareinfo/SoftwareInfoFormTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/softwareinfo/SoftwareInfoFormTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.softwareinfo; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/usertune/UserTuneElementTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/usertune/UserTuneElementTest.java index b9bdb1189..59c912eaf 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/usertune/UserTuneElementTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/usertune/UserTuneElementTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.usertune; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import java.io.IOException; import java.net.URI; diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/FormFieldTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/FormFieldTest.java index 214c67e29..67cd5dd89 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/FormFieldTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/FormFieldTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.xdata; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import org.junit.jupiter.api.Test; import org.jxmpp.jid.JidTestUtil; diff --git a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/OpenPgpElementTest.java b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/OpenPgpElementTest.java index 2d8d55419..143580531 100644 --- a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/OpenPgpElementTest.java +++ b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/OpenPgpElementTest.java @@ -18,7 +18,7 @@ package org.jivesoftware.smackx.ox; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertThrows; import java.io.IOException; diff --git a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PubkeyElementTest.java b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PubkeyElementTest.java index a67d4870d..46e053891 100644 --- a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PubkeyElementTest.java +++ b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PubkeyElementTest.java @@ -17,7 +17,7 @@ package org.jivesoftware.smackx.ox; import static junit.framework.TestCase.assertEquals; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import java.io.IOException; import java.text.ParseException; diff --git a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PublicKeysListElementTest.java b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PublicKeysListElementTest.java index 54f2f98cc..f90015b9f 100644 --- a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PublicKeysListElementTest.java +++ b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PublicKeysListElementTest.java @@ -17,7 +17,7 @@ package org.jivesoftware.smackx.ox; import static junit.framework.TestCase.assertEquals; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import java.util.Date; diff --git a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/SecretkeyElementTest.java b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/SecretkeyElementTest.java index 56902d75f..b9745bb20 100644 --- a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/SecretkeyElementTest.java +++ b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/SecretkeyElementTest.java @@ -17,7 +17,7 @@ package org.jivesoftware.smackx.ox; import static junit.framework.TestCase.assertTrue; -import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; +import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import java.nio.charset.Charset; import java.util.Arrays;