From b954bd5b65a56cd978e833fc40660889641e3237 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Thu, 28 Jan 2021 18:21:43 +0100 Subject: [PATCH] Make element provider tests use XmlPullParserKind --- .../smackx/avatar/DataExtensionTest.java | 16 ++++----- .../smackx/avatar/MetadataExtensionTest.java | 34 +++++++++++-------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/avatar/DataExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/avatar/DataExtensionTest.java index 106798c7db..e46073aab1 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/avatar/DataExtensionTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/avatar/DataExtensionTest.java @@ -1,6 +1,6 @@ /** * - * Copyright 2017 Fernando Ramirez + * Copyright 2017 Fernando Ramirez, 2021 Paul Schaub * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,13 +19,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.jivesoftware.smack.test.util.SmackTestSuite; -import org.jivesoftware.smack.util.PacketParserUtils; +import org.jivesoftware.smack.test.util.SmackTestUtil; import org.jivesoftware.smack.util.stringencoder.Base64; -import org.jivesoftware.smack.xml.XmlPullParser; import org.jivesoftware.smackx.avatar.element.DataExtension; import org.jivesoftware.smackx.avatar.provider.DataProvider; -import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; public class DataExtensionTest extends SmackTestSuite { @@ -35,14 +35,14 @@ public class DataExtensionTest extends SmackTestSuite { + ""; // @formatter:on - @Test - public void checkDataExtensionParse() throws Exception { + @ParameterizedTest + @EnumSource(SmackTestUtil.XmlPullParserKind.class) + public void checkDataExtensionParse(SmackTestUtil.XmlPullParserKind parserKind) throws Exception { byte[] data = Base64.decode("qANQR1DBwU4DX7jmYZnnfe32"); DataExtension dataExtension = new DataExtension(data); assertEquals(dataExtensionExample, dataExtension.toXML().toString()); - XmlPullParser parser = PacketParserUtils.getParserFor(dataExtensionExample); - DataExtension dataExtensionFromProvider = new DataProvider().parse(parser); + DataExtension dataExtensionFromProvider = SmackTestUtil.parse(dataExtensionExample, DataProvider.class, parserKind); assertEquals(Base64.encodeToString(data), Base64.encodeToString(dataExtensionFromProvider.getData())); } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/avatar/MetadataExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/avatar/MetadataExtensionTest.java index 65359ddbc8..a1cf7ed294 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/avatar/MetadataExtensionTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/avatar/MetadataExtensionTest.java @@ -1,6 +1,6 @@ /** * - * Copyright 2017 Fernando Ramirez + * Copyright 2017 Fernando Ramirez, 2021 Paul Schaub * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,12 +25,13 @@ import java.util.List; import java.util.Map; -import org.jivesoftware.smack.util.PacketParserUtils; -import org.jivesoftware.smack.xml.XmlPullParser; +import org.jivesoftware.smack.test.util.SmackTestUtil; import org.jivesoftware.smackx.avatar.element.MetadataExtension; import org.jivesoftware.smackx.avatar.provider.MetadataProvider; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; public class MetadataExtensionTest { @@ -87,8 +88,9 @@ public class MetadataExtensionTest { + "" + ""; - @Test - public void checkMetadataExtensionParse() throws Exception { + @ParameterizedTest + @EnumSource(SmackTestUtil.XmlPullParserKind.class) + public void checkMetadataExtensionParse(SmackTestUtil.XmlPullParserKind parserKind) throws Exception { String id = "357a8123a30844a3aa99861b6349264ba67a5694"; URL url = new URL("http://avatars.example.org/happy.gif"); long bytes = 23456; @@ -103,8 +105,8 @@ public void checkMetadataExtensionParse() throws Exception { MetadataExtension metadataExtension = new MetadataExtension(infos); assertEquals(metadataExtensionExample, metadataExtension.toXML().toString()); - XmlPullParser parser = PacketParserUtils.getParserFor(metadataExtensionExample); - MetadataExtension metadataExtensionFromProvider = new MetadataProvider().parse(parser); + MetadataExtension metadataExtensionFromProvider = SmackTestUtil + .parse(metadataExtensionExample, MetadataProvider.class, parserKind); assertEquals(id, metadataExtensionFromProvider.getInfoElements().get(0).getId()); assertEquals(url, metadataExtensionFromProvider.getInfoElements().get(0).getUrl()); @@ -120,10 +122,11 @@ public void checkEmptyMetadataExtensionParse() { assertEquals(emptyMetadataExtensionExample, metadataExtension.toXML().toString()); } - @Test - public void checkSeveralInfosInMetadataExtension() throws Exception { - XmlPullParser parser = PacketParserUtils.getParserFor(metadataWithSeveralInfos); - MetadataExtension metadataExtensionFromProvider = new MetadataProvider().parse(parser); + @ParameterizedTest + @EnumSource(SmackTestUtil.XmlPullParserKind.class) + public void checkSeveralInfosInMetadataExtension(SmackTestUtil.XmlPullParserKind parserKind) throws Exception { + MetadataExtension metadataExtensionFromProvider = SmackTestUtil + .parse(metadataWithSeveralInfos, MetadataProvider.class, parserKind); MetadataInfo info1 = metadataExtensionFromProvider.getInfoElements().get(0); MetadataInfo info2 = metadataExtensionFromProvider.getInfoElements().get(1); @@ -151,10 +154,11 @@ public void checkSeveralInfosInMetadataExtension() throws Exception { assertEquals(64, info3.getWidth().intValue()); } - @Test - public void checkInfosAndPointersParse() throws Exception { - XmlPullParser parser = PacketParserUtils.getParserFor(metadataWithInfoAndPointers); - MetadataExtension metadataExtensionFromProvider = new MetadataProvider().parse(parser); + @ParameterizedTest + @EnumSource(SmackTestUtil.XmlPullParserKind.class) + public void checkInfosAndPointersParse(SmackTestUtil.XmlPullParserKind parserKind) throws Exception { + MetadataExtension metadataExtensionFromProvider = SmackTestUtil + .parse(metadataWithInfoAndPointers, MetadataProvider.class, parserKind); MetadataInfo info = metadataExtensionFromProvider.getInfoElements().get(0); assertEquals("111f4b3c50d7b0df729d299bc6f8e9ef9066971f", info.getId());