HSEARCH-2406 Made DefinitionsOnHotRebootTest work with the Elasticsea…

…rch indexing service
hibernate · Nov 28, 2016 · 0cdc82d · 0cdc82d
1 parent 9b65853
commit 0cdc82d
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/...va/org/hibernate/search/test/configuration/mutablefactory/DefinitionsOnHotRebootTest.java b/...va/org/hibernate/search/test/configuration/mutablefactory/DefinitionsOnHotRebootTest.java
@@ -34,29 +34,29 @@ public class DefinitionsOnHotRebootTest {
 
 	@Test
 	public void notForgettingDefinedFilters() {
-		SearchIntegratorBuilder emptySearchBuilder = new SearchIntegratorBuilder().configuration( new SearchConfigurationForTest() );
+		SearchIntegratorBuilder emptySearchBuilder = new SearchIntegratorBuilder().configuration( new SearchConfigurationForTest().addClass( A.class ) );
 		try ( SearchIntegrator sf = emptySearchBuilder.buildSearchIntegrator() ) {
-			assertEquals( 0, countFilters( sf ) );
-			sf.addClasses( A.class );
-			assertEquals( 1, countFilters( sf ) );
-			assertTrue( filterExists( sf, "anyFilter" ) );
+			int defaultFilterCount = countFilters( sf );
 			sf.addClasses( B.class );
-			assertEquals( 2, countFilters( sf ) );
+			assertEquals( defaultFilterCount + 1, countFilters( sf ) );
+			assertTrue( filterExists( sf, "anyFilter" ) );
+			sf.addClasses( C.class );
+			assertEquals( defaultFilterCount + 2, countFilters( sf ) );
 			assertTrue( filterExists( sf, "anyFilter" ) );
 			assertTrue( filterExists( sf, "anotherFilter" ) );
 		}
 	}
 
 	@Test
 	public void notForgettingDefinedAnalyzers() {
-		SearchIntegratorBuilder emptySearchBuilder = new SearchIntegratorBuilder().configuration( new SearchConfigurationForTest() );
+		SearchIntegratorBuilder emptySearchBuilder = new SearchIntegratorBuilder().configuration( new SearchConfigurationForTest().addClass( A.class ) );
 		try ( SearchIntegrator sf = emptySearchBuilder.buildSearchIntegrator() ) {
-			assertEquals( 0, countAnalyzers( sf ) );
-			sf.addClasses( A.class );
-			assertEquals( 1, countAnalyzers( sf ) );
-			assertTrue( analyzerExists( sf, "anAnalyzer" ) );
+			int defaultAnalyzerCount = countAnalyzers( sf );
 			sf.addClasses( B.class );
-			assertEquals( 2, countAnalyzers( sf ) );
+			assertEquals( defaultAnalyzerCount + 1, countAnalyzers( sf ) );
+			assertTrue( analyzerExists( sf, "anAnalyzer" ) );
+			sf.addClasses( C.class );
+			assertEquals( defaultAnalyzerCount + 2, countAnalyzers( sf ) );
 			assertTrue( analyzerExists( sf, "anAnalyzer" ) );
 			assertTrue( analyzerExists( sf, "anotherAnalyzer" ) );
 		}
@@ -80,17 +80,22 @@ private int countFilters(SearchIntegrator sf) {
 		return sf.unwrap( SearchFactoryState.class ).getFilterDefinitions().size();
 	}
 
+	@Indexed
+	static class A {
+		@DocumentId Long id;
+	}
+
 	@Indexed
 	@FullTextFilterDef( name = "anyFilter", impl = ShardSensitiveOnlyFilter.class )
 	@AnalyzerDef(name = "anAnalyzer", tokenizer = @TokenizerDef(factory = StandardTokenizerFactory.class))
-	static class A {
+	static class B {
 		@DocumentId Long id;
 	}
 
 	@Indexed
 	@FullTextFilterDef( name = "anotherFilter", impl = ShardSensitiveOnlyFilter.class )
 	@AnalyzerDef(name = "anotherAnalyzer", tokenizer = @TokenizerDef(factory = StandardTokenizerFactory.class))
-	static class B {
+	static class C {
 		@DocumentId Long id;
 	}