refine how we handle failures of future operations

Author: austin-denoble

src/integration/java/io/pinecone/integration/controlPlane/pod/CollectionTest.java

@@ -186,7 +186,7 @@ public void testCreateCollectionFromInvalidIndex() {
             CreateCollectionRequest createCollectionRequest = new CreateCollectionRequest().name(RandomStringBuilder.build("coll1", 8)).source("invalid-index");
             pineconeClient.createCollection(createCollectionRequest);
 
-            fail("testCreateCollectionFromInvalidIndex should have thrown PineconeException");
+            fail("Expected to throw PineconeException");
         } catch (PineconeException expected) {
             assertTrue(expected.getMessage().contains("invalid-index not found"));
         }
@@ -199,7 +199,7 @@ public void testIndexFromNonExistentCollection() {
             CreateIndexRequest newCreateIndexRequest = new CreateIndexRequest().name(RandomStringBuilder.build("from-nonexistent-coll", 8)).dimension(dimension).metric(IndexMetric.COSINE).spec(spec);
             pineconeClient.createIndex(newCreateIndexRequest);
 
-            fail("testIndexFromNonExistentCollection should have thrown PineconeException");
+            fail("Expected to throw PineconeException");
         } catch (PineconeException expected) {
             assertTrue(expected.getMessage().contains("non-existent-collection not found"));
         }
@@ -230,7 +230,7 @@ public void testCreateIndexInMismatchedEnvironment() {
             CreateIndexRequest createIndexRequest = new CreateIndexRequest().name(RandomStringBuilder.build("from-coll", 8)).dimension(dimension).metric(IndexMetric.COSINE).spec(spec);
             pineconeClient.createIndex(createIndexRequest);
 
-            fail("testCreateIndexInMismatchedEnvironment should have thrown PineconeException");
+            fail("Expected to throw PineconeException");
         } catch (PineconeException expected) {
             assertTrue(expected.getMessage().contains("collection must be in the same environment as the index"));
         }
@@ -245,7 +245,7 @@ public void testCreateIndexWithMismatchedDimension() {
             CreateIndexRequest createIndexRequest = new CreateIndexRequest().name(RandomStringBuilder.build("from-coll", 8)).dimension(dimension + 1).metric(IndexMetric.COSINE).spec(spec);
             pineconeClient.createIndex(createIndexRequest);
 
-            fail("testCreateIndexWithMismatchedDimension should have thrown PineconeException");
+            fail("Expected to throw PineconeException");
         } catch (PineconeException expected) {
             assertTrue(expected.getMessage().contains("collection must have the same dimension"));
         }
@@ -263,7 +263,7 @@ public void testCreateCollectionFromNotReadyIndex() throws InterruptedException
             indexesToCleanUp.add(notReadyIndexName);
             createCollection(pineconeClient, newCollectionName, notReadyIndexName, false);
 
-            fail("testCreateCollectionFromNotReadyIndex should have thrown PineconeException");
+            fail("Expected to throw PineconeException");
         } catch (PineconeException expected) {
             assertTrue(expected.getMessage().contains("index is not ready"));
         }

src/integration/java/io/pinecone/integration/controlPlane/pod/ConfigureIndexTest.java

