HSEARCH-2426 Re-enable tests for dynamic sharding with Elasticsearch

hibernate · Nov 28, 2016 · 5eb3d10 · 5eb3d10
1 parent a9206c8
commit 5eb3d10
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
@@ -242,12 +242,6 @@
                                 <exclude>**/JPATimeoutTest.java</exclude>
                                 <exclude>**/TimeoutTest.java</exclude>
 
-                                <!-- HSEARCH-2426 Remote analyzer initialization fails when using dynamic sharding on Elasticsearch -->
-                                <exclude>**/DirectoryProviderForQueryTest.java</exclude>
-                                <exclude>**/CustomerShardingStrategyTest.java</exclude>
-                                <exclude>**/DynamicShardingTest.java</exclude>
-                                <exclude>**/IdShardingStrategyTest.java</exclude>
-
                                 <!-- HSEARCH-2404 Enable CollectionUpdateEventTest for Elasticsearch -->
                                 <exclude>**/CollectionUpdateEventTest.java</exclude><!-- Only fails on CI (Travis) -->
                             </excludes>

diff --git a/orm/src/test/java/org/hibernate/search/test/shards/DirectoryProviderForQueryTest.java b/orm/src/test/java/org/hibernate/search/test/shards/DirectoryProviderForQueryTest.java
@@ -17,7 +17,9 @@
 import org.hibernate.search.Search;
 import org.hibernate.search.test.SearchTestBase;
 import org.hibernate.search.testsupport.TestConstants;
+import org.hibernate.search.testsupport.junit.ElasticsearchSupportInProgress;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertEquals;
 
@@ -37,6 +39,7 @@ public void configure(Map<String,Object> cfg) {
 	 * Test that you can filter by shard
 	 */
 	@Test
+	@Category(ElasticsearchSupportInProgress.class) // HSEARCH-2477: Shard filtering doesn't work with Elasticsearch queries
 	public void testDirectoryProviderForQuery() throws Exception {
 
 		Session s = openSession( );