@itwin/map-layers-formats 3.6.0-dev.8 → 4.0.0-dev.10

package/src/test/ArcGisFeature/ArcGisFeatureProvider.test.ts

@@ -34,8 +34,8 @@ describe("ArcGisFeatureProvider", () => {
 
   it("should initialize with valid data", async () => {
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return NewYorkDataset.serviceCapabilities;
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:NewYorkDataset.serviceCapabilities};
     });
 
     sandbox.stub(ArcGisFeatureProvider.prototype, "getLayerMetadata" as any).callsFake(async function _(_layerId: number) {
@@ -52,7 +52,7 @@ describe("ArcGisFeatureProvider", () => {
 
   it("should not initialize with no service metadata", async () => {
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
       return undefined;
     });
 
@@ -65,8 +65,8 @@ describe("ArcGisFeatureProvider", () => {
 
   it("should update status when invalid token error from service", async () => {
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {error: {code: 499}};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{error: {code: 499}}};
     });
 
     const settings = ImageMapLayerSettings.fromJSON(esriFeatureSampleSource);
@@ -80,8 +80,8 @@ describe("ArcGisFeatureProvider", () => {
 
   it("should throw    query capability not supported", async () => {
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Test"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{capabilities: "Test"}};
     });
 
     const settings = ImageMapLayerSettings.fromJSON(esriFeatureSampleSource);
@@ -91,8 +91,8 @@ describe("ArcGisFeatureProvider", () => {
 
   it("should pick the first visible sub-layer when multiple visible sub-layers", async () => {
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content: {capabilities: "Query"}};
     });
 
     const settings = ImageMapLayerSettings.fromJSON({
@@ -107,8 +107,8 @@ describe("ArcGisFeatureProvider", () => {
 
   it("should pick sub-layers from service metadata if none provided on layer settings", async () => {
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query",
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content: {capabilities: "Query",
         layers: [
           {
             id : 0,
@@ -117,7 +117,8 @@ describe("ArcGisFeatureProvider", () => {
           {
             id : 1,
           },
-        ]};
+        ]},
+      };
     });
 
     sandbox.stub((ArcGisFeatureProvider.prototype as any), "getLayerMetadata").callsFake(async function (id: number) {
@@ -137,9 +138,8 @@ describe("ArcGisFeatureProvider", () => {
 
   it("should throw error if no layers in capabilities", async () => {
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query",
-        layers: []};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content: {capabilities: "Query", layers: []}};
     });
 
     const settings = ImageMapLayerSettings.fromJSON(esriFeatureSampleSource);
@@ -154,8 +154,8 @@ describe("ArcGisFeatureProvider", () => {
       subLayers: [{id: 0, name: "layer1", visible:true}, {id:2, name: "layer2", visible:true}]}
     );
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{capabilities: "Query"}};
     });
     sandbox.stub((ArcGisFeatureProvider.prototype as any), "getLayerMetadata").callsFake(async function (_id: number) {
       return undefined;
@@ -176,8 +176,8 @@ describe("ArcGisFeatureProvider", () => {
       return {defaultVisibility:true, supportedQueryFormats:"PBF, JSON"};
     });
 
-    const getServiceJsonStub = sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query"};
+    const getServiceJsonStub = sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content: {capabilities: "Query"}};
     });
 
     let provider = new ArcGisFeatureProvider(settings);
@@ -186,8 +186,8 @@ describe("ArcGisFeatureProvider", () => {
 
     // PBF requires 'supportsCoordinatesQuantization'
     getServiceJsonStub.restore();
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return { currentVersion: 11, capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content: { currentVersion: 11, capabilities: "Query"}};
     });
     getLayerMetadataStub.restore();
     getLayerMetadataStub = sandbox.stub((ArcGisFeatureProvider.prototype as any), "getLayerMetadata").callsFake(async function (_id: number) {
@@ -204,8 +204,8 @@ describe("ArcGisFeatureProvider", () => {
     });
 
     getServiceJsonStub.restore();
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return { currentVersion: 10.91, capabilities: "Query", supportsCoordinatesQuantization:true};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content: { currentVersion: 10.91, capabilities: "Query", supportsCoordinatesQuantization:true}};
     });
 
     provider = new ArcGisFeatureProvider(settings);
@@ -246,8 +246,8 @@ describe("ArcGisFeatureProvider", () => {
       };
     });
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{capabilities: "Query"}};
     });
 
     const provider = new ArcGisFeatureProvider(settings);
@@ -279,8 +279,8 @@ describe("ArcGisFeatureProvider", () => {
       };
     });
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {currentVersion: 11, capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{currentVersion: 11, capabilities: "Query"}};
     });
 
     const provider = new ArcGisFeatureProvider(settings);
@@ -379,8 +379,8 @@ describe("ArcGisFeatureProvider", () => {
       };
     });
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {currentVersion: 11, capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{currentVersion: 11, capabilities: "Query"}};
     });
     sandbox.stub(ArcGisFeatureProvider.prototype, "constructFeatureUrl").callsFake(function _(_row: number, _column: number, _zoomLevel: number, _format: ArcGisFeatureFormat, _geomOverride?: ArcGisGeometry, _outFields?: string, _tolerance?: number, _returnGeometry?: boolean) {
       return undefined;
@@ -413,8 +413,8 @@ describe("ArcGisFeatureProvider", () => {
       };
     });
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {currentVersion: 11, capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{currentVersion: 11, capabilities: "Query"}};
     });
     sandbox.stub((ArcGISImageryProvider.prototype as any), "fetch").callsFake(async  function _(_url: URL, _options?: RequestInit) {
       const test = {
@@ -452,8 +452,8 @@ describe("ArcGisFeatureProvider", () => {
         maxScale: 5000,
       };
     });
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{capabilities: "Query"}};
     });
 
     sandbox.stub((ArcGisFeatureResponse.prototype as any), "getResponseData").callsFake(async  function _() {
@@ -484,8 +484,8 @@ describe("ArcGisFeatureProvider", () => {
         maxScale: 5000,
       };
     });
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{capabilities: "Query"}};
     });
 
     sandbox.stub((ArcGisFeatureResponse.prototype as any), "getResponseData").callsFake(async  function _() {
@@ -516,8 +516,8 @@ describe("ArcGisFeatureProvider", () => {
         maxScale: 5000,
       };
     });
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{capabilities: "Query"}};
     });
 
     sandbox.stub((ArcGisFeatureResponse.prototype as any), "getResponseData").callsFake(async  function _() {
@@ -597,8 +597,8 @@ describe("ArcGisFeatureProvider", () => {
         supportsCoordinatesQuantization:true,
       };
     });
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {currentVersion: 11, capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{currentVersion: 11, capabilities: "Query"}};
     });
     sandbox.stub(HTMLCanvasElement.prototype, "getContext").callsFake( function _(_contextId: any, _options?: any) {
       return {} as RenderingContext;
@@ -646,8 +646,8 @@ describe("ArcGisFeatureProvider", () => {
         supportedQueryFormats:"JSON",
       };
     });
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{capabilities: "Query"}};
     });
     sandbox.stub(HTMLCanvasElement.prototype, "getContext").callsFake( function _(_contextId: any, _options?: any) {
       return {} as RenderingContext;
@@ -693,8 +693,8 @@ describe("ArcGisFeatureProvider", () => {
         supportedQueryFormats:"JSON",
       };
     });
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{capabilities: "Query"}};
     });
     sandbox.stub(HTMLCanvasElement.prototype, "getContext").callsFake( function _(_contextId: any, _options?: any) {
       return {} as RenderingContext;
@@ -783,8 +783,8 @@ describe("ArcGisFeatureProvider", () => {
         supportedQueryFormats:"JSON",
       };
     });
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{capabilities: "Query"}};
     });
     const fetchStub = sandbox.stub((ArcGISImageryProvider.prototype as any), "fetch");