Skip to content

Commit 52b35d2

Browse files
zhushusunzhushusun
committed
优化ut，修改断言和timeout review by songym
1 parent 64c90d9 commit 52b35d2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+318
-188
lines changed

‎test/leaflet/services/EditFeaturesLineSpec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ describe('leaflet_FeatureService_editFeatures_Line', () => {
2929
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
3030
expect(method).toBe("POST");
3131
expect(testUrl).toBe(editServiceURL + "/datasources/Jingjin/datasets/Geomor_L/features.json?returnContent=true");
32-
expect(params).not.toBeNull();
33-
expect(params).toContain("'type':\"LINE\"");
32+
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
33+
expect(paramsObj[0].geometry.type).toBe("LINE");
3434
expect(options).not.toBeNull();
3535
return Promise.resolve(new Response(`[98]`));
3636
});

‎test/leaflet/services/EditFeaturesPointSpec.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ describe('leaflet_FeatureService_editFeatures_Point', () => {
3131
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
3232
expect(method).toBe("POST");
3333
expect(testUrl).toBe(editServiceURL + "/datasources/Jingjin/datasets/Neighbor_P/features.json?returnContent=true");
34-
expect(params).not.toBeNull();
35-
expect(params).toContain("'type':\"POINT\"");
34+
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
35+
expect(paramsObj[0].geometry.type).toBe("POINT");
3636
expect(options).not.toBeNull();
3737
return Promise.resolve(new Response(`[92]`));
3838
});
@@ -76,8 +76,8 @@ describe('leaflet_FeatureService_editFeatures_Point', () => {
7676
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
7777
expect(method).toBe("POST");
7878
expect(testUrl).toBe(editServiceURL + "/datasources/Jingjin/datasets/Neighbor_P/features.json?isUseBatch=true");
79-
expect(params).not.toBeNull();
80-
expect(params).toContain("'type':\"Point\"");
79+
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
80+
expect(paramsObj[0].geometry.type).toBe("POINT");
8181
expect(options).not.toBeNull();
8282
return Promise.resolve(new Response(`{"postResultType":"CreateChild","succeed":true}`));
8383
});

‎test/leaflet/services/EditFeaturesRegionSpec.js‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ describe('leaflet_FeatureService_editFeatures_Region', () => {
3333
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
3434
expect(method).toBe("POST");
3535
expect(testUrl).toBe(editServiceURL + "/datasources/Jingjin/datasets/Landuse_R/features.json?returnContent=true");
36-
expect(params).not.toBeNull();
37-
expect(params).toContain("'type':\"REGION\"");
36+
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
37+
expect(paramsObj[0].geometry.type).toBe("REGION");
3838
expect(options).not.toBeNull();
3939
return Promise.resolve(new Response(`[115]`));
4040
});
@@ -78,8 +78,8 @@ describe('leaflet_FeatureService_editFeatures_Region', () => {
7878
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
7979
expect(method).toBe("POST");
8080
expect(testUrl).toBe(editServiceURL + "/datasources/Jingjin/datasets/Landuse_R/features.json?");
81-
expect(params).not.toBeNull();
82-
expect(params).toContain("'type':\"REGION\"");
81+
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
82+
expect(paramsObj[0].geometry.type).toBe("REGION");
8383
expect(options).not.toBeNull();
8484
return Promise.resolve(new Response(`{"postResultType":"CreateChild","newResourceID":"c01d29d8d41743adb673cd1cecda6ed0_78a67b1809614341b9314f311a47c1d4","succeed":true,"newResourceLocation":"http://localhost:8090/iserver/services/data-jingjin/rest/data/featureResults/c01d29d8d41743adb673cd1cecda6ed0_78a67b1809614341b9314f311a47c1d4.json"}`));
8585
});
@@ -159,8 +159,8 @@ describe('leaflet_FeatureService_editFeatures_Region', () => {
159159
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
160160
expect(method).toBe("POST");
161161
expect(testUrl).toBe(editServiceURL + "/featureResults.json?returnContent=true&fromIndex=0&toIndex=19");
162-
expect(params).not.toBeNull();
163-
expect(params).toContain("'datasetNames':[\"Jingjin:Landuse_R\"]");
162+
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
163+
expect(paramsObj.datasetNames[0]).toContain("Jingjin:Landuse_R");
164164
expect(options).not.toBeNull();
165165
return Promise.resolve(new Response(JSON.stringify(getFeatureResultJson)));
166166
});
@@ -199,7 +199,8 @@ describe('leaflet_FeatureService_editFeatures_Region', () => {
199199
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
200200
expect(method).toBe("PUT");
201201
expect(testUrl).toBe(editServiceURL + "/datasources/Jingjin/datasets/Landuse_R/features.json?");
202-
expect(params).not.toBeNull();
202+
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
203+
expect(paramsObj[0].geometry.type).toBe("REGION");
203204
expect(options).not.toBeNull();
204205
return Promise.resolve(new Response(`{"succeed":true}`));
205206
});

