commit 2b74fb032b3a3bdf3f93e7f9d1f297e773350b6a
author David Matějček <dmatej@seznam.cz> Mon Aug 23 19:21:41 2021 +0200
committer David Matějček <dmatej@seznam.cz> Thu Sep 09 11:36:11 2021 +0200
tree 49876c5c88e23c46fe04cf8a5bc86b5bbc137dfd
parent 11690043dc929e15f2ec0bea941c77da4a592a60

Issue #23507 config-types use junit5 instead of junit4

nucleus/hk2/config-types/pom.xml

diff --git a/nucleus/hk2/config-types/pom.xml b/nucleus/hk2/config-types/pom.xml
index 084c5f2..6cffb1c 100644
--- a/nucleus/hk2/config-types/pom.xml
+++ b/nucleus/hk2/config-types/pom.xml
@@ -46,6 +46,10 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
         </dependency>

nucleus/hk2/config-types/src/test/java/org/jvnet/hk2/config/types/test/ConfigTypesTest.java

diff --git a/nucleus/hk2/config-types/src/test/java/org/jvnet/hk2/config/types/test/ConfigTypesTest.java b/nucleus/hk2/config-types/src/test/java/org/jvnet/hk2/config/types/test/ConfigTypesTest.java
index a91dc9d..af8476f 100644
--- a/nucleus/hk2/config-types/src/test/java/org/jvnet/hk2/config/types/test/ConfigTypesTest.java
+++ b/nucleus/hk2/config-types/src/test/java/org/jvnet/hk2/config/types/test/ConfigTypesTest.java
@@ -22,11 +22,13 @@
 import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.hk2.api.ServiceLocatorFactory;
 import org.glassfish.hk2.utilities.BuilderHelper;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jvnet.hk2.config.ConfigInjector;
 import org.jvnet.hk2.config.types.HK2DomConfigTypesUtilities;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 /**
  * Tests for specialized config types
  *
@@ -41,7 +43,7 @@
     public void testConfigTypesUtilities() {
         ServiceLocator locator = ServiceLocatorFactory.getInstance().create(null);
 
-        Assert.assertNull(locator.getService(ConfigInjector.class));
+        assertNull(locator.getService(ConfigInjector.class));
 
         HK2DomConfigTypesUtilities.enableHK2DomConfigurationConfigTypes(locator, null);
 
@@ -49,10 +51,10 @@
         HK2DomConfigTypesUtilities.enableHK2DomConfigurationConfigTypes(locator, null);
 
         List<ActiveDescriptor<?>> injectors = locator.getDescriptors(BuilderHelper.createContractFilter(ConfigInjector.class.getName()));
-        Assert.assertEquals(1, injectors.size());
+        assertEquals(1, injectors.size());
 
         ActiveDescriptor<?> propInjectDesc = injectors.get(0);
 
-        Assert.assertEquals("org.jvnet.hk2.config.types.PropertyInjector", propInjectDesc.getImplementation());
+        assertEquals("org.jvnet.hk2.config.types.PropertyInjector", propInjectDesc.getImplementation());
     }
 }