mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-12-24 11:38:00 +01:00
Merge pull request #570 from guusdk/SMACK-935_Websocket-open-element
Improve handling of expanded Websocket 'open' element
This commit is contained in:
commit
7eabdaf8f7
2 changed files with 7 additions and 3 deletions
|
@ -103,7 +103,9 @@ public abstract class AbstractWebSocket {
|
|||
static String getStreamFromOpenElement(String openElement) {
|
||||
String streamElement = openElement.replaceFirst("\\A<open ", "<stream:stream ")
|
||||
.replace("urn:ietf:params:xml:ns:xmpp-framing", "jabber:client")
|
||||
.replaceFirst("/>\\s*\\z", " xmlns:stream='http://etherx.jabber.org/streams'>");
|
||||
.replaceFirst("/>\\s*\\z", " xmlns:stream='http://etherx.jabber.org/streams'>")
|
||||
.replaceFirst("></open>\\s*\\z", " xmlns:stream='http://etherx.jabber.org/streams'>");
|
||||
|
||||
return streamElement;
|
||||
}
|
||||
|
||||
|
|
|
@ -24,18 +24,20 @@ import org.junit.jupiter.api.Test;
|
|||
|
||||
public final class AbstractWebSocketTest {
|
||||
private static final String OPEN_ELEMENT = "<open from='localhost.org' id='aov9ihhmmn' xmlns='urn:ietf:params:xml:ns:xmpp-framing' xml:lang='en' version='1.0'/>";
|
||||
private static final String OPEN_ELEMENT_EXPANDED = "<open from='localhost.org' id='aov9ihhmmn' xmlns='urn:ietf:params:xml:ns:xmpp-framing' xml:lang='en' version='1.0'></open>";
|
||||
private static final String OPEN_STREAM = "<stream:stream from='localhost.org' id='aov9ihhmmn' xmlns='jabber:client' xml:lang='en' version='1.0' xmlns:stream='http://etherx.jabber.org/streams'>";
|
||||
private static final String CLOSE_ELEMENT = "<close xmlns='urn:ietf:params:xml:ns:xmpp-framing'/>";
|
||||
|
||||
@Test
|
||||
public void getStreamFromOpenElementTest() {
|
||||
String generatedOpenStream = AbstractWebSocket.getStreamFromOpenElement(OPEN_ELEMENT);
|
||||
assertEquals(generatedOpenStream, OPEN_STREAM);
|
||||
assertEquals(OPEN_STREAM, AbstractWebSocket.getStreamFromOpenElement(OPEN_ELEMENT));
|
||||
assertEquals(OPEN_STREAM, AbstractWebSocket.getStreamFromOpenElement(OPEN_ELEMENT_EXPANDED));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isOpenElementTest() {
|
||||
assertTrue(AbstractWebSocket.isOpenElement(OPEN_ELEMENT));
|
||||
assertTrue(AbstractWebSocket.isOpenElement(OPEN_ELEMENT_EXPANDED));
|
||||
assertFalse(AbstractWebSocket.isOpenElement(OPEN_STREAM));
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue