HSEARCH-2434 Add JUnit test categories for tests specific to an Elast…

…icsearch version
hibernate · Mar 21, 2017 · 5409b97 · 5409b97
1 parent 088e004
commit 5409b97
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 1 deletion.
diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
@@ -228,6 +228,7 @@
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <executions>
                     <execution>
+                        <id>elasticsearch-it</id>
                         <goals>
                             <goal>integration-test</goal>
                             <goal>verify</goal>
@@ -266,7 +267,6 @@
                                 <!-- HSEARCH-2404 Enable CollectionUpdateEventTest for Elasticsearch -->
                                 <exclude>**/CollectionUpdateEventTest.java</exclude><!-- Only fails on CI (Travis) -->
                             </excludes>
-                            <excludedGroups>org.hibernate.search.testsupport.junit.SkipOnElasticsearch,org.hibernate.search.testsupport.junit.ElasticsearchSupportInProgress</excludedGroups>
                         </configuration>
                     </execution>
                 </executions>
@@ -318,6 +318,18 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>elasticsearch-it</id>
+                                <configuration>
+                                <excludedGroups>org.hibernate.search.testsupport.junit.SkipOnElasticsearch,org.hibernate.search.testsupport.junit.ElasticsearchSupportInProgress,org.hibernate.search.elasticsearch.testutil.junit.SkipOnElasticsearch2</excludedGroups>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <groupId>com.github.alexcojocaru</groupId>
                         <artifactId>elasticsearch-maven-plugin</artifactId>
@@ -403,6 +415,18 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>elasticsearch-it</id>
+                                <configuration>
+                                <excludedGroups>org.hibernate.search.testsupport.junit.SkipOnElasticsearch,org.hibernate.search.testsupport.junit.ElasticsearchSupportInProgress,org.hibernate.search.elasticsearch.testutil.junit.SkipOnElasticsearch2</excludedGroups>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <groupId>com.github.alexcojocaru</groupId>
                         <artifactId>elasticsearch-maven-plugin</artifactId>
@@ -436,6 +460,18 @@
             <id>elasticsearch-5.0</id>
             <build>
                 <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>elasticsearch-it</id>
+                                <configuration>
+                                <excludedGroups>org.hibernate.search.testsupport.junit.SkipOnElasticsearch,org.hibernate.search.testsupport.junit.ElasticsearchSupportInProgress,org.hibernate.search.elasticsearch.testutil.junit.SkipOnElasticsearch5</excludedGroups>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <groupId>com.github.alexcojocaru</groupId>
                         <artifactId>elasticsearch-maven-plugin</artifactId>

diff --git a/...src/test/java/org/hibernate/search/elasticsearch/testutil/junit/SkipOnElasticsearch2.java b/...src/test/java/org/hibernate/search/elasticsearch/testutil/junit/SkipOnElasticsearch2.java
@@ -0,0 +1,18 @@
+/*
+ * Hibernate Search, full-text search for your domain model
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.search.elasticsearch.testutil.junit;
+
+
+/**
+ * JUnit category marker.
+ * <p>
+ * Used to ignore tests which are not sensible when testing against
+ * Elasticsearch version 2.x.
+ */
+public class SkipOnElasticsearch2 {
+
+}
diff --git a/...src/test/java/org/hibernate/search/elasticsearch/testutil/junit/SkipOnElasticsearch5.java b/...src/test/java/org/hibernate/search/elasticsearch/testutil/junit/SkipOnElasticsearch5.java
@@ -0,0 +1,18 @@
+/*
+ * Hibernate Search, full-text search for your domain model
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.search.elasticsearch.testutil.junit;
+
+
+/**
+ * JUnit category marker.
+ * <p>
+ * Used to ignore tests which are not sensible when testing against
+ * Elasticsearch version 5.x.
+ */
+public class SkipOnElasticsearch5 {
+
+}