@@ -44,7 +44,7 @@ public void configureIndexWithInvalidIndexName() {
         try {
             controlPlaneClient.configureIndex("non-existent-index", configureIndexRequest);
 
-            fail("configureIndexWithInvalidIndexName should have thrown PineconeNotFoundException");
+            fail("Expected to throw PineconeNotFoundException");
         } catch (PineconeNotFoundException expected) {
             assertTrue(expected.getLocalizedMessage().toLowerCase().contains("not found"));
         }
@@ -58,7 +58,7 @@ public void configureIndexExceedingQuota() {
         try {
             controlPlaneClient.configureIndex(indexName, configureIndexRequest);
 
-            fail("configureIndexExceedingQuota should have thrown PineconeForbiddenException");
+            fail("Expected to throw PineconeForbiddenException");
         } catch (PineconeForbiddenException expected) {
             assertTrue(expected.getLocalizedMessage().contains("quota"));
         }
@@ -112,7 +112,7 @@ public void changingBasePodType() throws InterruptedException {
             ConfigureIndexRequest configureIndexRequest = new ConfigureIndexRequest().spec(spec);
             controlPlaneClient.configureIndex(indexName, configureIndexRequest);
 
-            fail("changingBasePodType should have thrown PineconeBadRequestException");
+            fail("Expected to throw PineconeBadRequestException");
         } catch (PineconeBadRequestException expected) {
             assertTrue(expected.getMessage().contains("change pod"));
         }

src/integration/java/io/pinecone/integration/dataPlane/QueryErrorPodTest.java

@@ -54,7 +54,7 @@ public void queryWithIncorrectVectorDimensionSync() {
             List<Float> vector = Arrays.asList(100F);
             indexClient.query(5, vector, null, null, null, namespace, null, true, true);
 
-            fail("queryWithIncorrectVectorDimensionSync should have thrown StatusRuntimeException");
+            fail("Expected to throw StatusRuntimeException");
         } catch (StatusRuntimeException expected) {
             assertTrue(expected.getLocalizedMessage().contains("grpc-status=3"));
             assertTrue(expected.getLocalizedMessage().contains("grpc-message=Query vector dimension 1 does not match the dimension of the index 3"));
@@ -73,7 +73,7 @@ public void QueryWithNullSparseIndicesNotNullSparseValuesSyncTest() {
                     null,
                     generateVectorValuesByDimension(dimension));
 
-            fail("QueryWithNullSparseIndicesNotNullSparseValuesSyncTest should have thrown PineconeValidationException");
+            fail("Expected to throw PineconeValidationException");
         } catch (PineconeValidationException expected) {
             assertTrue(expected.getLocalizedMessage().contains( "ensure that both sparse indices and values are present"));
         }
@@ -91,7 +91,7 @@ public void queryWithIncorrectVectorDimensionFuture() throws ExecutionException,
             ListenableFuture<QueryResponseWithUnsignedIndices> queryFuture = asyncIndexClient.query(5, vector, null, null, null, namespace, null, true, true);
             queryFuture.get(10, TimeUnit.SECONDS);
 
-            fail("queryWithIncorrectVectorDimensionFuture should have thrown ExecutionException");
+            fail("Expected to throw ExecutionException");
         } catch (ExecutionException expected) {
             assertTrue(expected.getLocalizedMessage().contains("grpc-status=3"));
             assertTrue(expected.getLocalizedMessage().contains("grpc-message=Query vector dimension 1 does not match the dimension of the index 3"));
@@ -112,7 +112,7 @@ public void QueryWithNullSparseIndicesNotNullSparseValuesFutureTest() throws Exe
 
             updateFuture.get(10, TimeUnit.SECONDS);
 
-            fail("QueryWithNullSparseIndicesNotNullSparseValuesFutureTest should have thrown PineconeValidationException");
+            fail("Expected to throw PineconeValidationException");
         } catch (PineconeValidationException expected) {
             assertTrue(expected.getLocalizedMessage().contains("ensure that both sparse indices and values are present"));
         }

src/integration/java/io/pinecone/integration/dataPlane/UpdateFetchAndQueryPodTest.java

@@ -197,7 +197,7 @@ public void addIncorrectDimensionalValuesSyncTest() throws InterruptedException
         try {
             indexClient.update(idToUpdate, updatedValues, null, namespace, null, null);
 
-            fail("addIncorrectDimensionalValuesSyncTest should have thrown StatusRuntimeException");
+            fail("Expected to throw StatusRuntimeException");
         } catch (StatusRuntimeException expected) {
             assertTrue(expected.getTrailers().toString().contains("grpc-status=3"));
             assertTrue(expected.getTrailers().toString().contains("dimension 1 does not match the dimension of the index 3"));
@@ -260,7 +260,7 @@ public void updateNullSparseIndicesNotNullSparseValuesSyncTest() {
                     null,
                     generateVectorValuesByDimension(dimension));
 
-            fail("updateNullSparseIndicesNotNullSparseValuesSyncTest should have thrown PineconeValidationException");
+            fail("Expected to throw PineconeValidationException");
         } catch (PineconeValidationException expected) {
             assertTrue(expected.getLocalizedMessage().contains("ensure that both sparse indices and values are present"));
         }
@@ -388,7 +388,7 @@ public void updateAllParamsFetchAndQueryFutureTest() throws InterruptedException
     }
 
     @Test
