HSEARCH-5369 Cleanup the Junit 4 remains

Author: marko-bekhta

build/config/src/main/resources/forbidden-internal.txt

@@ -43,6 +43,7 @@ org.junit.AfterClass @ Use JUnit 5 instead
 org.junit.Rule @ Use JUnit 5 instead
 org.junit.ClassRule @ Use JUnit 5 instead
 org.junit.Ignore @ Use JUnit 5 instead
+org.junit.Assume @ Use JUnit 5 instead
 
 ################################################################################################################
 # Unsafe API/SPI from Hibernate ORM

build/parents/build/pom.xml

@@ -129,7 +129,6 @@
 
         <!-- >>> Common -->
         <version.log4j>2.24.3</version.log4j>
-        <version.junit>4.13.2</version.junit>
         <version.junit-jupiter>5.12.2</version.junit-jupiter>
         <version.junit-platform-suite-engine>1.10.0</version.junit-platform-suite-engine>
         <version.org.osgi.core>6.0.0</version.org.osgi.core>

integrationtest/mapper/orm-jakarta-batch/src/test/java/org/hibernate/search/integrationtest/jakarta/batch/massindexing/MassIndexingJobIT.java

@@ -7,7 +7,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -214,10 +214,11 @@ void indexedEmbeddedCollection() throws InterruptedException {
 	void indexedEmbeddedCollection_idFetchSize_entityFetchSize_mysql() throws InterruptedException {
 		Dialect dialect = emf.unwrap( SessionFactoryImplementor.class ).getJdbcServices()
 				.getJdbcEnvironment().getDialect();
-		assumeTrue( "This test only makes sense on MySQL,"
-				+ " which is the only JDBC driver that accepts (and, in a sense, requires)"
-				+ " passing Integer.MIN_VALUE for the JDBC fetch size",
-				dialect instanceof MySQLDialect && !( dialect instanceof MariaDBDialect ) );
+		assumeTrue( dialect instanceof MySQLDialect && !( dialect instanceof MariaDBDialect ),
+				"This test only makes sense on MySQL,"
+						+ " which is the only JDBC driver that accepts (and, in a sense, requires)"
+						+ " passing Integer.MIN_VALUE for the JDBC fetch size"
+		);
 
 		List<CompanyGroup> groupsContainingGoogle =
 				JobTestUtil.findIndexedResults( emf, CompanyGroup.class, "companies.name", "Google" );

integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/schema/management/ElasticsearchSchemaManagerExporterIT.java

@@ -7,7 +7,7 @@
 import static org.hibernate.search.util.impl.integrationtest.backend.elasticsearch.dialect.ElasticsearchTestDialect.isActualVersion;
 import static org.hibernate.search.util.impl.test.JsonHelper.assertJsonEquals;
 import static org.hibernate.search.util.impl.test.JsonHelper.assertJsonEqualsIgnoringUnknownFields;
-import static org.junit.Assume.assumeFalse;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -46,11 +46,11 @@ class ElasticsearchSchemaManagerExporterIT {
 	@Test
 	void elasticsearch() throws IOException {
 		assumeFalse(
-				"Older versions of Elasticsearch would not match the mappings",
 				isActualVersion(
 						esVersion -> esVersion.isLessThan( "7.0" ),
 						osVersion -> false
-				)
+				),
+				"Older versions of Elasticsearch would not match the mappings"
 		);
 		String version = ElasticsearchTestDialect.getActualVersion().toString();
 		entityManagerFactory = setupHelper.start()

integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/automaticindexing/AutomaticIndexingBasicIT.java

@@ -5,7 +5,7 @@
 package org.hibernate.search.integrationtest.mapper.orm.automaticindexing;
 
 import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.util.function.Consumer;
 
@@ -102,8 +102,8 @@ void directPersistUpdateDelete() {
 
 	@Test
 	void rollback_discardPreparedWorks() {
-		assumeTrue( "This test only makes sense if entities are processed in-session",
-				ormSetupHelper.areEntitiesProcessedInSession() );
+		assumeTrue( ormSetupHelper.areEntitiesProcessedInSession(),
+				"This test only makes sense if entities are processed in-session" );
 
 		with( sessionFactory ).runNoTransaction( session -> {
 			Transaction trx = session.beginTransaction();

integrationtest/v5migrationhelper/orm/pom.xml

@@ -53,6 +53,12 @@
         <dependency>
             <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-testing</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
             <scope>test</scope>
         </dependency>
     </dependencies>

integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/bridge/UnresolvedBridgeTest.java

@@ -4,8 +4,8 @@
  */
 package org.hibernate.search.test.bridge;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -52,7 +52,7 @@ else if ( ee instanceof SearchException ) {
 				}
 				ee = ee.getCause();
 			}
-			assertTrue( hasSearchException );
+			assertThat( hasSearchException ).isTrue();
 		}
 	}
 

integrationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/TransactionSynchronizationTest.java

@@ -5,8 +5,8 @@
 
 package org.hibernate.search.test.engine;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -48,7 +48,7 @@ void testProperExceptionPropagation() {
 			raised = true;
 			transaction.rollback();
 		}
-		assertTrue( "An exception should have been raised", raised );
+		assertTrue( raised, "An exception should have been raised" );
 		fts.close();
 	}
 

util/internal/integrationtest/mapper/orm/pom.xml

@@ -46,6 +46,12 @@
         <dependency>
             <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-testing</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>