Fix ArgumentCaptor can't capture varargs (#1320)

* Fix ArgumentCaptor can't capture varargs Signed-off-by: Peng Huo <penghuo@gmail.com> * bump bwc version to 2.6.0 Signed-off-by: Peng Huo <penghuo@gmail.com> --------- Signed-off-by: Peng Huo <penghuo@gmail.com>
opensearch-project · Feb 3, 2023 · 513428b · 513428b
1 parent cfe6802
commit 513428b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/integ-test/build.gradle b/integ-test/build.gradle
@@ -224,7 +224,7 @@ task comparisonTest(type: RestIntegTestTask) {
     systemProperty "queries", System.getProperty("queries")
 }
 
-String baseVersion = "2.5.0"
+String baseVersion = "2.6.0"
 String bwcVersion = baseVersion + ".0";
 String baseName = "sqlBwcCluster"
 String bwcFilePath = "src/test/resources/bwc/"

diff --git a/plugin/src/test/java/org/opensearch/sql/plugin/datasource/DataSourceMetaDataTest.java b/plugin/src/test/java/org/opensearch/sql/plugin/datasource/DataSourceMetaDataTest.java
@@ -18,6 +18,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import lombok.SneakyThrows;
@@ -111,10 +112,10 @@ void loadConnectors(Settings settings) {
   }
 
   void verifyAddDataSourceWithMetadata(List<DataSourceMetadata> metadataList) {
-    ArgumentCaptor<DataSourceMetadata> metadataCaptor =
-        ArgumentCaptor.forClass(DataSourceMetadata.class);
+    ArgumentCaptor<DataSourceMetadata[]> metadataCaptor =
+        ArgumentCaptor.forClass(DataSourceMetadata[].class);
     verify(dataSourceService, times(1)).addDataSource(metadataCaptor.capture());
-    List<DataSourceMetadata> actualValues = metadataCaptor.getAllValues();
+    List<DataSourceMetadata> actualValues = Arrays.asList(metadataCaptor.getValue());
     assertEquals(metadataList.size(), actualValues.size());
     assertEquals(metadataList, actualValues);
   }