HSEARCH-2366 Make tests compatible with non-default build

- don't use 11+ Files API - use a version of ES including the distribution part
hibernate · Mar 27, 2023 · 724d2c6 · 724d2c6
1 parent 94d3188
commit 724d2c6
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 18 deletions.
diff --git a/...st/backend/elasticsearch/schema/management/ElasticsearchIndexSchemaManagerExporterIT.java b/...st/backend/elasticsearch/schema/management/ElasticsearchIndexSchemaManagerExporterIT.java
@@ -15,6 +15,8 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.hibernate.search.backend.elasticsearch.cfg.ElasticsearchIndexSettings;
 import org.hibernate.search.engine.backend.schema.management.spi.IndexSchemaCollector;
@@ -77,12 +79,18 @@ public void indexSchema(Optional<String> backendName, String indexName, SchemaEx
 						"    }" +
 						"  }" +
 						"}",
-				Files.readString( directory.resolve( testIndexName ).resolve( "create-index.json" ) )
+				readString( directory.resolve( testIndexName ).resolve( "create-index.json" ) )
 		);
 
 		assertJsonEquals(
 				"{}",
-				Files.readString( directory.resolve( testIndexName ).resolve( "create-index-query-params.json" ) )
+				readString( directory.resolve( testIndexName ).resolve( "create-index-query-params.json" ) )
 		);
 	}
+
+	private String readString(Path path) throws IOException {
+		try ( Stream<String> lines = Files.lines( path ) ) {
+			return lines.collect( Collectors.joining( "\n" ) );
+		}
+	}
 }
diff --git a/...ontest/mapper/orm/realbackend/schema/management/ElasticsearchSchemaManagerExporterIT.java b/...ontest/mapper/orm/realbackend/schema/management/ElasticsearchSchemaManagerExporterIT.java
@@ -14,6 +14,8 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import javax.persistence.EntityManagerFactory;
 
 import org.hibernate.search.integrationtest.mapper.orm.realbackend.testsupport.BackendConfigurations;
@@ -45,7 +47,7 @@ public void elasticsearch() throws IOException {
 						osVersion -> false
 				)
 		);
-		String version = ElasticsearchTestDialect.getActualVersion().versionString();
+		String version = ElasticsearchTestDialect.getActualVersion().toString();
 		entityManagerFactory = setupHelper.start()
 				// so that we don't try to do anything with the schema and allow to run without ES being up:
 				.withProperty( "hibernate.search.schema_management.strategy", "none" )