-    public void addIncorrectDimensionalValuesFutureTest() throws ExecutionException, InterruptedException, TimeoutException {
+    public void addIncorrectDimensionalValuesFutureTest() throws InterruptedException, TimeoutException {
         // Upsert vectors with required parameters
         int numOfVectors = 3;
         String namespace = RandomStringBuilder.build("ns", 8);
@@ -418,10 +418,17 @@ public void addIncorrectDimensionalValuesFutureTest() throws ExecutionException,
             ListenableFuture<UpdateResponse> updateFuture = asyncIndexClient.update(idToUpdate, updatedValues, null, namespace, null, null);
             updateFuture.get(10, TimeUnit.SECONDS);
 
-            fail("addIncorrectDimensionalValuesFutureTest should have thrown StatusRuntimeException");
-        } catch (StatusRuntimeException expected) {
-            assertTrue(expected.getTrailers().toString().contains("grpc-status=3"));
-            assertTrue(expected.getTrailers().toString().contains("dimension 1 does not match the dimension of the index 3"));
+            fail("Expected to throw StatusRuntimeException");
+        } catch (ExecutionException exception) {
+            Throwable cause = exception.getCause();
+
+            if (cause instanceof StatusRuntimeException) {
+                StatusRuntimeException expected = (StatusRuntimeException) cause;
+                assertTrue(expected.getTrailers().toString().contains("grpc-status=3"));
+                assertTrue(expected.getTrailers().toString().contains("dimension 1 does not match the dimension of the index 3"));
+            } else {
+                fail("Expected to throw StatusRuntimeException, instead threw: " + cause);
+            }
         }
     }
 
@@ -482,9 +489,9 @@ public void updateNullSparseIndicesNotNullSparseValuesFutureTest() throws Execut
                     generateVectorValuesByDimension(dimension));
             updateFuture.get(10, TimeUnit.SECONDS);
 
-
-            fail("updateNullSparseIndicesNotNullSparseValuesFutureTest should have thrown PineconeValidationException");
-        } catch (PineconeValidationException expected) {
+            fail("Expected to throw PineconeValidationException");
+        }
+        catch (PineconeValidationException expected) {
             assertTrue(expected.getLocalizedMessage().contains("ensure that both sparse indices and values are present"));
         }
     }

src/integration/java/io/pinecone/integration/dataPlane/UpsertAndQueryPodTest.java

@@ -113,7 +113,7 @@ public void upsertNullSparseIndicesNotNullSparseValuesSyncTest() {
                     null,
                     null);
 
-            fail("upsertNullSparseIndicesNotNullSparseValuesSyncTest should have thrown PineconeValidationException");
+            fail("Expected to throw PineconeValidationException");
         } catch (PineconeValidationException expected) {
             assertTrue(expected.getLocalizedMessage().contains("ensure that both sparse indices and values are present"));
         }
@@ -195,7 +195,7 @@ public void upsertNullSparseIndicesNotNullSparseValuesFutureTest() throws Execut
                     null,
                     null).get();
 
-            fail("upsertNullSparseIndicesNotNullSparseValuesFutureTest should have thrown PineconeValidationException");
+            fail("Expected to throw PineconeValidationException");
         } catch (PineconeValidationException expected) {
             assertTrue(expected.getLocalizedMessage().contains("ensure that both sparse indices and values are present"));
         }

src/integration/java/io/pinecone/integration/dataPlane/UpsertAndQueryServerlessTest.java

@@ -135,7 +135,7 @@ public void upsertNullSparseIndicesNotNullSparseValuesSyncTest() {
                     null,
                     null);
 
-            fail("upsertNullSparseIndicesNotNullSparseValuesSyncTest should have thrown PineconeValidationException");
+            fail("Expected to throw PineconeValidationException");
         } catch (PineconeValidationException expected) {
             assertTrue(expected.getLocalizedMessage().contains("ensure that both sparse indices and values are present"));
         }
@@ -224,7 +224,7 @@ public void upsertNullSparseIndicesNotNullSparseValuesFutureTest() throws Execut
                     null,
                     null).get();
 
-            fail("upsertNullSparseIndicesNotNullSparseValuesFutureTest should have thrown PineconeValidationException");
+            fail("Expected to throw PineconeValidationException");
         } catch (PineconeValidationException expected) {
             assertTrue(expected.getLocalizedMessage().contains("ensure that both sparse indices and values are present"));
         }