Fix ntegrationTest builds for JDK-11 sourcesets

Signed-off-by: Andriy Redko <[email protected]>
opensearch-project · May 6, 2024 · d57dd45 · d57dd45
1 parent a6c7dc9
commit d57dd45
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/java-client/build.gradle.kts b/java-client/build.gradle.kts
@@ -377,7 +377,12 @@ if (runtimeJavaVersion >= JavaVersion.VERSION_11) {
     sourceCompatibility = JavaVersion.VERSION_11.toString()
   }
 
-  tasks.test {
+  tasks.named<Test>("integrationTest") {
+    testClassesDirs += java11.output.classesDirs
+    classpath = sourceSets["java11"].runtimeClasspath
+  }
+
+  tasks.named<Test>("unitTest") {
     testClassesDirs += java11.output.classesDirs
     classpath = sourceSets["java11"].runtimeClasspath
   }

diff --git a/...t/src/test/java11/org/opensearch/client/opensearch/integTest/AbstractSearchRequestIT.java b/...t/src/test/java11/org/opensearch/client/opensearch/integTest/AbstractSearchRequestIT.java
@@ -11,6 +11,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import org.junit.Test;
 import org.opensearch.Version;
@@ -65,6 +66,7 @@ public void shouldReturnSearchResults() throws Exception {
     @Test
     public void hybridSearchShouldReturnSearchResults() throws Exception {
         assumeTrue("Hybrid search is supported from 2.10.0", getServerVersion().onOrAfter(Version.V_2_10_0));
+        assumeTrue("Hybrid search needs opensearch-neural-search plugin to be installed", isNeuralSearchPluginInstalled());
         final String index = "hybrid_search_request";
         try {
             createIndex(index);
@@ -138,6 +140,10 @@ public void shouldReturnSearchResultsWithExt() throws Exception {
         assertEquals(response.hits().hits().size(), 8);
     }
 
+    private boolean isNeuralSearchPluginInstalled() throws IOException {
+        return javaClient().cat().plugins().valueBody().stream().anyMatch(p -> Objects.equals(p.component(), "opensearch-neural-search"));
+    }
+
     private void createTestDocuments(String index) throws IOException {
         javaClient().create(_1 -> _1.index(index).id("1").document(createItem("hummer", "huge", "yes", 2)));
         javaClient().create(_1 -> _1.index(index).id("2").document(createItem("jammer", "huge", "yes", 1)));