test: remove InitExtensions

And replace it with SmackTestSuite.

smack-experimental/src/main/java/org/jivesoftware/smackx/mam/MamManager.java

@@ -49,6 +49,7 @@ import org.jivesoftware.smackx.commands.RemoteCommand;
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 import org.jivesoftware.smackx.disco.packet.DiscoverItems;
 import org.jivesoftware.smackx.forward.packet.Forwarded;
+import org.jivesoftware.smackx.mam.MamManager.MamQueryArgs;
 import org.jivesoftware.smackx.mam.element.MamElements;
 import org.jivesoftware.smackx.mam.element.MamElements.MamResultExtension;
 import org.jivesoftware.smackx.mam.element.MamFinIQ;

smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamTest.java

@@ -21,13 +21,13 @@ import java.lang.reflect.Method;
 
 import org.jivesoftware.smack.DummyConnection;
 import org.jivesoftware.smack.XMPPConnection;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.xdata.packet.DataForm;
 
 import org.junit.jupiter.api.BeforeAll;
 
-public class MamTest extends InitExtensions {
+public class MamTest extends SmackTestSuite {
 
     protected static XMPPConnection connection;
     protected static String queryId;

smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java

@@ -23,9 +23,9 @@ import static org.mockito.Mockito.verify;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.StanzaError;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.Whitebox;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.bytestreams.ibb.packet.Close;
 
 import org.junit.jupiter.api.Test;
@@ -38,7 +38,7 @@ import org.mockito.ArgumentCaptor;
  *
  * @author Henning Staib
  */
-public class CloseListenerTest extends InitExtensions {
+public class CloseListenerTest extends SmackTestSuite {
 
     private static final Jid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
     private static final Jid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;

smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java

@@ -23,9 +23,9 @@ import static org.mockito.Mockito.verify;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.StanzaError;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.Whitebox;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.bytestreams.ibb.packet.Data;
 import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension;
 
@@ -39,7 +39,7 @@ import org.mockito.ArgumentCaptor;
  *
  * @author Henning Staib
  */
-public class DataListenerTest extends InitExtensions {
+public class DataListenerTest extends SmackTestSuite {
 
     private static final Jid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
     private static final Jid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;

smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManagerTest.java

@@ -29,8 +29,8 @@ import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.XMPPException.XMPPErrorException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.StanzaError;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaType;
 import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
 
@@ -47,7 +47,7 @@ import org.jxmpp.jid.JidTestUtil;
  *
  * @author Henning Staib
  */
-public class InBandBytestreamManagerTest extends InitExtensions {
+public class InBandBytestreamManagerTest extends SmackTestSuite {
 
     // settings
     private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;

smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java

@@ -25,8 +25,8 @@ import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.StanzaError;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -40,7 +40,7 @@ import org.mockito.ArgumentCaptor;
  *
  * @author Henning Staib
  */
-public class InBandBytestreamRequestTest extends InitExtensions {
+public class InBandBytestreamRequestTest extends SmackTestSuite {
 
     private static final Jid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
     private static final Jid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;

smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java

@@ -32,10 +32,10 @@ import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.StanzaBuilder;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.Whitebox;
 import org.jivesoftware.smack.util.stringencoder.Base64;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaType;
 import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension;
 import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
@@ -55,7 +55,7 @@ import org.jxmpp.jid.JidTestUtil;
  *
  * @author Henning Staib
  */
-public class InBandBytestreamSessionMessageTest extends InitExtensions {
+public class InBandBytestreamSessionMessageTest extends SmackTestSuite {
 
     // settings
     private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;

smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java

@@ -31,10 +31,10 @@ import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.StanzaError;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.Whitebox;
 import org.jivesoftware.smack.util.stringencoder.Base64;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.bytestreams.ibb.packet.Data;
 import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension;
 import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
@@ -55,7 +55,7 @@ import org.jxmpp.jid.JidTestUtil;
  *
  * @author Henning Staib
  */
-public class InBandBytestreamSessionTest extends InitExtensions {
+public class InBandBytestreamSessionTest extends SmackTestSuite {
 
     // settings
     private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;

smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java

@@ -24,9 +24,9 @@ import static org.mockito.Mockito.verify;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.StanzaError;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.Whitebox;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.bytestreams.BytestreamRequest;
 import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
 
@@ -42,7 +42,7 @@ import org.mockito.ArgumentCaptor;
  *
  * @author Henning Staib
  */
-public class InitiationListenerTest extends InitExtensions {
+public class InitiationListenerTest extends SmackTestSuite {
 
     private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
     private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;

smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java

@@ -24,8 +24,7 @@ import java.util.Properties;
 
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.StreamOpen;
-
+import org.jivesoftware.smack.test.util.SmackTestSuite;
-import org.jivesoftware.smackx.InitExtensions;
 
 import com.jamesmurty.utils.XMLBuilder;
 import org.junit.jupiter.api.Test;
@@ -36,7 +35,7 @@ import org.jxmpp.jid.impl.JidCreate;
  *
  * @author Henning Staib
  */
-public class CloseTest extends InitExtensions {
+public class CloseTest extends SmackTestSuite {
 
     @Test
     public void shouldNotInstantiateWithInvalidArguments1() {

smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java

@@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import java.nio.charset.StandardCharsets;
 import java.util.Properties;
 
-import org.jivesoftware.smackx.InitExtensions;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 
 import com.jamesmurty.utils.XMLBuilder;
 import org.junit.jupiter.api.Test;
@@ -34,7 +34,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Henning Staib
  */
-public class DataPacketExtensionTest extends InitExtensions {
+public class DataPacketExtensionTest extends SmackTestSuite {
 
     @Test
     public void shouldNotInstantiateWithInvalidArgument1() {

smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java

@@ -25,10 +25,9 @@ import java.util.Properties;
 
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.StreamOpen;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.util.stringencoder.Base64;
 
-import org.jivesoftware.smackx.InitExtensions;
-
 import com.jamesmurty.utils.XMLBuilder;
 import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.impl.JidCreate;
@@ -38,7 +37,7 @@ import org.jxmpp.jid.impl.JidCreate;
  *
  * @author Henning Staib
  */
-public class DataTest extends InitExtensions {
+public class DataTest extends SmackTestSuite {
 
     @Test
     public void shouldNotInstantiateWithInvalidArgument() {

smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java

@@ -24,8 +24,8 @@ import java.util.Properties;
 
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.StreamOpen;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaType;
 
 import com.jamesmurty.utils.XMLBuilder;
@@ -37,7 +37,7 @@ import org.jxmpp.jid.impl.JidCreate;
  *
  * @author Henning Staib
  */
-public class OpenTest extends InitExtensions {
+public class OpenTest extends SmackTestSuite {
 
     @Test
     public void shouldNotInstantiateWithInvalidArguments1() {

smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java

@@ -20,10 +20,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Properties;
 
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.util.PacketParserUtils;
 import org.jivesoftware.smack.xml.XmlPullParser;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaType;
 import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
 
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test;
  *
  * @author Henning Staib
  */
-public class OpenIQProviderTest extends InitExtensions {
+public class OpenIQProviderTest extends SmackTestSuite {
 
     private static final Properties outputProperties = new Properties();
     {

smack-extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java

@@ -26,11 +26,11 @@ import java.util.Collection;
 import java.util.LinkedList;
 
 import org.jivesoftware.smack.packet.IQ;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.stringencoder.Base32;
 import org.jivesoftware.smack.util.stringencoder.StringEncoder;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.caps.cache.EntityCapsPersistentCache;
 import org.jivesoftware.smackx.caps.cache.SimpleDirectoryPersistentCache;
 import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
@@ -43,7 +43,7 @@ import org.jxmpp.jid.impl.JidCreate;
 import org.jxmpp.stringprep.XmppStringprepException;
 
 
-public class EntityCapsManagerTest extends InitExtensions {
+public class EntityCapsManagerTest extends SmackTestSuite {
 
     /**
      * <a href="http://xmpp.org/extensions/xep-0115.html#ver-gen-complex">XEP-

smack-extensions/src/test/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProviderTest.java

@@ -18,15 +18,15 @@ package org.jivesoftware.smackx.caps.provider;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.SmackTestUtil;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.caps.packet.CapsExtension;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 
-public class CapsExtensionProviderTest extends InitExtensions {
+public class CapsExtensionProviderTest extends SmackTestSuite {
 
     @ParameterizedTest
     @EnumSource(SmackTestUtil.XmlPullParserKind.class)

smack-extensions/src/test/java/org/jivesoftware/smackx/delay/provider/DelayInformationTest.java

@@ -31,11 +31,11 @@ import java.util.TimeZone;
 import javax.xml.parsers.FactoryConfigurationError;
 
 import org.jivesoftware.smack.packet.Presence;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.util.PacketParserUtils;
 import org.jivesoftware.smack.xml.XmlPullParser;
 import org.jivesoftware.smack.xml.XmlPullParserException;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.delay.DelayInformationManager;
 import org.jivesoftware.smackx.delay.packet.DelayInformation;
 
@@ -43,7 +43,7 @@ import com.jamesmurty.utils.XMLBuilder;
 import org.junit.jupiter.api.Test;
 import org.jxmpp.util.XmppDateTime;
 
-public class DelayInformationTest extends InitExtensions {
+public class DelayInformationTest extends SmackTestSuite {
 
     private static final Calendar calendar = new GregorianCalendar(2002, 9 - 1, 10, 23, 8, 25);
     private static Properties outputProperties = new Properties();

smack-extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java

@@ -21,8 +21,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.jivesoftware.smack.DummyConnection;
 import org.jivesoftware.smack.SmackException.NoResponseException;
 import org.jivesoftware.smack.packet.Stanza;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 
 import org.junit.jupiter.api.AfterEach;
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.JidTestUtil;
 
-public class FileTransferNegotiatorTest extends InitExtensions {
+public class FileTransferNegotiatorTest extends SmackTestSuite {
     private DummyConnection connection;
 
     @BeforeEach

smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/packet/GeoLocationTest.java

@@ -24,9 +24,9 @@ import java.util.Calendar;
 import java.util.TimeZone;
 
 import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.util.PacketParserUtils;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.time.packet.Time;
 
 import org.junit.jupiter.api.Test;
@@ -37,7 +37,7 @@ import org.jxmpp.util.XmppDateTime;
  *
  * @author Ishan Khanna
  */
-public class GeoLocationTest extends InitExtensions {
+public class GeoLocationTest extends SmackTestSuite {
 
     @Test
     public void negativeTimezoneTest() {

smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/provider/GeoLocationProviderTest.java

@@ -23,15 +23,15 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 import java.net.URI;
 
 import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.util.PacketParserUtils;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.geoloc.packet.GeoLocation;
 
 import org.junit.jupiter.api.Test;
 import org.jxmpp.util.XmppDateTime;
 
-public class GeoLocationProviderTest extends InitExtensions {
+public class GeoLocationProviderTest extends SmackTestSuite {
 
     @Test
     public void testGeoLocationProviderWithNoDatumSet() throws Exception {

smack-extensions/src/test/java/org/jivesoftware/smackx/iqlast/LastActivityTest.java

@@ -22,15 +22,15 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.jivesoftware.smack.DummyConnection;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Stanza;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.util.PacketParserUtils;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.iqlast.packet.LastActivity;
 
 import com.jamesmurty.utils.XMLBuilder;
 import org.junit.jupiter.api.Test;
 
-public class LastActivityTest extends InitExtensions {
+public class LastActivityTest extends SmackTestSuite {
 
     @Test
     public void checkProvider() throws Exception {

smack-extensions/src/test/java/org/jivesoftware/smackx/iqversion/VersionTest.java

@@ -24,14 +24,14 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.jivesoftware.smack.DummyConnection;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Stanza;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.util.PacketParserUtils;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.iqversion.packet.Version;
 
 import org.junit.jupiter.api.Test;
 
-public class VersionTest extends InitExtensions {
+public class VersionTest extends SmackTestSuite {
     @Test
     public void checkProvider() throws Exception {
         // @formatter:off

smack-extensions/src/test/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesExtensionTest.java

@@ -20,16 +20,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.util.PacketParserUtils;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.jiveproperties.packet.JivePropertiesExtension;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class JivePropertiesExtensionTest extends InitExtensions {
+public class JivePropertiesExtensionTest extends SmackTestSuite {
 
     @BeforeEach
     public void setUp() {

smack-extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java

@@ -33,14 +33,14 @@ import org.jivesoftware.smack.ThreadedDummyConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Stanza;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.util.PacketParserUtils;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.ping.packet.Ping;
 
 import org.junit.jupiter.api.Test;
 
-public class PingTest extends InitExtensions {
+public class PingTest extends SmackTestSuite {
 
     @Test
     public void checkProvider() throws Exception {

smack-extensions/src/test/java/org/jivesoftware/smackx/privacy/provider/PrivacyProviderTest.java

@@ -23,15 +23,15 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.List;
 
 import org.jivesoftware.smack.packet.IQ;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.util.PacketParserUtils;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.privacy.packet.Privacy;
 import org.jivesoftware.smackx.privacy.packet.PrivacyItem;
 
 import org.junit.jupiter.api.Test;
 
-public class PrivacyProviderTest extends InitExtensions {
+public class PrivacyProviderTest extends SmackTestSuite {
 
     @Test
     public void parsePrivacyList() throws Exception {

smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java

@@ -31,8 +31,8 @@ import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.IQ.Type;
 import org.jivesoftware.smack.packet.StanzaError;
 import org.jivesoftware.smack.packet.StanzaError.Condition;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
 import org.jivesoftware.smackx.disco.packet.DiscoverInfo.Identity;
 import org.jivesoftware.smackx.disco.packet.DiscoverInfoBuilder;
@@ -46,7 +46,7 @@ import org.junit.jupiter.api.Test;
  * @author Robin Collier
  *
  */
-public class ConfigureFormTest extends InitExtensions {
+public class ConfigureFormTest extends SmackTestSuite {
     @Test
     public void checkChildrenAssocPolicy() {
         ConfigureForm form = new ConfigureForm(DataForm.Type.submit);

smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java

@@ -24,10 +24,10 @@ import org.jivesoftware.smack.ThreadedDummyConnection;
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.NamedElement;
 import org.jivesoftware.smack.packet.Stanza;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.util.PacketParserUtils;
 import org.jivesoftware.smack.xml.XmlPullParser;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.pubsub.packet.PubSubNamespace;
 
 import org.junit.jupiter.api.AfterEach;
@@ -39,7 +39,7 @@ import org.junit.jupiter.api.Test;
  * @author Robin Collier
  *
  */
-public class ItemValidationTest extends InitExtensions {
+public class ItemValidationTest extends SmackTestSuite {
     private ThreadedDummyConnection connection;
 
     @BeforeEach

smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java

@@ -30,18 +30,18 @@ import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.MessageBuilder;
 import org.jivesoftware.smack.packet.Stanza;
 import org.jivesoftware.smack.packet.StanzaBuilder;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.WaitForPacketListener;
 import org.jivesoftware.smack.util.PacketParserUtils;
 import org.jivesoftware.smack.xml.XmlPullParser;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.receipts.DeliveryReceiptManager.AutoReceiptMode;
 
 import com.jamesmurty.utils.XMLBuilder;
 import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.Jid;
 
-public class DeliveryReceiptTest extends InitExtensions {
+public class DeliveryReceiptTest extends SmackTestSuite {
 
     private static Properties outputProperties = new Properties();
     static {

smack-extensions/src/test/java/org/jivesoftware/smackx/rsm/provider/RSMSetProviderTest.java

@@ -20,14 +20,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.jivesoftware.smack.packet.IQ;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.util.PacketParserUtils;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.rsm.packet.RSMSet;
 
 import org.junit.jupiter.api.Test;
 
-public class RSMSetProviderTest extends InitExtensions {
+public class RSMSetProviderTest extends SmackTestSuite {
 
     @Test
     public void testRsmSetProvider() throws Exception {

smack-extensions/src/test/java/org/jivesoftware/smackx/time/packet/TimeTest.java

@@ -22,11 +22,11 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
 
-import org.jivesoftware.smackx.InitExtensions;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 
 import org.junit.jupiter.api.Test;
 
-public class TimeTest extends InitExtensions {
+public class TimeTest extends SmackTestSuite {
 
     @Test
     public void parseCurrentTimeTest() {

smack-extensions/src/test/java/org/jivesoftware/smackx/vcardtemp/VCardTest.java

@@ -21,15 +21,15 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Arrays;
 
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.util.PacketParserUtils;
 import org.jivesoftware.smack.util.stringencoder.Base64;
 
-import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.vcardtemp.packet.VCard;
 
 import org.junit.jupiter.api.Test;
 
-public class VCardTest extends InitExtensions {
+public class VCardTest extends SmackTestSuite {
 
     @Test
     public void testParseFullVCardIQStanza() throws Throwable {

smack-extensions/src/testFixtures/java/org/jivesoftware/smackx/InitExtensions.java

@@ -1,28 +0,0 @@
-/**
- *
- * Copyright 2014 Florian Schmaus
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jivesoftware.smackx;
-
-import org.jivesoftware.smack.extensions.ExtensionsInitializer;
-import org.jivesoftware.smack.test.util.SmackTestSuite;
-
-public class InitExtensions extends SmackTestSuite {
-
-    static {
-        new ExtensionsInitializer().initialize();
-    }
-
-}