Convert Search 5/6 tests to JUnit 5 + containers for Elasticsearch

Because the elasticsearch maven plugin stopped working after upgrading
to OpenJDK 17 for some reason, and I don't want to spend time figuring
out why.

Author: yrodiere

search/hibernate-search-5/elasticsearch-5/elasticsearch-maven-plugin/configuration/elasticsearch.yml

@@ -12,15 +12,32 @@
 		<version.org.hibernate>5.4.33</version.org.hibernate>
 
 		<version.com.h2database>2.3.232</version.com.h2database>
-		<version.junit>4.13.2</version.junit>
-
-		<version.elasticsearch-maven-plugin>6.26</version.elasticsearch-maven-plugin>
-		<version.org.elasticsearch>5.6.9</version.org.elasticsearch>
+		<version.junit-jupiter>5.11.0</version.junit-jupiter>
+		<version.org.assertj.assertj-core>3.26.3</version.org.assertj.assertj-core>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.testcontainers</groupId>
+				<artifactId>testcontainers-bom</artifactId>
+				<version>1.20.1</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.junit</groupId>
+				<artifactId>junit-bom</artifactId>
+				<version>${version.junit-jupiter}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.hibernate</groupId>
@@ -63,9 +80,34 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${version.junit}</version>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.platform</groupId>
+			<artifactId>junit-platform-launcher</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>${version.org.assertj.assertj-core}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>elasticsearch</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -118,35 +160,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>com.github.alexcojocaru</groupId>
-				<artifactId>elasticsearch-maven-plugin</artifactId>
-				<version>${version.elasticsearch-maven-plugin}</version>
-				<configuration>
-					<clusterName>hsearchEsTestCluster</clusterName>
-					<version>${version.org.elasticsearch}</version>
-					<httpPort>9200</httpPort>
-					<pathConf>${project.basedir}/elasticsearch-maven-plugin/configuration/</pathConf>
-					<pathInitScript>${project.basedir}/elasticsearch-maven-plugin/init/init.script</pathInitScript>
-					<autoCreateIndex>false</autoCreateIndex>
-				</configuration>
-				<executions>
-					<execution>
-						<id>start-elasticsearch</id>
-						<phase>pre-integration-test</phase>
-						<goals>
-							<goal>runforked</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>stop-elasticsearch</id>
-						<phase>post-integration-test</phase>
-						<goals>
-							<goal>stop</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 </project>

search/hibernate-search-5/elasticsearch-5/elasticsearch-maven-plugin/configuration/log4j2.properties

@@ -0,0 +1,39 @@
+package org.hibernate.search.bugs;
+
+import java.io.Closeable;
+import java.time.Duration;
+
+import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.elasticsearch.ElasticsearchContainer;
+import org.testcontainers.utility.DockerImageName;
+
+class SearchBackendContainer implements Closeable {
+
+	private static final DockerImageName ELASTICSEARCH_IMAGE_NAME =
+			DockerImageName.parse( "docker.elastic.co/elasticsearch/elasticsearch" )
+					.withTag( "5.6.16" );
+
+	private ElasticsearchContainer elasticsearchContainer;
+
+	public ElasticsearchContainer setUp() {
+		elasticsearchContainer = new ElasticsearchContainer( ELASTICSEARCH_IMAGE_NAME )
+				.withExposedPorts( 9200, 9300 )
+				.waitingFor( new HttpWaitStrategy().forPort( 9200 ).forStatusCode( 200 ) )
+				.withStartupTimeout( Duration.ofMinutes( 5 ) )
+				.withReuse( true )
+				.withEnv( "logger.level", "WARN" )
+				.withEnv( "discovery.type", "single-node" )
+				.withEnv( "xpack.security.enabled", "false" )
+				.withEnv( "ES_JAVA_OPTS", "-Xms1g -Xmx1g" )
+				.withEnv( "cluster.routing.allocation.disk.threshold_enabled", "false" );
+		elasticsearchContainer.start();
+		return elasticsearchContainer;
+	}
+
+	@Override
+	public void close() {
+		try ( ElasticsearchContainer esToClose = this.elasticsearchContainer ) {
+			// Nothing to do: we just want resources to get closed.
+		}
+	}
+}

search/hibernate-search-5/elasticsearch-5/elasticsearch-maven-plugin/init/init.script

@@ -5,20 +5,25 @@
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.SessionFactoryBuilder;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.service.spi.ServiceRegistryImplementor;
-import org.junit.After;
-import org.junit.Before;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
 public abstract class SearchTestBase {
-	
+
 	private SessionFactory sessionFactory;
-	
-	@Before
+	private SearchBackendContainer elasticsearchContainer;
+
+	@BeforeEach
 	public void setUp() {
-		StandardServiceRegistryBuilder registryBuilder = new StandardServiceRegistryBuilder();
-		ServiceRegistryImplementor serviceRegistry = (ServiceRegistryImplementor) registryBuilder.build();
+		elasticsearchContainer = new SearchBackendContainer();
 
-		MetadataSources ms = new MetadataSources( serviceRegistry );
+		StandardServiceRegistryBuilder registryBuilder = new StandardServiceRegistryBuilder();
+		registryBuilder.applySetting(
+				"hibernate.search.default.elasticsearch.host",
+				elasticsearchContainer.setUp().getHttpHostAddress()
+		);
+		MetadataSources ms = new MetadataSources( registryBuilder.build() );
 		Class<?>[] annotatedClasses = getAnnotatedClasses();
 		if ( annotatedClasses != null ) {
 			for ( Class<?> entity : annotatedClasses ) {
@@ -31,14 +36,17 @@ public void setUp() {
 		final SessionFactoryBuilder sfb = metadata.getSessionFactoryBuilder();
 		this.sessionFactory = sfb.build();
 	}
-	
-	@After
+
+	@AfterEach
 	public void tearDown() {
-		this.sessionFactory.close();
+		try ( SearchBackendContainer esToClose = this.elasticsearchContainer;
+				SessionFactory sessionFactoryToClose = this.sessionFactory ) {
+			// Nothing to do: we just want resources to get closed.
+		}
 	}
 
 	protected abstract Class<?>[] getAnnotatedClasses();
-	
+
 	protected SessionFactory getSessionFactory() {
 		return sessionFactory;
 	}

search/hibernate-search-5/elasticsearch-5/pom.xml

@@ -0,0 +1,31 @@
+package org.hibernate.search.bugs;
+
+import org.hibernate.cfg.Configuration;
+
+import org.hibernate.testing.AfterClassOnce;
+import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+
+public abstract class SearchTestJunit4Base extends BaseCoreFunctionalTestCase {
+
+	private SearchBackendContainer elasticsearchContainer;
+
+	@Override
+	protected final void configure(Configuration configuration) {
+		super.configure( configuration );
+
+		this.elasticsearchContainer = new SearchBackendContainer();
+		configuration.setProperty( "hibernate.search.backend.hosts", elasticsearchContainer.setUp().getHttpHostAddress() );
+
+		configureMore( configuration );
+	}
+
+	protected void configureMore(Configuration configuration) {
+	}
+
+	@Override
+	protected void releaseSessionFactory() {
+		try ( SearchBackendContainer esToClose = this.elasticsearchContainer; ) {
+			super.releaseSessionFactory();
+		}
+	}
+}