HSEARCH-2584 Test override built-in analyzers with backends

hibernate · Oct 23, 2020 · bda5a18 · bda5a18
1 parent fe2a657
commit bda5a18
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 2 deletions.
diff --git a/.../elasticsearch/testsupport/configuration/AnalysisBuiltinOverrideITAnalysisConfigurer.java b/.../elasticsearch/testsupport/configuration/AnalysisBuiltinOverrideITAnalysisConfigurer.java
@@ -14,6 +14,11 @@ public class AnalysisBuiltinOverrideITAnalysisConfigurer implements Elasticsearc
 	@Override
 	public void configure(ElasticsearchAnalysisConfigurationContext context) {
 		overrideAnalyzer( context, AnalyzerNames.DEFAULT );
+		overrideAnalyzer( context, AnalyzerNames.STANDARD );
+		overrideAnalyzer( context, AnalyzerNames.SIMPLE );
+		overrideAnalyzer( context, AnalyzerNames.WHITESPACE );
+		overrideAnalyzer( context, AnalyzerNames.STOP );
+		overrideAnalyzer( context, AnalyzerNames.KEYWORD );
 	}
 
 	private void overrideAnalyzer(ElasticsearchAnalysisConfigurationContext context, String name) {

diff --git a/...backend/lucene/testsupport/configuration/AnalysisBuiltinOverrideITAnalysisConfigurer.java b/...backend/lucene/testsupport/configuration/AnalysisBuiltinOverrideITAnalysisConfigurer.java
@@ -17,6 +17,11 @@ public class AnalysisBuiltinOverrideITAnalysisConfigurer implements LuceneAnalys
 	@Override
 	public void configure(LuceneAnalysisConfigurationContext context) {
 		overrideAnalyzer( context, AnalyzerNames.DEFAULT );
+		overrideAnalyzer( context, AnalyzerNames.STANDARD );
+		overrideAnalyzer( context, AnalyzerNames.SIMPLE );
+		overrideAnalyzer( context, AnalyzerNames.WHITESPACE );
+		overrideAnalyzer( context, AnalyzerNames.STOP );
+		overrideAnalyzer( context, AnalyzerNames.KEYWORD );
 	}
 
 	private void overrideAnalyzer(LuceneAnalysisConfigurationContext context, String name) {

diff --git a/.../org/hibernate/search/integrationtest/backend/tck/analysis/AnalysisBuiltinOverrideIT.java b/.../org/hibernate/search/integrationtest/backend/tck/analysis/AnalysisBuiltinOverrideIT.java
@@ -48,8 +48,35 @@ public void setup() {
 
 	@Test
 	public void analyzer_default() {
-		SimpleFieldModel<String> field = index.binding().defaultAnalyzer;
+		verifyOverride( index.binding().defaultAnalyzer );
+	}
 
+	@Test
+	public void analyzer_standard() {
+		verifyOverride( index.binding().standardAnalyzer );
+	}
+
+	@Test
+	public void analyzer_simple() {
+		verifyOverride( index.binding().simpleAnalyzer );
+	}
+
+	@Test
+	public void analyzer_whitespace() {
+		verifyOverride( index.binding().whitespaceAnalyzer );
+	}
+
+	@Test
+	public void analyzer_stop() {
+		verifyOverride( index.binding().stopAnalyzer );
+	}
+
+	@Test
+	public void analyzer_keyword() {
+		verifyOverride( index.binding().keywordAnalyzer );
+	}
+
+	private void verifyOverride(SimpleFieldModel<String> field) {
 		initData( field, b -> {
 			b.emptyDocument( "empty" );
 			b.document( "nonempty", "somewords" );
@@ -82,12 +109,31 @@ private void initData(SimpleFieldModel<String> fieldModel, Consumer<SingleFieldD
 
 	private static class IndexBinding {
 		final SimpleFieldModel<String> defaultAnalyzer;
+		final SimpleFieldModel<String> standardAnalyzer;
+		final SimpleFieldModel<String> simpleAnalyzer;
+		final SimpleFieldModel<String> whitespaceAnalyzer;
+		final SimpleFieldModel<String> stopAnalyzer;
+		final SimpleFieldModel<String> keywordAnalyzer;
 
 		IndexBinding(IndexSchemaElement root) {
 			this.defaultAnalyzer = SimpleFieldModel.mapperWithOverride( KeywordStringFieldTypeDescriptor.INSTANCE,
 					f -> f.asString().analyzer( AnalyzerNames.DEFAULT ) )
 					.map( root, "default" );
+			this.standardAnalyzer = SimpleFieldModel.mapperWithOverride( KeywordStringFieldTypeDescriptor.INSTANCE,
+					f -> f.asString().analyzer( AnalyzerNames.STANDARD ) )
+					.map( root, "standard" );
+			this.simpleAnalyzer = SimpleFieldModel.mapperWithOverride( KeywordStringFieldTypeDescriptor.INSTANCE,
+					f -> f.asString().analyzer( AnalyzerNames.SIMPLE ) )
+					.map( root, "simple" );
+			this.whitespaceAnalyzer = SimpleFieldModel.mapperWithOverride( KeywordStringFieldTypeDescriptor.INSTANCE,
+					f -> f.asString().analyzer( AnalyzerNames.WHITESPACE ) )
+					.map( root, "whitespace" );
+			this.stopAnalyzer = SimpleFieldModel.mapperWithOverride( KeywordStringFieldTypeDescriptor.INSTANCE,
+					f -> f.asString().analyzer( AnalyzerNames.STOP ) )
+					.map( root, "stop" );
+			this.keywordAnalyzer = SimpleFieldModel.mapperWithOverride( KeywordStringFieldTypeDescriptor.INSTANCE,
+					f -> f.asString().analyzer( AnalyzerNames.KEYWORD ) )
+					.map( root, "keyword" );
 		}
 	}
-
 }