vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch '4.4'

This commit is contained in:
Florian Schmaus 2020-11-25 20:57:44 +01:00
parent a2636b2f60 02c9058c3d
commit 1a963cc794
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
View File

@ -299,7 +299,7 @@ public class PacketParserUtils {
*/ */
public static CharSequence parseContentDepth(XmlPullParser parser, int depth, boolean fullNamespaces) throws XmlPullParserException, IOException { public static CharSequence parseContentDepth(XmlPullParser parser, int depth, boolean fullNamespaces) throws XmlPullParserException, IOException {
if (parser.supportsRoundtrip()) { if (parser.supportsRoundtrip()) {
return parseContentDepthWithRoundtrip(parser, depth, fullNamespaces); return parseContentDepthWithRoundtrip(parser, depth);
} else { } else {
return parseContentDepthWithoutRoundtrip(parser, depth, fullNamespaces); return parseContentDepthWithoutRoundtrip(parser, depth, fullNamespaces);
} }
@ -368,8 +368,7 @@ public class PacketParserUtils {
return xml; return xml;
} }
@SuppressWarnings("UnusedVariable") private static XmlStringBuilder parseContentDepthWithRoundtrip(XmlPullParser parser, int depth)
private static CharSequence parseContentDepthWithRoundtrip(XmlPullParser parser, int depth, boolean fullNamespaces)
throws XmlPullParserException, IOException { throws XmlPullParserException, IOException {
XmlStringBuilder sb = new XmlStringBuilder(); XmlStringBuilder sb = new XmlStringBuilder();
XmlPullParser.Event event = parser.getEventType(); XmlPullParser.Event event = parser.getEventType();
@ -377,10 +376,9 @@ public class PacketParserUtils {
outerloop: while (true) { outerloop: while (true) {
switch (event) { switch (event) {
case START_ELEMENT: case START_ELEMENT:
if (startElementJustSeen) {
sb.rightAngleBracket();
}
startElementJustSeen = true; startElementJustSeen = true;
String openElementTag = parser.getText();
sb.append(openElementTag);
break; break;
case END_ELEMENT: case END_ELEMENT:
boolean isEmptyElement = false; boolean isEmptyElement = false;

36
smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
View File

@ -854,4 +854,40 @@ public class PacketParserUtilsTest {
StanzaError error = PacketParserUtils.parseError(parser); StanzaError error = PacketParserUtils.parseError(parser);
assertEquals(text, error.getDescriptiveText()); assertEquals(text, error.getDescriptiveText());
} }
@ParameterizedTest
@EnumSource(SmackTestUtil.XmlPullParserKind.class)
public void testParseElementSimple(SmackTestUtil.XmlPullParserKind parserKind) throws TransformerException, ParserConfigurationException, FactoryConfigurationError, XmlPullParserException, IOException {
String unknownElement = XMLBuilder.create("unknown-element")
.ns("https://example.org/non-existent")
.e("inner")
.t("test")
.asString(outputProperties);
XmlPullParser xmlPullParser = SmackTestUtil.getParserFor(unknownElement, parserKind);
CharSequence unknownElementParsed = PacketParserUtils.parseElement(xmlPullParser);
assertXmlSimilar(unknownElement, unknownElementParsed);
}
@ParameterizedTest
@EnumSource(SmackTestUtil.XmlPullParserKind.class)
public void testParseElementExtended(SmackTestUtil.XmlPullParserKind parserKind) throws TransformerException, ParserConfigurationException, FactoryConfigurationError, XmlPullParserException, IOException {
String unknownElement = XMLBuilder.create("unknown-element")
.ns("https://example.org/non-existent")
.a("attribute-outer", "foo")
.e("inner")
.a("attribute-inner", "bar")
.a("attribute-inner-2", "baz")
.t("test")
.up()
.e("empty-element")
.up()
.asString(outputProperties);
XmlPullParser xmlPullParser = SmackTestUtil.getParserFor(unknownElement, parserKind);
CharSequence unknownElementParsed = PacketParserUtils.parseElement(xmlPullParser);
assertXmlSimilar(unknownElement, unknownElementParsed);
}
} }