[RESTEASY-3476] Migrate the resteasy-jaxb-provider to JUnit 5.

https://issues.redhat.com/browse/RESTEASY-3476 Signed-off-by: James R. Perkins <jperkins@redhat.com>
resteasy · Mar 22, 2024 · a4f1e8f · a4f1e8f
1 parent 3cf17f3
commit a4f1e8f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/providers/jaxb/pom.xml b/providers/jaxb/pom.xml
@@ -98,8 +98,8 @@
 
         <!-- Test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/providers/jaxb/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesAbstract.java b/providers/jaxb/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesAbstract.java
@@ -6,8 +6,8 @@
 
 import org.jboss.logging.Logger;
 import org.jboss.resteasy.plugins.providers.jaxb.i18n.Messages;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /**
  *
@@ -29,11 +29,11 @@ public void testLocale() throws Exception {
             return;
         }
 
-        Assert.assertEquals(getExpected(BASE + "05", "collectionWrappingFailedNamespace", "xyz", "http://localhost"),
+        Assertions.assertEquals(getExpected(BASE + "05", "collectionWrappingFailedNamespace", "xyz", "http://localhost"),
                 Messages.MESSAGES.collectionWrappingFailedNamespace("xyz", "http://localhost"));
-        Assert.assertEquals(getExpected(BASE + "10", "couldNotFindJAXBContextFinder", "xx/yy"),
+        Assertions.assertEquals(getExpected(BASE + "10", "couldNotFindJAXBContextFinder", "xx/yy"),
                 Messages.MESSAGES.couldNotFindJAXBContextFinder(new MediaType("xx", "yy")));
-        Assert.assertEquals(getExpected(BASE + "55", "validXmlRegistryCouldNotBeLocated", getClass()),
+        Assertions.assertEquals(getExpected(BASE + "55", "validXmlRegistryCouldNotBeLocated", getClass()),
                 Messages.MESSAGES.validXmlRegistryCouldNotBeLocated());
     }
 

diff --git a/providers/jaxb/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesParent.java b/providers/jaxb/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesParent.java
@@ -5,8 +5,8 @@
 import java.util.Properties;
 
 import org.jboss.logging.Logger;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 
 /**
  *
@@ -20,12 +20,12 @@ public abstract class TestMessagesParent {
     protected static Locale savedLocale;
     protected Properties properties = new Properties();
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeClass() {
         savedLocale = Locale.getDefault();
     }
 
-    @AfterClass
+    @AfterAll
     public static void afterClass() {
         Locale.setDefault(savedLocale);
         LOG.info("Reset default locale to: " + savedLocale);