Migrate OfferQueryTest, ReadFeedOffersTest, ResourceTokenTest, GatewayServiceConfigurationReaderTest to rx.TestSuiteBase

Co-authored-by: xinlian12 <64233642+xinlian12@users.noreply.github.com>

Author: Copilot

sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/implementation/directconnectivity/GatewayServiceConfigurationReaderTest.java

@@ -18,7 +18,7 @@
 import com.azure.cosmos.implementation.LifeCycleUtils;
 import com.azure.cosmos.implementation.RxDocumentClientImpl;
 import com.azure.cosmos.implementation.TestConfigurations;
-import com.azure.cosmos.implementation.TestSuiteBase;
+import com.azure.cosmos.rx.TestSuiteBase;
 import com.azure.cosmos.implementation.http.HttpClient;
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
@@ -43,7 +43,7 @@ public class GatewayServiceConfigurationReaderTest extends TestSuiteBase {
     private String databaseAccountJson;
     private DatabaseAccount expectedDatabaseAccount;
 
-    @Factory(dataProvider = "clientBuilders")
+    @Factory(dataProvider = "internalClientBuilders")
     public GatewayServiceConfigurationReaderTest(Builder clientBuilder) {
         super(clientBuilder);
     }

sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/rx/OfferQueryTest.java

@@ -17,7 +17,6 @@
 import com.azure.cosmos.implementation.QueryFeedOperationState;
 import com.azure.cosmos.implementation.ResourceType;
 import com.azure.cosmos.implementation.TestConfigurations;
-import com.azure.cosmos.implementation.TestSuiteBase;
 import com.azure.cosmos.implementation.TestUtils;
 import com.azure.cosmos.models.FeedResponse;
 import com.azure.cosmos.models.ModelBridgeInternal;
@@ -50,7 +49,7 @@ private String getDatabaseLink() {
         return TestUtils.getDatabaseNameLink(databaseId);
     }
 
-    @Factory(dataProvider = "clientBuilders")
+    @Factory(dataProvider = "internalClientBuilders")
     public OfferQueryTest(Builder clientBuilder) {
         super(clientBuilder);
     }

sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/rx/ReadFeedOffersTest.java

@@ -22,7 +22,6 @@
 import com.azure.cosmos.implementation.FeedResponseListValidator;
 import com.azure.cosmos.implementation.FeedResponseValidator;
 import com.azure.cosmos.implementation.Offer;
-import com.azure.cosmos.implementation.TestSuiteBase;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Factory;
@@ -35,7 +34,6 @@
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-//TODO: change to use external TestSuiteBase
 public class ReadFeedOffersTest extends TestSuiteBase {
 
     protected static final int FEED_TIMEOUT = 60000;
@@ -49,7 +47,7 @@ public class ReadFeedOffersTest extends TestSuiteBase {
 
     private AsyncDocumentClient client;
 
-    @Factory(dataProvider = "clientBuilders")
+    @Factory(dataProvider = "internalClientBuilders")
     public ReadFeedOffersTest(AsyncDocumentClient.Builder clientBuilder) {
         super(clientBuilder);
     }

sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/rx/ResourceTokenTest.java

@@ -23,7 +23,6 @@
 import com.azure.cosmos.implementation.ResourceResponse;
 import com.azure.cosmos.implementation.ResourceResponseValidator;
 import com.azure.cosmos.implementation.TestConfigurations;
-import com.azure.cosmos.implementation.TestSuiteBase;
 import com.azure.cosmos.implementation.TestUtils;
 import com.azure.cosmos.implementation.User;
 import com.azure.cosmos.models.CosmosQueryRequestOptions;
@@ -51,7 +50,6 @@
  *
  */
 
-// TODO change to use external TestSuiteBase
 public class ResourceTokenTest extends TestSuiteBase {
     public final String databaseId = DatabaseForTest.generateId();
 
@@ -96,7 +94,7 @@ public class ResourceTokenTest extends TestSuiteBase {
     private static final String PERMISSION_FOR_DOC = "PermissionForDoc";
     private static final String PERMISSION_FOR_DOC_WITH_NAME = "PermissionForDocWithName";
 
-    @Factory(dataProvider = "clientBuilders")
+    @Factory(dataProvider = "internalClientBuilders")
     public ResourceTokenTest(AsyncDocumentClient.Builder clientBuilder) {
         super(clientBuilder);
     }
@@ -277,7 +275,7 @@ public void readCollectionFromPermissionFeed(String collectionUrl, Permission pe
 
             ResourceResponseValidator<DocumentCollection> validator = new ResourceResponseValidator.Builder<DocumentCollection>()
                    .withId(createdCollection.getId()).build();
-            validateSuccess(readObservable, validator);
+            validateResourceResponseSuccess(readObservable, validator);
         } finally {
             safeClose(asyncClientResourceToken);
         }
@@ -319,7 +317,7 @@ public void readDocumentFromPermissionFeed(String documentUrl, Permission permis
                     .readDocument(documentUrl, options);
             ResourceResponseValidator<Document> validator = new ResourceResponseValidator.Builder<Document>()
                     .withId(documentId).build();
-            validateSuccess(readObservable, validator);
+            validateResourceResponseSuccess(readObservable, validator);
         } finally {
             safeClose(asyncClientResourceToken);
         }
@@ -350,7 +348,7 @@ public void readDocumentFromResouceToken(String resourceToken) throws Exception
                     .readDocument(createdDocument.getSelfLink(), options);
             ResourceResponseValidator<Document> validator = new ResourceResponseValidator.Builder<Document>()
                     .withId(createdDocument.getId()).build();
-            validateSuccess(readObservable, validator);
+            validateResourceResponseSuccess(readObservable, validator);
         } finally {
             safeClose(asyncClientResourceToken);
         }
@@ -386,7 +384,7 @@ public void readDocumentOfParKeyFromTwoCollPermissionWithDiffPartitionKeys(Strin
                     .readDocument(documentUrl, options);
             ResourceResponseValidator<Document> validator = new ResourceResponseValidator.Builder<Document>()
                     .withId(documentId).build();
-            validateSuccess(readObservable, validator);
+            validateResourceResponseSuccess(readObservable, validator);
         } finally {
             safeClose(asyncClientResourceToken);
         }
@@ -422,7 +420,7 @@ public void readDocumentFromCollPermissionWithDiffPartitionKey_ResourceNotFound(
             Mono<ResourceResponse<Document>> readObservable = asyncClientResourceToken
                     .readDocument(documentUrl, options);
             FailureValidator validator = new FailureValidator.Builder().resourceNotFound().build();
-            validateFailure(readObservable, validator);
+            validateResourceResponseFailure(readObservable, validator);
         } finally {
             safeClose(asyncClientResourceToken);
         }
@@ -454,7 +452,7 @@ public void readDocumentFromCollPermissionWithDiffPartitionKey_WithException() t
             Mono<ResourceResponse<Document>> readObservable = asyncClientResourceToken
                     .readDocument(createdDocumentWithPartitionKey.getSelfLink(), options);
             FailureValidator validator = new FailureValidator.Builder().resourceTokenNotFound().build();
-            validateFailure(readObservable, validator);
+            validateResourceResponseFailure(readObservable, validator);
         } finally {
             safeClose(asyncClientResourceToken);
         }

sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/rx/TestSuiteBase.java

@@ -269,6 +269,11 @@ public void beforeSuite() {
             SHARED_MULTI_PARTITION_COLLECTION_WITH_ID_AS_PARTITION_KEY = createCollection(SHARED_DATABASE, getCollectionDefinitionWithRangeRangeIndexWithIdAsPartitionKey(), options, 10100);
             SHARED_MULTI_PARTITION_COLLECTION_WITH_COMPOSITE_AND_SPATIAL_INDEXES = createCollection(SHARED_DATABASE, getCollectionDefinitionMultiPartitionWithCompositeAndSpatialIndexes(), options);
             SHARED_SINGLE_PARTITION_COLLECTION = createCollection(SHARED_DATABASE, getCollectionDefinitionWithRangeRangeIndex(), options, 6000);
+
+            // Initialize internal shared database for tests that use AsyncDocumentClient
+            Database internalDb = new Database();
+            internalDb.setId(SHARED_DATABASE.getId());
+            SHARED_DATABASE_FOR_INTERNAL_CLIENT = internalDb;
         }
     }