HHH-19846 Drop JUnit 4 usage

Author: dreab8

hibernate-core/src/test/java/org/hibernate/orm/test/customstructures/IdentityMapTest.java

@@ -4,13 +4,13 @@
  */
 package org.hibernate.orm.test.customstructures;
 
+import org.hibernate.internal.util.collections.IdentityMap;
+import org.junit.jupiter.api.Test;
+
 import java.util.Iterator;
 import java.util.Objects;
 
-import org.hibernate.internal.util.collections.IdentityMap;
-
-import org.junit.Assert;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class IdentityMapTest {
 
@@ -19,28 +19,28 @@ public void basicIdentityMapFunctionality() {
 		final IdentityMap<Holder, Object> map = IdentityMap.instantiateSequenced( 10 );
 		Holder k1 = new Holder( "k", 1 );
 		Holder s2 = new Holder( "s", 2 );
-		map.put( k1, "k1"  );
+		map.put( k1, "k1" );
 		map.put( s2, "s2" );
 		map.put( k1, "K1!" );
-		Assert.assertEquals( 2, map.size() );
+		assertThat( map ).hasSize( 2 );
 		k1.name = "p";
-		Assert.assertEquals( 2, map.size() );
-		Assert.assertEquals( "K1!", map.get( k1 ) );
+		assertThat( map ).hasSize( 2 );
+		assertThat( map.get( k1 ) ).isEqualTo( "K1!" );
 		Holder k1similar = new Holder( "p", 1 );
 		map.put( k1similar, "notk1" );
-		Assert.assertEquals( "K1!", map.get( k1 ) );
+		assertThat( map.get( k1 ) ).isEqualTo( "K1!" );
 
 		IdentityMap.onEachKey( map, k -> k.value = 10 );
 
 		final Iterator<Holder> keyIterator = map.keyIterator();
 		int count = 0;
 		while ( keyIterator.hasNext() ) {
 			final Holder key = keyIterator.next();
-			Assert.assertNotNull( key );
+			assertThat( key ).isNotNull();
 			count++;
-			Assert.assertEquals( 10, key.value );
+			assertThat( key.value ).isEqualTo( 10 );
 		}
-		Assert.assertEquals( 3, count );
+		assertThat( count ).isEqualTo( 3 );
 	}
 
 	private static class Holder {
@@ -64,7 +64,7 @@ public boolean equals(Object o) {
 			}
 			Holder holder = (Holder) o;
 			return value == holder.value &&
-					name.equals( holder.name );
+				name.equals( holder.name );
 		}
 
 		@Override

hibernate-core/src/test/java/org/hibernate/orm/test/customstructures/JdbcParameterListTest.java

@@ -7,9 +7,11 @@
 import org.hibernate.sql.ast.tree.expression.JdbcParameter;
 import org.hibernate.sql.exec.internal.JdbcParameterImpl;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import org.junit.Assert;
-import org.junit.Test;
 
 /**
  * Unit tests for JdbcParametersList
@@ -27,7 +29,7 @@ public void singleton() {
 		final JdbcParameterImpl element = makeJdbcParameterElement();
 		final JdbcParametersList singleton = JdbcParametersList.singleton( element );
 		expectsSize( 1, singleton );
-		Assert.assertSame( element, singleton.get( 0 ) );
+		assertThat( singleton.get( 0 ) ).isSameAs( element );
 	}
 
 	@Test
@@ -55,7 +57,7 @@ private void verifyAsSingletonBuilder(JdbcParametersList.Builder builder) {
 		builder.add( element );
 		final JdbcParametersList built = builder.build();
 		expectsSize( 1, built );
-		Assert.assertSame( element, built.get( 0 ) );
+		assertThat( element ).isSameAs( built.get( 0 ) );
 	}
 
 	@Test
@@ -95,7 +97,7 @@ private void verifyNparamBuilder(final int size, final JdbcParametersList.Builde
 		final JdbcParametersList built = builder.build();
 		expectsSize( size, built );
 		for ( int i = 0; i < size; i++ ) {
-			Assert.assertSame( elements[i], built.get( i ) );
+			assertThat( built.get( i ) ).isSameAs( elements[i] );
 		}
 	}
 
@@ -104,17 +106,17 @@ private static void expectsEmpty(JdbcParametersList empty) {
 	}
 
 	private static void expectsSize(int size, JdbcParametersList list) {
-		Assert.assertEquals( size, list.size() );
+		assertThat( list.size() ).isEqualTo( size );
 		for ( int i = 0; i < size; i++ ) {
-			Assert.assertNotNull( list.get( i ) );
+			assertThat( list.get( i ) ).isNotNull();
 		}
 		if ( size == 0 ) {
-			Assert.assertSame( JdbcParametersList.empty(), list );
+			assertThat( list ).isSameAs( JdbcParametersList.empty() );
 		}
 		else if ( size == 1 ) {
-			Assert.assertTrue( list instanceof JdbcParametersList.JdbcParametersListSingleton );
+			assertThat( list ).isInstanceOf( JdbcParametersList.JdbcParametersListSingleton.class );
 		}
-		Assert.assertThrows( ArrayIndexOutOfBoundsException.class, () -> list.get( size ) );
+		assertThrows( ArrayIndexOutOfBoundsException.class, () -> list.get( size ) );
 	}
 
 	private static JdbcParameterImpl makeJdbcParameterElement() {