mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-09-27 10:09:32 +02:00
6980c8e63d
this is the first stop towards fixing "SMACK-65: parsing should look for depth", by providing the initial parsing depth to the provider. Some methods (.e.g parseMessage) now use the depth as abort condition, instead of a unclean String equals check. parseIQ() and parseExtension() where both renamed to parse. This also restricts the Exceptions thrown by the parse method, to just XmlPullParserException, IOException and SmackException (not really a big victory, but nevertheless a slight improvement). StreamFeatureProvider is now gone, we simply use PacketExtensionProvider for stream features.
90 lines
2.9 KiB
Java
90 lines
2.9 KiB
Java
/**
|
|
*
|
|
* Copyright the original author or authors
|
|
*
|
|
* 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.bytestreams.ibb.provider;
|
|
|
|
import static org.junit.Assert.assertEquals;
|
|
|
|
import java.io.IOException;
|
|
import java.io.StringReader;
|
|
import java.util.Properties;
|
|
|
|
import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaType;
|
|
import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
|
|
import org.junit.Test;
|
|
import org.xmlpull.v1.XmlPullParserFactory;
|
|
import org.xmlpull.v1.XmlPullParser;
|
|
import org.xmlpull.v1.XmlPullParserException;
|
|
|
|
import com.jamesmurty.utils.XMLBuilder;
|
|
|
|
/**
|
|
* Test for the OpenIQProvider class.
|
|
*
|
|
* @author Henning Staib
|
|
*/
|
|
public class OpenIQProviderTest {
|
|
|
|
private static Properties outputProperties = new Properties();
|
|
{
|
|
outputProperties.put(javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION, "yes");
|
|
}
|
|
|
|
@Test
|
|
public void shouldCorrectlyParseIQStanzaAttribute() throws Exception {
|
|
String control = XMLBuilder.create("open")
|
|
.a("xmlns", "http://jabber.org/protocol/ibb")
|
|
.a("block-size", "4096")
|
|
.a("sid", "i781hf64")
|
|
.a("stanza", "iq")
|
|
.asString(outputProperties);
|
|
|
|
OpenIQProvider oip = new OpenIQProvider();
|
|
Open open = oip.parse(getParser(control));
|
|
|
|
assertEquals(StanzaType.IQ, open.getStanza());
|
|
}
|
|
|
|
@Test
|
|
public void shouldCorrectlyParseMessageStanzaAttribute() throws Exception {
|
|
String control = XMLBuilder.create("open")
|
|
.a("xmlns", "http://jabber.org/protocol/ibb")
|
|
.a("block-size", "4096")
|
|
.a("sid", "i781hf64")
|
|
.a("stanza", "message")
|
|
.asString(outputProperties);
|
|
|
|
OpenIQProvider oip = new OpenIQProvider();
|
|
Open open = oip.parse(getParser(control));
|
|
|
|
assertEquals(StanzaType.MESSAGE, open.getStanza());
|
|
}
|
|
|
|
private XmlPullParser getParser(String control) throws XmlPullParserException,
|
|
IOException {
|
|
XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
|
|
parser.setInput(new StringReader(control));
|
|
while (true) {
|
|
if (parser.next() == XmlPullParser.START_TAG
|
|
&& parser.getName().equals("open")) {
|
|
break;
|
|
}
|
|
}
|
|
return parser;
|
|
}
|
|
|
|
}
|