mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-06-26 13:24:49 +02:00
9286a1decb
Introduce AbstractError, change 'Conditions' to enums. Because of AbstractError, it was necessary that PlainStreamElement and TopLevelStreamElement becomes an interface. Thus the implementation of TopLevelStreamElement.toString() had to be removed. This adds - policy-violation - unexpected-request to XMPPError.Condition, and removes the - payment-required - remote-server-error - unexpected-condition - request-timeout Conditions The file transfer code does now no longer throw XMPPErrorExceptions, but SmackExceptions. Fixes SMACK-608. Makes it possible to resolves SMACK-386.
107 lines
4.6 KiB
Java
107 lines
4.6 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.smack.packet;
|
|
|
|
import static org.junit.Assert.assertEquals;
|
|
import static org.junit.Assert.assertNotNull;
|
|
import static org.junit.Assert.fail;
|
|
|
|
import org.jivesoftware.smack.packet.StreamError.Condition;
|
|
import org.jivesoftware.smack.util.PacketParserUtils;
|
|
import org.junit.Test;
|
|
import org.xmlpull.v1.XmlPullParser;
|
|
|
|
public class StreamErrorTest {
|
|
|
|
@Test
|
|
public void testParsingOfSimpleStreamError() {
|
|
StreamError error = null;
|
|
final String xml =
|
|
// Usually the stream:stream element has more attributes (to, version, ...)
|
|
// We omit those, since they are not relevant for testing
|
|
"<stream:stream from='im.example.com' id='++TR84Sm6A3hnt3Q065SnAbbk3Y=' xmlns:stream='http://etherx.jabber.org/streams'>" +
|
|
"<stream:error>" +
|
|
"<conflict xmlns='urn:ietf:params:xml:ns:xmpp-streams' /> +" +
|
|
"</stream:error>" +
|
|
"</stream:stream>";
|
|
try {
|
|
XmlPullParser parser = PacketParserUtils.getParserFor(xml, "error");
|
|
error = PacketParserUtils.parseStreamError(parser);
|
|
} catch (Exception e) {
|
|
fail(e.getMessage());
|
|
}
|
|
assertNotNull(error);
|
|
assertEquals(Condition.conflict, error.getCondition());
|
|
}
|
|
|
|
@Test
|
|
public void testParsingOfStreamErrorWithText() {
|
|
StreamError error = null;
|
|
final String xml =
|
|
// Usually the stream:stream element has more attributes (to, version, ...)
|
|
// We omit those, since they are not relevant for testing
|
|
"<stream:stream from='im.example.com' id='++TR84Sm6A3hnt3Q065SnAbbk3Y=' xmlns:stream='http://etherx.jabber.org/streams'>" +
|
|
"<stream:error>" +
|
|
"<conflict xmlns='urn:ietf:params:xml:ns:xmpp-streams' />" +
|
|
"<text xml:lang='' xmlns='urn:ietf:params:xml:ns:xmpp-streams'>" +
|
|
"Replaced by new connection" +
|
|
"</text>" +
|
|
"</stream:error>" +
|
|
"</stream:stream>";
|
|
try {
|
|
XmlPullParser parser = PacketParserUtils.getParserFor(xml, "error");
|
|
error = PacketParserUtils.parseStreamError(parser);
|
|
} catch (Exception e) {
|
|
fail(e.getMessage());
|
|
}
|
|
assertNotNull(error);
|
|
assertEquals(Condition.conflict, error.getCondition());
|
|
assertEquals("Replaced by new connection", error.getDescriptiveText());
|
|
}
|
|
|
|
@Test
|
|
public void testParsingOfStreamErrorWithTextAndOptionalElement() {
|
|
StreamError error = null;
|
|
final String xml =
|
|
// Usually the stream:stream element has more attributes (to, version, ...)
|
|
// We omit those, since they are not relevant for testing
|
|
"<stream:stream from='im.example.com' id='++TR84Sm6A3hnt3Q065SnAbbk3Y=' xmlns:stream='http://etherx.jabber.org/streams'>" +
|
|
"<stream:error>" +
|
|
"<conflict xmlns='urn:ietf:params:xml:ns:xmpp-streams' />" +
|
|
"<text xml:lang='' xmlns='urn:ietf:params:xml:ns:xmpp-streams'>" +
|
|
"Replaced by new connection" +
|
|
"</text>" +
|
|
"<appSpecificElement xmlns='myns'>" +
|
|
"Text contents of application-specific condition element: Foo Bar" +
|
|
"</appSpecificElement>" +
|
|
"</stream:error>" +
|
|
"</stream:stream>";
|
|
try {
|
|
XmlPullParser parser = PacketParserUtils.getParserFor(xml, "error");
|
|
error = PacketParserUtils.parseStreamError(parser);
|
|
} catch (Exception e) {
|
|
fail(e.getMessage());
|
|
}
|
|
assertNotNull(error);
|
|
assertEquals(Condition.conflict, error.getCondition());
|
|
assertEquals("Replaced by new connection", error.getDescriptiveText());
|
|
PacketExtension appSpecificElement = error.getExtension("appSpecificElement", "myns");
|
|
assertNotNull(appSpecificElement);
|
|
}
|
|
|
|
}
|