update test

Author: linglingye001

test/failover.test.ts

@@ -6,7 +6,7 @@ import * as chaiAsPromised from "chai-as-promised";
 chai.use(chaiAsPromised);
 const expect = chai.expect;
 import { load } from "./exportedApi";
-import { createMockedConnectionString, createMockedFeatureFlag, createMockedKeyValue, mockAppConfigurationClientListConfigurationSettingsWithFailure, mockConfigurationManagerGetClients, restoreMocks } from "./utils/testHelper";
+import { createMockedConnectionString, createMockedFeatureFlag, createMockedKeyValue, mockConfigurationManagerGetClients, restoreMocks } from "./utils/testHelper";
 import { getValidDomain, isValidEndpoint } from "../src/ConfigurationClientManager";
 
 const mockedKVs = [{
@@ -36,8 +36,7 @@ describe("failover", function () {
     it("should failover to replica and load key values from config store", async () => {
         const replicaDiscoveryEnabled = true;
         const isFailoverable = true;
-        mockConfigurationManagerGetClients(isFailoverable);
-        mockAppConfigurationClientListConfigurationSettingsWithFailure(mockedKVs);
+        mockConfigurationManagerGetClients(isFailoverable, mockedKVs);
 
         const connectionString = createMockedConnectionString();
         const settings = await load(connectionString, {
@@ -51,8 +50,7 @@ describe("failover", function () {
     it("should failover to replica and load feature flags from config store", async () => {
         const replicaDiscoveryEnabled = true;
         const isFailoverable = true;
-        mockConfigurationManagerGetClients(isFailoverable);
-        mockAppConfigurationClientListConfigurationSettingsWithFailure(mockedFeatureFlags);
+        mockConfigurationManagerGetClients(isFailoverable, mockedFeatureFlags);
 
         const connectionString = createMockedConnectionString();
         const settings = await load(connectionString, {
@@ -72,7 +70,6 @@ describe("failover", function () {
     it("should throw error when all clients failed", async () => {
         const isFailoverable = false;
         mockConfigurationManagerGetClients(isFailoverable);
-        mockAppConfigurationClientListConfigurationSettingsWithFailure();
 
         const connectionString = createMockedConnectionString();
         return expect(load(connectionString)).eventually.rejectedWith("All clients failed to get configuration settings.");

test/utils/testHelper.ts

@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 import * as sinon from "sinon";
-import { AppConfigurationClient, AppConfigurationClientOptions, ConfigurationSetting } from "@azure/app-configuration";
+import { AppConfigurationClient, ConfigurationSetting } from "@azure/app-configuration";
 import { ClientSecretCredential } from "@azure/identity";
 import { KeyVaultSecret, SecretClient } from "@azure/keyvault-secrets";
 import * as uuid from "uuid";
@@ -100,22 +100,28 @@ function mockAppConfigurationClientListConfigurationSettings(...pages: Configura
     });
 }
 
-function mockConfigurationManagerGetClients(isFailoverable: boolean, clientOptions?: AppConfigurationClientOptions) {
+function mockConfigurationManagerGetClients(isFailoverable: boolean, ...pages: ConfigurationSetting[][]) {
     // Stub the getClients method on the class prototype
     sinon.stub(ConfigurationClientManager.prototype, "getClients").callsFake(async () => {
         const clients: ConfigurationClientWrapper[] = [];
         const fakeEndpoint = createMockedEndpoint("fake");
-        const fakeStaticClientWrapper = new ConfigurationClientWrapper(fakeEndpoint, new AppConfigurationClient(createMockedConnectionString(fakeEndpoint), clientOptions));
+        const fakeStaticClientWrapper = new ConfigurationClientWrapper(fakeEndpoint, new AppConfigurationClient(createMockedConnectionString(fakeEndpoint)));
+        sinon.stub(fakeStaticClientWrapper.client, "listConfigurationSettings").callsFake(() => {
+            throw new RestError("Internal Server Error", { statusCode: 500 });
+        });
         clients.push(fakeStaticClientWrapper);
 
         if (!isFailoverable) {
             return clients;
         }
 
         const fakeReplicaEndpoint = createMockedEndpoint("fake-replica");
-        const fakeDynamicClientWrapper = new ConfigurationClientWrapper(fakeReplicaEndpoint, new AppConfigurationClient(createMockedConnectionString(fakeReplicaEndpoint), clientOptions));
+        const fakeDynamicClientWrapper = new ConfigurationClientWrapper(fakeReplicaEndpoint, new AppConfigurationClient(createMockedConnectionString(fakeReplicaEndpoint)));
         clients.push(fakeDynamicClientWrapper);
-
+        sinon.stub(fakeDynamicClientWrapper.client, "listConfigurationSettings").callsFake((listOptions) => {
+            const kvs = _filterKVs(pages.flat(), listOptions);
+            return getMockedIterator(pages, kvs, listOptions);
+        });
         return clients;
     });
 }
@@ -135,17 +141,6 @@ function mockAppConfigurationClientGetConfigurationSetting(kvList) {
     });
 }
 
-function mockAppConfigurationClientListConfigurationSettingsWithFailure(...pages: ConfigurationSetting[][]) {
-    const stub = sinon.stub(AppConfigurationClient.prototype, "listConfigurationSettings");
-
-    // Configure the stub to throw an error on the first call and return mockedKVs on the second call
-    stub.onFirstCall().throws(new RestError("Internal Server Error", { statusCode: 500 }));
-    stub.callsFake((listOptions) => {
-        const kvs = _filterKVs(pages.flat(), listOptions);
-        return getMockedIterator(pages, kvs, listOptions);
-    });
-}
-
 // uriValueList: [["<secretUri>", "value"], ...]
 function mockSecretClientGetSecret(uriValueList: [string, string][]) {
     const dict = new Map();
@@ -235,7 +230,6 @@ export {
     sinon,
     mockAppConfigurationClientListConfigurationSettings,
     mockAppConfigurationClientGetConfigurationSetting,
-    mockAppConfigurationClientListConfigurationSettingsWithFailure,
     mockConfigurationManagerGetClients,
     mockSecretClientGetSecret,
     restoreMocks,