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, mockAppConfigurationClientListConfigurationSettings, mockAppConfigurationClientListConfigurationSettingsWithFailure, mockConfigurationManagerGetClients, restoreMocks } from "./utils/testHelper";
+import { createMockedConnectionString, createMockedFeatureFlag, createMockedKeyValue, mockAppConfigurationClientListConfigurationSettingsWithFailure, mockConfigurationManagerGetClients, restoreMocks } from "./utils/testHelper";
 import { getValidDomain, isValidEndpoint } from "../src/ConfigurationClientManager";
 
 const mockedKVs = [{
@@ -37,9 +37,7 @@ describe("failover", function () {
         const replicaDiscoveryEnabled = true;
         const isFailoverable = true;
         mockConfigurationManagerGetClients(isFailoverable);
-        mockAppConfigurationClientListConfigurationSettingsWithFailure();
-        restoreMocks();
-        mockAppConfigurationClientListConfigurationSettings(mockedKVs);
+        mockAppConfigurationClientListConfigurationSettingsWithFailure(mockedKVs);
 
         const connectionString = createMockedConnectionString();
         const settings = await load(connectionString, {
@@ -54,9 +52,7 @@ describe("failover", function () {
         const replicaDiscoveryEnabled = true;
         const isFailoverable = true;
         mockConfigurationManagerGetClients(isFailoverable);
-        mockAppConfigurationClientListConfigurationSettingsWithFailure();
-        restoreMocks();
-        mockAppConfigurationClientListConfigurationSettings(mockedFeatureFlags);
+        mockAppConfigurationClientListConfigurationSettingsWithFailure(mockedFeatureFlags);
 
         const connectionString = createMockedConnectionString();
         const settings = await load(connectionString, {

test/utils/testHelper.ts

@@ -40,6 +40,50 @@ function _filterKVs(unfilteredKvs: ConfigurationSetting[], listOptions: any) {
     });
 }
 
+function getMockedIterator(pages: ConfigurationSetting[][], kvs: ConfigurationSetting[], listOptions: any) {
+    const mockIterator: AsyncIterableIterator<any> & { byPage(): AsyncIterableIterator<any> } = {
+        [Symbol.asyncIterator](): AsyncIterableIterator<any> {
+            kvs = _filterKVs(pages.flat(), listOptions);
+            return this;
+        },
+        next() {
+            const value = kvs.shift();
+            return Promise.resolve({ done: !value, value });
+        },
+        byPage(): AsyncIterableIterator<any> {
+            let remainingPages;
+            const pageEtags = listOptions?.pageEtags ? [...listOptions.pageEtags] : undefined; // a copy of the original list
+            return {
+                [Symbol.asyncIterator](): AsyncIterableIterator<any> {
+                    remainingPages = [...pages];
+                    return this;
+                },
+                next() {
+                    const pageItems = remainingPages.shift();
+                    const pageEtag = pageEtags?.shift();
+                    if (pageItems === undefined) {
+                        return Promise.resolve({ done: true, value: undefined });
+                    } else {
+                        const items = _filterKVs(pageItems ?? [], listOptions);
+                        const etag = _sha256(JSON.stringify(items));
+                        const statusCode = pageEtag === etag ? 304 : 200;
+                        return Promise.resolve({
+                            done: false,
+                            value: {
+                                items,
+                                etag,
+                                _response: { status: statusCode }
+                            }
+                        });
+                    }
+                }
+            };
+        }
+    };
+
+    return mockIterator as any;
+}
+
 /**
  * Mocks the listConfigurationSettings method of AppConfigurationClient to return the provided pages of ConfigurationSetting.
  * E.g.
@@ -51,48 +95,8 @@ function _filterKVs(unfilteredKvs: ConfigurationSetting[], listOptions: any) {
 function mockAppConfigurationClientListConfigurationSettings(...pages: ConfigurationSetting[][]) {
 
     sinon.stub(AppConfigurationClient.prototype, "listConfigurationSettings").callsFake((listOptions) => {
-        let kvs = _filterKVs(pages.flat(), listOptions);
-        const mockIterator: AsyncIterableIterator<any> & { byPage(): AsyncIterableIterator<any> } = {
-            [Symbol.asyncIterator](): AsyncIterableIterator<any> {
-                kvs = _filterKVs(pages.flat(), listOptions);
-                return this;
-            },
-            next() {
-                const value = kvs.shift();
-                return Promise.resolve({ done: !value, value });
-            },
-            byPage(): AsyncIterableIterator<any> {
-                let remainingPages;
-                const pageEtags = listOptions?.pageEtags ? [...listOptions.pageEtags] : undefined; // a copy of the original list
-                return {
-                    [Symbol.asyncIterator](): AsyncIterableIterator<any> {
-                        remainingPages = [...pages];
-                        return this;
-                    },
-                    next() {
-                        const pageItems = remainingPages.shift();
-                        const pageEtag = pageEtags?.shift();
-                        if (pageItems === undefined) {
-                            return Promise.resolve({ done: true, value: undefined });
-                        } else {
-                            const items = _filterKVs(pageItems ?? [], listOptions);
-                            const etag = _sha256(JSON.stringify(items));
-                            const statusCode = pageEtag === etag ? 304 : 200;
-                            return Promise.resolve({
-                                done: false,
-                                value: {
-                                    items,
-                                    etag,
-                                    _response: { status: statusCode }
-                                }
-                            });
-                        }
-                    }
-                };
-            }
-        };
-
-        return mockIterator as any;
+        const kvs = _filterKVs(pages.flat(), listOptions);
+        return getMockedIterator(pages, kvs, listOptions);
     });
 }
 
@@ -131,11 +135,15 @@ function mockAppConfigurationClientGetConfigurationSetting(kvList) {
     });
 }
 
-function mockAppConfigurationClientListConfigurationSettingsWithFailure() {
+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"], ...]