‎test/leaflet/services/GenerateSpatialDataSpec.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import {spatialAnalystService} from '../../../src/leaflet/services/SpatialAnalystService';
2-
import {GenerateSpatialDataParameters} from '../../../src/common/iServer/GenerateSpatialDataParameters';
3-
import {DataReturnOption} from '../../../src/common/iServer/DataReturnOption';
4-
import {DataReturnMode} from '../../../src/common/REST';
1+
import { spatialAnalystService } from '../../../src/leaflet/services/SpatialAnalystService';
2+
import { GenerateSpatialDataParameters } from '../../../src/common/iServer/GenerateSpatialDataParameters';
3+
import { DataReturnOption } from '../../../src/common/iServer/DataReturnOption';
4+
import { DataReturnMode } from '../../../src/common/REST';
55
import request from 'request';
66
import { FetchRequest } from '../../../src/common/util/FetchRequest';
77

@@ -45,7 +45,8 @@ describe('leaflet_SpatialAnalystService_generateSpatialData', () => {
4545
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
4646
expect(method).toBe("POST");
4747
expect(testUrl).toBe(spatialAnalystURL + "/datasets/RouteDT_road@Changchun/linearreferencing/generatespatialdata.json?returnContent=true");
48-
expect(params).toContain("'eventRouteIDField':\"RouteID\"");
48+
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
49+
expect(paramsObj.eventRouteIDField).toBe("RouteID");
4950
expect(options).not.toBeNull();
5051
var resultJSON = `{"succeed":true,"recordset":null,"message":null,"dataset":"GenerateSpatialData_leafletTest@Changchun"}`;
5152
return Promise.resolve(new Response(resultJSON));

‎test/leaflet/services/GeoRelationAnalysisSpec.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ describe('leaflet_SpatialAnalystService_geoRelationAnalysis', () => {
3737
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
3838
expect(method).toBe("POST");
3939
expect(testUrl).toBe(url + "/datasets/Park@Changchun/georelation.json?returnContent=true");
40-
expect(params).toContain("'spatialRelationType':\"INTERSECT\"");
40+
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
41+
expect(paramsObj.spatialRelationType).toBe("INTERSECT");
42+
// expect(params).toContain("'spatialRelationType':\"INTERSECT\"");
4143
expect(options).not.toBeNull();
4244
var geoRelationAnalystEscapedJson = `[{"result":[1],"count":1,"source":1},{"result":[1],"count":1,"source":2},{"result":[1],"count":1,"source":3},{"result":[1],"count":1,"source":4},{"result":[1],"count":1,"source":5}]`;
4345
return Promise.resolve(new Response(geoRelationAnalystEscapedJson));

‎test/leaflet/services/GeometryBatchAnalysisSpec.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,12 @@ describe('leaflet_SpatialAnalystService_geometryBatchAnalysis', () => {
8282
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
8383
expect(method).toBe("POST");
8484
expect(testUrl).toBe(serviceUrl + "/geometry/batchanalyst.json?returnContent=true&ignoreAnalystParam=true");
85-
expect(params).not.toBeNull();
86-
expect(params).toContain("'operation':\"CLIP\"");
85+
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
86+
expect(paramsObj[0].analystName).toBe("buffer");
87+
expect(paramsObj[0].param.analystParameter.endType).toBe("ROUND");
88+
expect(paramsObj[0].param.analystParameter.leftDistance.value).toEqual(0.05);
89+
expect(paramsObj[1].analystName).toBe("overlay");
90+
expect(paramsObj[1].param.operation).toBe("CLIP");
8791
expect(options).not.toBeNull();
8892
return Promise.resolve(new Response(JSON.stringify(geometryBatchAnalystEscapedJson)));
8993
});

‎test/leaflet/services/GetFeaturesByBoundsSpec.js‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ describe('leaflet_FeatureService_getFeaturesByBounds', () => {
3030
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
3131
expect(method).toBe("POST");
3232
expect(testUrl).toBe(dataServiceURL + "/featureResults.json?returnContent=true&fromIndex=0&toIndex=19");
33-
expect(params).toContain("'datasetNames':[\"World:Capitals\"]");
33+
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
34+
expect(paramsObj.datasetNames[0]).toBe("World:Capitals");
35+
expect(paramsObj.getFeatureMode).toBe("BOUNDS");
36+
expect(paramsObj.spatialQueryMode).toBe("CONTAIN");
3437
expect(options).not.toBeNull();
3538
return Promise.resolve(new Response(JSON.stringify(getFeaturesResultJson)));
3639
});
@@ -79,7 +82,10 @@ describe('leaflet_FeatureService_getFeaturesByBounds', () => {
7982
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
8083
expect(method).toBe("POST");
8184
expect(testUrl).toBe(dataServiceURL + "/featureResults.json?");
82-
expect(params).toContain("'datasetNames':[\"World:Capitals\"]");
85+
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
86+
expect(paramsObj.datasetNames[0]).toBe("World:Capitals");
87+
expect(paramsObj.getFeatureMode).toBe("BOUNDS");
88+
expect(paramsObj.spatialQueryMode).toBe("CONTAIN");
8389
expect(options).not.toBeNull();
8490
return Promise.resolve(new Response(`{"postResultType":"CreateChild","newResourceID":"c01d29d8d41743adb673cd1cecda6ed0_7ceca76cc8b34309a640d38555902d5d","succeed":true,"newResourceLocation":"http://localhost:8090/iserver/services/data-world/rest/data/featureResults/c01d29d8d41743adb673cd1cecda6ed0_7ceca76cc8b34309a640d38555902d5d.json"}`));
8591
});
@@ -116,7 +122,11 @@ describe('leaflet_FeatureService_getFeaturesByBounds', () => {
116122
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
117123
expect(method).toBe("POST");
118124
expect(testUrl).toBe(dataServiceURL + "/featureResults.json?returnContent=true&fromIndex=0&toIndex=19");
119-
expect(params).toContain("'datasetNames':[\"World1:Capitals\"");
125+
// expect(params).toContain("'datasetNames':[\"World1:Capitals\"");
126+
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
127+
expect(paramsObj.datasetNames[0]).toBe("World1:Capitals");
128+
expect(paramsObj.getFeatureMode).toBe("BOUNDS");
129+
expect(paramsObj.spatialQueryMode).toBe("CONTAIN");
120130
expect(options).not.toBeNull();
121131
return Promise.resolve(new Response(`{"succeed":false,"error":{"code":400,"errorMsg":"数据源World1不存在，获取相应的数据服务组件失败"}}`));
122132
});

‎test/leaflet/services/GetFeaturesByBufferSpec.js‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@ describe('leaflet_FeatureService_getFeaturesByBuffer', () => {
3434
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
3535
expect(method).toBe("POST");
3636
expect(testUrl).toBe(dataServiceURL + "/featureResults.json?returnContent=true&fromIndex=0&toIndex=19");
37-
expect(params).toContain("'attributeFilter':\"SMID%26gt;0\"");
38-
expect(params).toContain("'datasetNames':[\"World:Capitals\"]");
37+
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
38+
expect(paramsObj.datasetNames[0]).toBe("World:Capitals");
39+
expect(paramsObj.attributeFilter).toBe("SMID%26gt;0");
40+
// expect(params).toContain("'attributeFilter':\"SMID%26gt;0\"");
3941
expect(options).not.toBeNull();
4042
return Promise.resolve(new Response(JSON.stringify(getFeaturesResultJson)));
4143
});
@@ -86,8 +88,10 @@ describe('leaflet_FeatureService_getFeaturesByBuffer', () => {
8688
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
8789
expect(method).toBe("POST");
8890
expect(testUrl).toBe(dataServiceURL + "/featureResults.json?");
89-
expect(params).toContain("'attributeFilter':\"SMID%26gt;0\"");
90-
expect(params).toContain("'bufferDistance':30");
91+
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
92+
expect(paramsObj.datasetNames[0]).toBe("World:Capitals");
93+
expect(paramsObj.attributeFilter).toBe("SMID%26gt;0");
94+
expect(paramsObj.bufferDistance).toBe(30);
9195
expect(options).not.toBeNull();
9296
return Promise.resolve(new Response(`{"postResultType":"CreateChild","newResourceID":"c01d29d8d41743adb673cd1cecda6ed0_02c1636b347046d9b1428bce7118c4df","succeed":true,"newResourceLocation":"http://localhost:8090/iserver/services/data-world/rest/data/featureResults/c01d29d8d41743adb673cd1cecda6ed0_02c1636b347046d9b1428bce7118c4df.json"}`));
9397
});
@@ -126,8 +130,10 @@ describe('leaflet_FeatureService_getFeaturesByBuffer', () => {
126130
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
127131
expect(method).toBe("POST");
128132
expect(testUrl).toBe(dataServiceURL + "/featureResults.json?returnContent=true&fromIndex=0&toIndex=19");
129-
expect(params).toContain("'attributeFilter':\"SMID%26gt;0\"");
130-
expect(params).toContain("'bufferDistance':30");
133+
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
134+
expect(paramsObj.datasetNames[0]).toBe("World1:Capitals");
135+
expect(paramsObj.attributeFilter).toBe("SMID%26gt;0");
136+
expect(paramsObj.bufferDistance).toBe(30);
131137
expect(options).not.toBeNull();
132138
return Promise.resolve(new Response(`{"succeed":false,"error":{"code":400,"errorMsg":"数据源World1不存在，获取相应的数据服务组件失败"}}`));
133139
});
@@ -164,8 +170,9 @@ describe('leaflet_FeatureService_getFeaturesByBuffer', () => {
164170
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
165171
expect(method).toBe("POST");
166172
expect(testUrl).toBe(dataServiceURL + "/featureResults.json?returnContent=true&fromIndex=0&toIndex=19");
167-
expect(params).toContain("'attributeFilter':\"SMID%26gt;0\"");
168-
expect(params).toContain("'bufferDistance':30");
173+
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
174+
expect(paramsObj.attributeFilter).toBe("SMID%26gt;0");
175+
expect(paramsObj.bufferDistance).toBe(30);
169176
expect(options).not.toBeNull();
170177
return Promise.resolve(new Response(`{"succeed":false,"error":{"code":400,"errorMsg":"在FeatureResults中，在检验请求体时，请求体参数datasetNames为空"}}`));
171178
});

‎test/leaflet/services/GetFeaturesByGeometrySpec.js‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ describe('leaflet_FeatureService_getFeaturesByGeometry', () => {
3030
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
3131
expect(method).toBe("POST");
3232
expect(testUrl).toBe(dataServiceURL + "/featureResults.json?returnContent=true&fromIndex=0&toIndex=19");
33-
expect(params).toContain("'spatialQueryMode':\"INTERSECT\"");
34-
expect(params).toContain("'datasetNames':[\"World:Countries\"]");
33+
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
34+
expect(paramsObj.datasetNames[0]).toBe("World:Countries");
35+
expect(paramsObj.spatialQueryMode).toBe("INTERSECT");
3536
expect(options).not.toBeNull();
3637
return Promise.resolve(new Response(JSON.stringify(getFeaturesResultJson)));
3738
});
@@ -81,8 +82,9 @@ describe('leaflet_FeatureService_getFeaturesByGeometry', () => {
8182
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
8283
expect(method).toBe("POST");
8384
expect(testUrl).toBe(dataServiceURL + "/featureResults.json?");
84-
expect(params).toContain("'spatialQueryMode':\"INTERSECT\"");
85-
expect(params).toContain("'datasetNames':[\"World:Countries\"]");
85+
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
86+
expect(paramsObj.datasetNames[0]).toBe("World:Countries");
87+
expect(paramsObj.spatialQueryMode).toBe("INTERSECT");
8688
expect(options).not.toBeNull();
8789
return Promise.resolve(new Response(`{"postResultType":"CreateChild","newResourceID":"c01d29d8d41743adb673cd1cecda6ed0_952187de2cde43a6bcfff2938c93dd9f","succeed":true,"newResourceLocation":"http://localhost:8090/iserver/services/data-world/rest/data/featureResults/c01d29d8d41743adb673cd1cecda6ed0_952187de2cde43a6bcfff2938c93dd9f.json"}`));
8890
});
@@ -120,7 +122,9 @@ describe('leaflet_FeatureService_getFeaturesByGeometry', () => {
120122
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
121123
expect(method).toBe("POST");
122124
expect(testUrl).toBe(dataServiceURL + "/featureResults.json?returnContent=true&fromIndex=0&toIndex=19");
123-
expect(params).toContain("'datasetNames':[\"World1:Countries\"]");
125+
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
126+
expect(paramsObj.datasetNames[0]).toBe("World1:Countries");
127+
expect(paramsObj.spatialQueryMode).toBe("CONTAIN");
124128
expect(options).not.toBeNull();
125129
return Promise.resolve(new Response(`{"succeed":false,"error":{"code":400,"errorMsg":"数据源World1不存在，获取相应的数据服务组件失败"}}`));
126130
});
@@ -154,7 +158,9 @@ describe('leaflet_FeatureService_getFeaturesByGeometry', () => {
154158
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
155159
expect(method).toBe("POST");
156160
expect(testUrl).toBe(dataServiceURL + "/featureResults.json?returnContent=true&fromIndex=0&toIndex=19");
157-
expect(params).toContain("'datasetNames':[\"World:Countries\"]");
161+
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
162+
expect(paramsObj.datasetNames[0]).toBe("World:Countries");
163+
expect(paramsObj.spatialQueryMode).toBe("CONTAIN");
158164
expect(options).not.toBeNull();
159165
return Promise.resolve(new Response(`{"succeed":false,"error":{"code":400,"errorMsg":"getFeatureByBuffer方法中传入的参数为空"}}`));
160166
});

0 commit comments

Comments
 (0)