Merge branch '3.4.0' into master

Conflicts:
	source/org/jivesoftware/smack/SmackConfiguration.java

test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java

@@ -57,7 +57,6 @@ public class InBandBytestreamSessionMessageTest {
     String sessionID = "session_id";
 
     int blockSize = 10;
-    int dataSize = blockSize/4 * 3;
 
     // protocol verifier
     Protocol protocol;
@@ -120,7 +119,7 @@ public class InBandBytestreamSessionMessageTest {
         protocol.addResponse(null, incrementingSequence);
         protocol.addResponse(null, incrementingSequence);
 
-        byte[] controlData = new byte[dataSize * 3];
+        byte[] controlData = new byte[blockSize * 3];
 
         OutputStream outputStream = session.getOutputStream();
         outputStream.write(controlData);
@@ -145,7 +144,7 @@ public class InBandBytestreamSessionMessageTest {
         protocol.addResponse(null, incrementingSequence);
         protocol.addResponse(null, incrementingSequence);
 
-        byte[] controlData = new byte[dataSize * 3];
+        byte[] controlData = new byte[blockSize * 3];
 
         OutputStream outputStream = session.getOutputStream();
         for (byte b : controlData) {
@@ -172,11 +171,11 @@ public class InBandBytestreamSessionMessageTest {
         protocol.addResponse(null, incrementingSequence);
         protocol.addResponse(null, incrementingSequence);
 
-        byte[] controlData = new byte[(dataSize * 3) - 2];
+        byte[] controlData = new byte[(blockSize * 3) - 2];
 
         OutputStream outputStream = session.getOutputStream();
         int off = 0;
-        for (int i = 1; off+i <= controlData.length; i++) {
+        for (int i = 1; i <= 7; i++) {
             outputStream.write(controlData, off, i);
             off += i;
         }
@@ -193,7 +192,7 @@ public class InBandBytestreamSessionMessageTest {
      */
     @Test
     public void shouldSendThirtyDataPackets() throws Exception {
-        byte[] controlData = new byte[dataSize * 3];
+        byte[] controlData = new byte[blockSize * 3];
 
         InBandBytestreamSession session = new InBandBytestreamSession(connection, initBytestream,
                         initiatorJID);
@@ -220,7 +219,7 @@ public class InBandBytestreamSessionMessageTest {
      */
     @Test
     public void shouldSendNothingOnSuccessiveCallsToFlush() throws Exception {
-        byte[] controlData = new byte[dataSize * 3];
+        byte[] controlData = new byte[blockSize * 3];
 
         InBandBytestreamSession session = new InBandBytestreamSession(connection, initBytestream,
                         initiatorJID);
@@ -291,7 +290,7 @@ public class InBandBytestreamSessionMessageTest {
     public void shouldReadAllReceivedData1() throws Exception {
         // create random data
         Random rand = new Random();
-        byte[] controlData = new byte[3 * dataSize];
+        byte[] controlData = new byte[3 * blockSize];
         rand.nextBytes(controlData);
 
         // get IBB sessions data packet listener
@@ -301,8 +300,8 @@ public class InBandBytestreamSessionMessageTest {
         PacketListener listener = Whitebox.getInternalState(inputStream, PacketListener.class);
 
         // verify data packet and notify listener
-        for (int i = 0; i < controlData.length / dataSize; i++) {
-            String base64Data = StringUtils.encodeBase64(controlData, i * dataSize, dataSize,
+        for (int i = 0; i < controlData.length / blockSize; i++) {
+            String base64Data = StringUtils.encodeBase64(controlData, i * blockSize, blockSize,
                             false);
             DataPacketExtension dpe = new DataPacketExtension(sessionID, i, base64Data);
             Message dataMessage = new Message();
@@ -310,14 +309,14 @@ public class InBandBytestreamSessionMessageTest {
             listener.processPacket(dataMessage);
         }
 
-        byte[] bytes = new byte[3 * dataSize];
+        byte[] bytes = new byte[3 * blockSize];
         int read = 0;
-        read = inputStream.read(bytes, 0, dataSize);
-        assertEquals(dataSize, read);
-        read = inputStream.read(bytes, dataSize, dataSize);
-        assertEquals(dataSize, read);
-        read = inputStream.read(bytes, dataSize*2, dataSize);
-        assertEquals(dataSize, read);
+        read = inputStream.read(bytes, 0, blockSize);
+        assertEquals(blockSize, read);
+        read = inputStream.read(bytes, 10, blockSize);
+        assertEquals(blockSize, read);
+        read = inputStream.read(bytes, 20, blockSize);
+        assertEquals(blockSize, read);
 
         // verify data
         for (int i = 0; i < bytes.length; i++) {
@@ -337,7 +336,7 @@ public class InBandBytestreamSessionMessageTest {
     public void shouldReadAllReceivedData2() throws Exception {
         // create random data
         Random rand = new Random();
-        byte[] controlData = new byte[3 * dataSize];
+        byte[] controlData = new byte[3 * blockSize];
         rand.nextBytes(controlData);
 
         // get IBB sessions data packet listener
@@ -347,8 +346,8 @@ public class InBandBytestreamSessionMessageTest {
         PacketListener listener = Whitebox.getInternalState(inputStream, PacketListener.class);
 
         // verify data packet and notify listener
-        for (int i = 0; i < controlData.length / dataSize; i++) {
-            String base64Data = StringUtils.encodeBase64(controlData, i * dataSize, dataSize,
+        for (int i = 0; i < controlData.length / blockSize; i++) {
+            String base64Data = StringUtils.encodeBase64(controlData, i * blockSize, blockSize,
                             false);
             DataPacketExtension dpe = new DataPacketExtension(sessionID, i, base64Data);
             Message dataMessage = new Message();
@@ -357,7 +356,7 @@ public class InBandBytestreamSessionMessageTest {
         }
 
         // read data
-        byte[] bytes = new byte[3 * dataSize];
+        byte[] bytes = new byte[3 * blockSize];
         for (int i = 0; i < bytes.length; i++) {
             bytes[i] = (byte) inputStream.read();
         }

test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java

@@ -57,8 +57,7 @@ public class InBandBytestreamSessionTest {
     String xmppServer = "xmpp-server";
     String sessionID = "session_id";
 
-    int blockSize = 20;
-    int dataSize = blockSize/4 * 3;
+    int blockSize = 10;
 
     // protocol verifier
     Protocol protocol;
@@ -120,7 +119,7 @@ public class InBandBytestreamSessionTest {
         protocol.addResponse(resultIQ, incrementingSequence);
         protocol.addResponse(resultIQ, incrementingSequence);
 
-        byte[] controlData = new byte[dataSize * 3];
+        byte[] controlData = new byte[blockSize * 3];
 
         OutputStream outputStream = session.getOutputStream();
         outputStream.write(controlData);
@@ -146,7 +145,7 @@ public class InBandBytestreamSessionTest {
         protocol.addResponse(resultIQ, incrementingSequence);
         protocol.addResponse(resultIQ, incrementingSequence);
 
-        byte[] controlData = new byte[dataSize * 3];
+        byte[] controlData = new byte[blockSize * 3];
 
         OutputStream outputStream = session.getOutputStream();
         for (byte b : controlData) {
@@ -174,11 +173,11 @@ public class InBandBytestreamSessionTest {
         protocol.addResponse(resultIQ, incrementingSequence);
         protocol.addResponse(resultIQ, incrementingSequence);
 
-        byte[] controlData = new byte[(dataSize * 3) - 2];
+        byte[] controlData = new byte[(blockSize * 3) - 2];
 
         OutputStream outputStream = session.getOutputStream();
         int off = 0;
-        for (int i = 1; i+off <= controlData.length; i++) {
+        for (int i = 1; i <= 7; i++) {
             outputStream.write(controlData, off, i);
             off += i;
         }
@@ -195,7 +194,7 @@ public class InBandBytestreamSessionTest {
      */
     @Test
     public void shouldSendThirtyDataPackets() throws Exception {
-        byte[] controlData = new byte[dataSize * 3];
+        byte[] controlData = new byte[blockSize * 3];
 
         InBandBytestreamSession session = new InBandBytestreamSession(connection, initBytestream,
                         initiatorJID);
@@ -223,7 +222,7 @@ public class InBandBytestreamSessionTest {
      */
     @Test
     public void shouldSendNothingOnSuccessiveCallsToFlush() throws Exception {
-        byte[] controlData = new byte[dataSize * 3];
+        byte[] controlData = new byte[blockSize * 3];
 
         InBandBytestreamSession session = new InBandBytestreamSession(connection, initBytestream,
                         initiatorJID);
@@ -254,7 +253,7 @@ public class InBandBytestreamSessionTest {
     public void shouldSendDataCorrectly() throws Exception {
         // create random data
         Random rand = new Random();
-        final byte[] controlData = new byte[256 * dataSize];
+        final byte[] controlData = new byte[256 * blockSize];
         rand.nextBytes(controlData);
 
         // compares the data of each packet with the control data
@@ -264,7 +263,7 @@ public class InBandBytestreamSessionTest {
                 byte[] decodedData = request.getDataPacketExtension().getDecodedData();
                 int seq = (int) request.getDataPacketExtension().getSeq();
                 for (int i = 0; i < decodedData.length; i++) {
-                    assertEquals(controlData[(seq * dataSize) + i], decodedData[i]);
+                    assertEquals(controlData[(seq * blockSize) + i], decodedData[i]);
                 }
             }
 
@@ -272,7 +271,7 @@ public class InBandBytestreamSessionTest {
 
         // set acknowledgments for the data packets
         IQ resultIQ = IBBPacketUtils.createResultIQ(initiatorJID, targetJID);
-        for (int i = 0; i < controlData.length / dataSize; i++) {
+        for (int i = 0; i < controlData.length / blockSize; i++) {
             protocol.addResponse(resultIQ, incrementingSequence, dataVerification);
         }
 
@@ -480,7 +479,7 @@ public class InBandBytestreamSessionTest {
     public void shouldReadAllReceivedData1() throws Exception {
         // create random data
         Random rand = new Random();
-        byte[] controlData = new byte[3 * dataSize];
+        byte[] controlData = new byte[3 * blockSize];
         rand.nextBytes(controlData);
 
         IQ resultIQ = IBBPacketUtils.createResultIQ(initiatorJID, targetJID);
@@ -491,24 +490,24 @@ public class InBandBytestreamSessionTest {
         InputStream inputStream = session.getInputStream();
         PacketListener listener = Whitebox.getInternalState(inputStream, PacketListener.class);
 
-        // set data packet acknowledgement and notify listener
-        for (int i = 0; i < controlData.length / dataSize; i++) {
+        // set data packet acknowledgment and notify listener
+        for (int i = 0; i < controlData.length / blockSize; i++) {
             protocol.addResponse(resultIQ);
-            String base64Data = StringUtils.encodeBase64(controlData, i * dataSize, dataSize,
+            String base64Data = StringUtils.encodeBase64(controlData, i * blockSize, blockSize,
                             false);
             DataPacketExtension dpe = new DataPacketExtension(sessionID, i, base64Data);
             Data data = new Data(dpe);
             listener.processPacket(data);
         }
 
-        byte[] bytes = new byte[3 * dataSize];
+        byte[] bytes = new byte[3 * blockSize];
         int read = 0;
-        read = inputStream.read(bytes, 0, dataSize);
-        assertEquals(dataSize, read);
-        read = inputStream.read(bytes, dataSize, dataSize);
-        assertEquals(dataSize, read);
-        read = inputStream.read(bytes, dataSize*2, dataSize);
-        assertEquals(dataSize, read);
+        read = inputStream.read(bytes, 0, blockSize);
+        assertEquals(blockSize, read);
+        read = inputStream.read(bytes, 10, blockSize);
+        assertEquals(blockSize, read);
+        read = inputStream.read(bytes, 20, blockSize);
+        assertEquals(blockSize, read);
 
         // verify data
         for (int i = 0; i < bytes.length; i++) {
@@ -528,7 +527,7 @@ public class InBandBytestreamSessionTest {
     public void shouldReadAllReceivedData2() throws Exception {
         // create random data
         Random rand = new Random();
-        byte[] controlData = new byte[3 * dataSize];
+        byte[] controlData = new byte[3 * blockSize];
         rand.nextBytes(controlData);
 
         IQ resultIQ = IBBPacketUtils.createResultIQ(initiatorJID, targetJID);
@@ -540,9 +539,9 @@ public class InBandBytestreamSessionTest {
         PacketListener listener = Whitebox.getInternalState(inputStream, PacketListener.class);
 
         // set data packet acknowledgment and notify listener
-        for (int i = 0; i < controlData.length / dataSize; i++) {
+        for (int i = 0; i < controlData.length / blockSize; i++) {
             protocol.addResponse(resultIQ);
-            String base64Data = StringUtils.encodeBase64(controlData, i * dataSize, dataSize,
+            String base64Data = StringUtils.encodeBase64(controlData, i * blockSize, blockSize,
                             false);
             DataPacketExtension dpe = new DataPacketExtension(sessionID, i, base64Data);
             Data data = new Data(dpe);
@@ -550,7 +549,7 @@ public class InBandBytestreamSessionTest {
         }
 
         // read data
-        byte[] bytes = new byte[3 * dataSize];
+        byte[] bytes = new byte[3 * blockSize];
         for (int i = 0; i < bytes.length; i++) {
             bytes[i] = (byte) inputStream.read();
         }

test-unit/org/jivesoftware/smackx/forward/ForwardedTest.java

@@ -0,0 +1,86 @@
+/**
+ * All rights reserved. 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.forward;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Properties;
+import java.util.TimeZone;
+
+import org.jivesoftware.smack.packet.Packet;
+import org.jivesoftware.smack.test.util.TestUtils;
+import org.jivesoftware.smackx.packet.DelayInfo;
+import org.jivesoftware.smackx.packet.DelayInformation;
+import org.jivesoftware.smackx.forward.Forwarded;
+import org.jivesoftware.smackx.forward.provider.ForwardedProvider;
+import org.junit.Test;
+import org.xmlpull.mxp1.MXParser;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import com.jamesmurty.utils.XMLBuilder;
+
+public class ForwardedTest {
+
+    private static Properties outputProperties = new Properties();
+    static {
+        outputProperties.put(javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION, "yes");
+    }
+
+    @Test
+    public void forwardedTest() throws Exception {
+        XmlPullParser parser;
+        String control;
+        Forwarded fwd;
+        
+        control = XMLBuilder.create("forwarded")
+            .a("xmlns", "urn:xmpp:forwarded:0")
+            .e("message")
+                    .a("from", "romeo@montague.com")
+            .asString(outputProperties);
+        
+        parser = TestUtils.getParser(control, "forwarded");
+        fwd = (Forwarded) new ForwardedProvider().parseExtension(parser);
+
+        // no delay in packet
+        assertEquals(null, fwd.getDelayInfo());
+        
+        // check message
+        assertEquals("romeo@montague.com", fwd.getForwardedPacket().getFrom());
+
+        // check end of tag
+        assertEquals(XmlPullParser.END_TAG, parser.getEventType());
+        assertEquals("forwarded", parser.getName());
+
+    }
+
+    @Test(expected=Exception.class)
+    public void forwardedEmptyTest() throws Exception {
+        XmlPullParser parser;
+        String control;
+        
+        control = XMLBuilder.create("forwarded")
+            .a("xmlns", "urn:xmpp:forwarded:0")
+            .asString(outputProperties);
+        
+        parser = TestUtils.getParser(control, "forwarded");
+        new ForwardedProvider().parseExtension(parser);
+    }
+}

test-unit/org/jivesoftware/smackx/ping/PingTest.java

@@ -15,19 +15,21 @@
  */
 package org.jivesoftware.smackx.ping;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import org.jivesoftware.smack.DummyConnection;
-import org.jivesoftware.smack.TestUtils;
 import org.jivesoftware.smack.ThreadedDummyConnection;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.ping.packet.Ping;
+import org.jivesoftware.smack.test.util.TestUtils;
 import org.jivesoftware.smack.util.PacketParserUtils;
 import org.jivesoftware.smackx.packet.DiscoverInfo;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 public class PingTest {
     private DummyConnection dummyCon;
     private ThreadedDummyConnection threadedCon;

test-unit/org/jivesoftware/smackx/provider/ProviderConfigTest.java

@@ -0,0 +1,55 @@
+package org.jivesoftware.smackx.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import junit.framework.Assert;
+
+import org.jivesoftware.smack.packet.IQ;
+import org.jivesoftware.smack.provider.ExtensionProviderInfo;
+import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.provider.IQProviderInfo;
+import org.jivesoftware.smack.provider.ProviderFileLoader;
+import org.jivesoftware.smack.provider.ProviderLoader;
+import org.jivesoftware.smack.provider.ProviderManager;
+import org.jivesoftware.smack.util.FileUtils;
+import org.junit.Test;
+import org.xmlpull.v1.XmlPullParser;
+
+public class ProviderConfigTest {
+    
+    @Test
+    public void addGenericLoaderProvider() {
+        ProviderManager.getInstance().addLoader(new ProviderLoader() {
+            
+            @Override
+            public Collection<IQProviderInfo> getIQProviderInfo() {
+                ArrayList<IQProviderInfo> l = new ArrayList<IQProviderInfo>(1);
+                l.add(new IQProviderInfo("provider", "test:provider",  new TestIQProvider()));
+                return l;
+            }
+            
+            @Override
+            public Collection<ExtensionProviderInfo> getExtensionProviderInfo() {
+                return null;
+            }
+        });
+        
+        Assert.assertNotNull(ProviderManager.getInstance().getIQProvider("provider", "test:provider"));
+    }
+    
+    @Test
+    public void addClasspathFileLoaderProvider() throws Exception{
+        ProviderManager.getInstance().addLoader(new ProviderFileLoader(FileUtils.getStreamForUrl("classpath:org/jivesoftware/smackx/provider/test.providers", null)));
+        Assert.assertNotNull(ProviderManager.getInstance().getIQProvider("provider", "test:file_provider"));
+    }
+
+    public static class TestIQProvider implements IQProvider {
+
+        @Override
+        public IQ parseIQ(XmlPullParser parser) throws Exception {
+            return null;
+        }
+        
+    }
+}

test-unit/org/jivesoftware/smackx/provider/test.providers

@@ -0,0 +1,11 @@
+<?xml version="1.0"?> 
+<!-- Providers file for default Smack extensions -->
+<smackProviders> 
+    
+    <iqProvider>
+        <elementName>provider</elementName>
+        <namespace>test:file_provider</namespace>
+        <className>org.jivesoftware.smackx.provider.ProviderConfigTest$TestIQProvider</className>
+    </iqProvider>
+
+</smackProviders>

test-unit/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java

@@ -22,7 +22,7 @@ package org.jivesoftware.smackx.pubsub;
 import static org.junit.Assert.assertEquals;
 
 import org.jivesoftware.smack.SmackConfiguration;
-import org.jivesoftware.smack.ThreadedDummyConnection;
+import org.jivesoftware.smack.ThreadedDummyConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.PacketExtension;

test-unit/org/jivesoftware/smackx/pubsub/ItemValidationTest.java

@@ -26,10 +26,10 @@ import static org.junit.Assert.assertTrue;
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.jivesoftware.smack.TestUtils;
 import org.jivesoftware.smack.ThreadedDummyConnection;
 import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.packet.PacketExtension;
+import org.jivesoftware.smack.test.util.TestUtils;
 import org.jivesoftware.smack.util.PacketParserUtils;
 import org.jivesoftware.smackx.pubsub.packet.PubSubNamespace;
 import org.jivesoftware.smackx.pubsub.provider.ItemsProvider;