From 463dfac48d56f3827113a7df2642a85007df9707 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Sat, 11 Apr 2020 22:10:19 +0200 Subject: [PATCH] extensions: finish conversion to JUnit5, drop JUnit4 --- build.gradle | 1 - .../smackx/attention/AttentionElementTest.java | 2 +- .../org/jivesoftware/smackx/nick/NickTest.java | 18 ++++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index d43ecc7d5..03237bbdf 100644 --- a/build.gradle +++ b/build.gradle @@ -123,7 +123,6 @@ allprojects { androidJavadocOffline = { getAndroidJavadocOffline() } junit4Projects = [ ':smack-core', - ':smack-extensions', ':smack-im', ':smack-integration-test', ':smack-omemo', diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/attention/AttentionElementTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/attention/AttentionElementTest.java index 52be8b713..dd01b7331 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/attention/AttentionElementTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/attention/AttentionElementTest.java @@ -20,7 +20,7 @@ import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; import org.jivesoftware.smackx.attention.packet.AttentionExtension; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AttentionElementTest { diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickTest.java index 9819642f0..77cf1a7cb 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/nick/NickTest.java @@ -17,9 +17,9 @@ package org.jivesoftware.smackx.nick; import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.io.IOException; @@ -29,7 +29,7 @@ import org.jivesoftware.smack.xml.XmlPullParserException; import org.jivesoftware.smackx.nick.packet.Nick; import org.jivesoftware.smackx.nick.provider.NickProvider; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; @@ -41,14 +41,16 @@ public class NickTest { @Test public void disallowEmptyNickTest() { - assertThrows("Empty String as argument MUST cause IllegalArgumentException.", - IllegalArgumentException.class, () -> new Nick("")); + assertThrows(IllegalArgumentException.class, + () -> new Nick(""), + "Empty String as argument MUST cause IllegalArgumentException."); } @Test public void disallowNullNickTest() { - assertThrows("Null argument MUST cause IllegalArgumentException.", - IllegalArgumentException.class, () -> new Nick(null)); + assertThrows(IllegalArgumentException.class, + () -> new Nick(null), + "Null argument MUST cause IllegalArgumentException."); }