@@ -84,7 +86,7 @@ public void elasticsearch() throws IOException {
 						"  }," +
 						"  \"settings\": {}" +
 						"}",
-				Files.readString(
+				readString(
 						directory.resolve( "backend" ) // as we are using the default backend
 								.resolve( "indexes" )
 								.resolve( Book.NAME )
@@ -93,7 +95,7 @@ public void elasticsearch() throws IOException {
 
 		assertJsonEquals(
 				"{}",
-				Files.readString(
+				readString(
 						directory.resolve( "backend" ) // as we are using the default backend
 								.resolve( "indexes" )
 								.resolve( Book.NAME )
@@ -129,7 +131,7 @@ public void elasticsearch() throws IOException {
 						"  }," +
 						"  \"settings\": {}" +
 						"}",
-				Files.readString(
+				readString(
 						directory.resolve( "backends" ) // as we are not using the default backend
 								.resolve( Article.BACKEND_NAME ) // name of a backend
 								.resolve( "indexes" )
@@ -139,12 +141,18 @@ public void elasticsearch() throws IOException {
 
 		assertJsonEquals(
 				"{}",
-				Files.readString(
+				readString(
 						directory.resolve( "backends" ) // as we are not using the default backend
 								.resolve( Article.BACKEND_NAME ) // name of a backend
 								.resolve( "indexes" )
 								.resolve( Article.NAME )
 								.resolve( "create-index-query-params.json" ) )
 		);
 	}
+
+	private String readString(Path path) throws IOException {
+		try ( Stream<String> lines = Files.lines( path ) ) {
+			return lines.collect( Collectors.joining( "\n" ) );
+		}
+	}
 }
diff --git a/...tegrationtest/mapper/orm/realbackend/schema/management/LuceneSchemaManagerExporterIT.java b/...tegrationtest/mapper/orm/realbackend/schema/management/LuceneSchemaManagerExporterIT.java
@@ -11,6 +11,8 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import javax.persistence.EntityManagerFactory;
 
 import org.hibernate.search.integrationtest.mapper.orm.realbackend.testsupport.BackendConfigurations;
@@ -43,19 +45,25 @@ public void lucene() throws IOException {
 		Path directory = temporaryFolder.newFolder().toPath();
 		Search.mapping( entityManagerFactory ).scope( Object.class ).schemaManager().exportExpectedSchema( directory );
 
-		String bookIndex = Files.readString(
+		String bookIndex = readString(
 				directory.resolve( "backend" ) // as we are using the default backend
 						.resolve( "indexes" )
 						.resolve( Book.NAME )
 						.resolve( "no-schema.txt" ) );
 		assertThat( bookIndex ).isEqualTo( "The Lucene backend does not support exporting the schema." );
 
-		String articleIndex = Files.readString(
+		String articleIndex = readString(
 				directory.resolve( "backends" ) // as we are not using the default backend
 						.resolve( Article.BACKEND_NAME ) // name of a backend
 						.resolve( "indexes" )
 						.resolve( Article.NAME )
 						.resolve( "no-schema.txt" ) );
 		assertThat( articleIndex ).isEqualTo( "The Lucene backend does not support exporting the schema." );
 	}
+
+	private String readString(Path path) throws IOException {
+		try ( Stream<String> lines = Files.lines( path ) ) {
+			return lines.collect( Collectors.joining( "\n" ) );
+		}
+	}
 }
diff --git a/...r/pojo/standalone/realbackend/schema/management/ElasticsearchSchemaManagerExporterIT.java b/...r/pojo/standalone/realbackend/schema/management/ElasticsearchSchemaManagerExporterIT.java
@@ -13,9 +13,14 @@
 import static org.junit.Assume.assumeFalse;
 
 import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 import java.lang.invoke.MethodHandles;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.hibernate.search.integrationtest.mapper.pojo.standalone.realbackend.testsupport.BackendConfigurations;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId;
@@ -43,7 +48,7 @@ public class ElasticsearchSchemaManagerExporterIT {
 
 	@Before
 	public void setUp() throws Exception {
-		String version = ElasticsearchTestDialect.getActualVersion().versionString();
+		String version = ElasticsearchTestDialect.getActualVersion().toString();
 		this.mapping = setupHelper.start()
 				// so that we don't try to do anything with the schema and allow to run without ES being up:
 				.withProperty( "hibernate.search.schema_management.strategy", "none" )
@@ -92,7 +97,7 @@ public void elasticsearch() throws IOException {
 						"  }," +
 						"  \"settings\": {}" +
 						"}",
-				Files.readString(
+				readString(
 						directory.resolve( "backend" ) // as we are using the default backend
 								.resolve( "indexes" )
 								.resolve( Book.NAME )
@@ -101,7 +106,7 @@ public void elasticsearch() throws IOException {
 
 		assertJsonEquals(
 				"{}",
-				Files.readString(
+				readString(
 						directory.resolve( "backend" ) // as we are using the default backend
 								.resolve( "indexes" )
 								.resolve( Book.NAME )
@@ -136,7 +141,7 @@ public void elasticsearch() throws IOException {
 						"  }," +
 						"  \"settings\": {}" +
 						"}",
-				Files.readString(
+				readString(
 						directory.resolve( "backends" ) // as we are not using the default backend
 								.resolve( Article.BACKEND_NAME ) // name of a backend
 								.resolve( "indexes" )
@@ -146,7 +151,7 @@ public void elasticsearch() throws IOException {
 
 		assertJsonEquals(
 				"{}",
-				Files.readString(
+				readString(
 						directory.resolve( "backends" ) // as we are not using the default backend
 								.resolve( Article.BACKEND_NAME ) // name of a backend
 								.resolve( "indexes" )
@@ -162,7 +167,7 @@ public void exportToExistingDirectory() throws IOException {
 				.resolve( "indexes" )
 				.resolve( Book.NAME )
 		);
-		Files.writeString(
+		writeString(
 				path
 						.resolve( "not-an-index.json" ),
 				"{}"
@@ -186,7 +191,7 @@ public void exportToExistingFile() throws IOException {
 		Path path = Files.createDirectories( directory.resolve( "backend" )
 				.resolve( "indexes" )
 		);
-		Files.writeString(
+		writeString(
 				path.resolve( Book.NAME ),
 				"{}"
 		);
@@ -254,4 +259,17 @@ public void setTitle(String title) {
 			this.title = title;
 		}
 	}
+
+	private String readString(Path path) throws IOException {
+		try ( Stream<String> lines = Files.lines( path ) ) {
+			return lines.collect( Collectors.joining( "\n" ) );
+		}
+	}
+
+	private void writeString(Path path, String string) throws IOException {
+		try ( OutputStream outputStream = Files.newOutputStream( path );
+				OutputStreamWriter writer = new OutputStreamWriter( outputStream, StandardCharsets.UTF_8 ) ) {
+			writer.write( string );
+		}
+	}
 }
diff --git a/...t/mapper/pojo/standalone/realbackend/schema/management/LuceneSchemaManagerExporterIT.java b/...t/mapper/pojo/standalone/realbackend/schema/management/LuceneSchemaManagerExporterIT.java
@@ -12,6 +12,8 @@
 import java.lang.invoke.MethodHandles;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.hibernate.search.integrationtest.mapper.pojo.standalone.realbackend.testsupport.BackendConfigurations;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId;
@@ -44,14 +46,14 @@ public void lucene() throws IOException {
 		Path directory = temporaryFolder.newFolder().toPath();
 		mapping.scope( Object.class ).schemaManager().exportExpectedSchema( directory );
 
-		String bookIndex = Files.readString(
+		String bookIndex = readString(
 				directory.resolve( "backend" ) // as we are using the default backend
 						.resolve( "indexes" )
 						.resolve( Book.NAME )
 						.resolve( "no-schema.txt" ) );
 		assertThat( bookIndex ).isEqualTo( "The Lucene backend does not support exporting the schema." );
 
-		String articleIndex = Files.readString(
+		String articleIndex = readString(
 				directory.resolve( "backends" ) // as we are not using the default backend
 						.resolve( Article.BACKEND_NAME ) // name of a backend
 						.resolve( "indexes" )
@@ -111,4 +113,10 @@ public void setTitle(String title) {
 			this.title = title;
 		}
 	}
+
+	private String readString(Path path) throws IOException {
+		try ( Stream<String> lines = Files.lines( path ) ) {
+			return lines.collect( Collectors.joining( "\n" ) );
+		}
+	}
 }