Skip to content

Commit ebe1838

Browse files
chenxianhuiichenxianhuii
committed
fix UT
1 parent 26d696e commit ebe1838

File tree

7 files changed

+44
-14
lines changed

7 files changed

+44
-14
lines changed

‎test/leaflet/services/MinDistanceAnalysisSpec.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import {SpatialAnalystService} from '../../../src/leaflet/services/SpatialAnalys
22
import {DatasetMinDistanceAnalystParameters} from '../../../src/common/iServer/DatasetMinDistanceAnalystParameters';
33
import {GeometryMinDistanceAnalystParameters} from '../../../src/common/iServer/GeometryMinDistanceAnalystParameters';
44
import { FetchRequest } from '@supermap/iclient-common/util/FetchRequest';
5-
import { Point } from '../../../src/common/commontypes/geometry/Point';
65

76
var url = GlobeParameter.spatialAnalystURL;
87
var options = {
@@ -54,8 +53,15 @@ describe('leaflet_SpatialAnalystService_minDistanceAnalysis', () => {
5453
});
5554
});
5655
it('minDistanceAnalysis_byGeometry', (done) => {
56+
var pointGeometryData = {
57+
"type": "Feature",
58+
"geometry": {
59+
"type": "Point",
60+
"coordinates": [40, 116]
61+
}
62+
};
5763
var geometryMinDistanceAnalystParameters = new GeometryMinDistanceAnalystParameters({
58-
inputGeometries:[new Point(23, 23), new Point(33, 37)],
64+
inputGeometries:[pointGeometryData],
5965
referenceDatasetName:"Bounds@Interpolation",
6066
createResultDataset:false,
6167
minDistance:0,
@@ -67,7 +73,7 @@ describe('leaflet_SpatialAnalystService_minDistanceAnalysis', () => {
6773
expect(testUrl).toBe(url + "/geometry/mindistance?returnContent=true");
6874
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
6975
expect(paramsObj.createResultDataset).toBeFalsy();
70-
expect(paramsObj.inputGeometries.length).toEqual(2);
76+
expect(paramsObj.inputGeometries.length).toEqual(1);
7177
return Promise.resolve(new Response((JSON.stringify(minDistanceAnalystEscapedJson))));
7278
});
7379
service.minDistanceAnalysis(geometryMinDistanceAnalystParameters, (result) => {

‎test/leaflet/services/NetworkAnalystServiceSpec.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import { UpdateEdgeWeightParameters } from '../../../src/common/iServer/UpdateEd
1111
import { UpdateTurnNodeWeightParameters } from '../../../src/common/iServer/UpdateTurnNodeWeightParameters';
1212
import { TransportationAnalystParameter } from '../../../src/common/iServer/TransportationAnalystParameter';
1313
import { TransportationAnalystResultSetting } from '../../../src/common/iServer/TransportationAnalystResultSetting';
14+
import { TraceAnalystParameters } from '../../../src/common/iServer/TraceAnalystParameters';
15+
import { ConnectedEdgesAnalystParameters } from '../../../src/common/iServer/ConnectedEdgesAnalystParameters';
1416
import { SupplyCenter } from '../../../src/common/iServer/SupplyCenter'
1517
import { SupplyCenterType } from '../../../src/common/REST';
1618
import { FetchRequest } from '../../../src/common/util/FetchRequest';
@@ -241,7 +243,7 @@ describe('leaflet_NetworkAnalystService', () => {
241243
isUncertainDirectionValid: true,
242244
returnFeatures: true
243245
});
244-
var service = new NetworkAnalystService(url, options);
246+
var service = networkAnalystService(url, options);
245247
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl) => {
246248
expect(method).toBe("GET");
247249
expect(testUrl).toBe(url + "/traceup");
@@ -271,7 +273,7 @@ describe('leaflet_NetworkAnalystService', () => {
271273
returnFeatures: true,
272274
edgeIDs:[2,3,500]
273275
});
274-
var service = new NetworkAnalystService(url, options);
276+
var service = networkAnalystService(url, options);
275277
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl) => {
276278
expect(method).toBe("GET");
277279
expect(testUrl).toBe(url + "/connectededges");

‎test/mapboxgl/services/MinDistanceAnalysisSpec.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import {SpatialAnalystService} from '../../../src/mapboxgl/services/SpatialAnaly
22
import {DatasetMinDistanceAnalystParameters} from '../../../src/common/iServer/DatasetMinDistanceAnalystParameters';
33
import {GeometryMinDistanceAnalystParameters} from '../../../src/common/iServer/GeometryMinDistanceAnalystParameters';
44
import { FetchRequest } from '@supermap/iclient-common/util/FetchRequest';
5-
import { Point } from '../../../src/common/commontypes/geometry/Point';
65

76
var url = GlobeParameter.spatialAnalystURL;
87
var options = {
@@ -54,8 +53,15 @@ describe('mapboxgl_SpatialAnalystService_minDistanceAnalysis', () => {
5453
});
5554
});
5655
it('minDistanceAnalysis_byGeometry', (done) => {
56+
var pointGeometryData = {
57+
"type": "Feature",
58+
"geometry": {
59+
"type": "Point",
60+
"coordinates": [116, 40]
61+
}
62+
};
5763
var geometryMinDistanceAnalystParameters = new GeometryMinDistanceAnalystParameters({
58-
inputGeometries:[new Point(23, 23), new Point(33, 37)],
64+
inputGeometries:[pointGeometryData],
5965
referenceDatasetName:"Bounds@Interpolation",
6066
createResultDataset:false,
6167
minDistance:0,
@@ -67,7 +73,7 @@ describe('mapboxgl_SpatialAnalystService_minDistanceAnalysis', () => {
6773
expect(testUrl).toBe(url + "/geometry/mindistance?returnContent=true");
6874
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
6975
expect(paramsObj.createResultDataset).toBeFalsy();
70-
expect(paramsObj.inputGeometries.length).toEqual(2);
76+
expect(paramsObj.inputGeometries.length).toEqual(1);
7177
return Promise.resolve(new Response((JSON.stringify(minDistanceAnalystEscapedJson))));
7278
});
7379
service.minDistanceAnalysis(geometryMinDistanceAnalystParameters, (result) => {

‎test/mapboxgl/services/NetworkAnalystServiceSpec.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import { FindServiceAreasParameters } from '../../../src/common/iServer/FindServ
1212
import { UpdateEdgeWeightParameters } from '../../../src/common/iServer/UpdateEdgeWeightParameters';
1313
import { UpdateTurnNodeWeightParameters } from '../../../src/common/iServer/UpdateTurnNodeWeightParameters';
1414
import { FacilityAnalystStreamParameters } from '../../../src/common/iServer/FacilityAnalystStreamParameters';
15+
import { TraceAnalystParameters } from '../../../src/common/iServer/TraceAnalystParameters';
16+
import { ConnectedEdgesAnalystParameters } from '../../../src/common/iServer/ConnectedEdgesAnalystParameters';
1517
import { SupplyCenter } from '../../../src/common/iServer/SupplyCenter'
1618
import { SupplyCenterType } from '../../../src/common/REST';
1719
import mapboxgl from 'mapbox-gl';

‎test/maplibregl/services/MinDistanceAnalysisSpec.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import {SpatialAnalystService} from '../../../src/maplibregl/services/SpatialAna
22
import {DatasetMinDistanceAnalystParameters} from '../../../src/common/iServer/DatasetMinDistanceAnalystParameters';
33
import {GeometryMinDistanceAnalystParameters} from '../../../src/common/iServer/GeometryMinDistanceAnalystParameters';
44
import { FetchRequest } from '@supermap/iclient-common/util/FetchRequest';
5-
import { Point } from '../../../src/common/commontypes/geometry/Point';
65

76
var url = GlobeParameter.spatialAnalystURL;
87
var options = {
@@ -54,8 +53,15 @@ describe('maplibregl_SpatialAnalystService_minDistanceAnalysis', () => {
5453
});
5554
});
5655
it('minDistanceAnalysis_byGeometry', (done) => {
56+
var pointGeometryData = {
57+
"type": "Feature",
58+
"geometry": {
59+
"type": "Point",
60+
"coordinates": [116, 40]
61+
}
62+
};
5763
var geometryMinDistanceAnalystParameters = new GeometryMinDistanceAnalystParameters({
58-
inputGeometries:[new Point(23, 23), new Point(33, 37)],
64+
inputGeometries:[pointGeometryData],
5965
referenceDatasetName:"Bounds@Interpolation",
6066
createResultDataset:false,
6167
minDistance:0,
@@ -67,7 +73,7 @@ describe('maplibregl_SpatialAnalystService_minDistanceAnalysis', () => {
6773
expect(testUrl).toBe(url + "/geometry/mindistance?returnContent=true");
6874
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
6975
expect(paramsObj.createResultDataset).toBeFalsy();
70-
expect(paramsObj.inputGeometries.length).toEqual(2);
76+
expect(paramsObj.inputGeometries.length).toEqual(1);
7177
return Promise.resolve(new Response((JSON.stringify(minDistanceAnalystEscapedJson))));
7278
});
7379
service.minDistanceAnalysis(geometryMinDistanceAnalystParameters, (result) => {

‎test/maplibregl/services/NetworkAnalystServiceSpec.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import { FindServiceAreasParameters } from '../../../src/common/iServer/FindServ
1212
import { UpdateEdgeWeightParameters } from '../../../src/common/iServer/UpdateEdgeWeightParameters';
1313
import { UpdateTurnNodeWeightParameters } from '../../../src/common/iServer/UpdateTurnNodeWeightParameters';
1414
import { FacilityAnalystStreamParameters } from '../../../src/common/iServer/FacilityAnalystStreamParameters';
15+
import { TraceAnalystParameters } from '../../../src/common/iServer/TraceAnalystParameters';
16+
import { ConnectedEdgesAnalystParameters } from '../../../src/common/iServer/ConnectedEdgesAnalystParameters';
1517
import { SupplyCenter } from '../../../src/common/iServer/SupplyCenter'
1618
import { SupplyCenterType } from '../../../src/common/REST';
1719
import maplibregl from 'maplibre-gl';

‎test/openlayers/services/MinDistanceAnalysisSpec.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import {SpatialAnalystService} from '../../../src/openlayers/services/SpatialAna
22
import {DatasetMinDistanceAnalystParameters} from '../../../src/common/iServer/DatasetMinDistanceAnalystParameters';
33
import {GeometryMinDistanceAnalystParameters} from '../../../src/common/iServer/GeometryMinDistanceAnalystParameters';
44
import { FetchRequest } from '@supermap/iclient-common/util/FetchRequest';
5-
import { Point } from '../../../src/common/commontypes/geometry/Point';
65

76
var url = GlobeParameter.spatialAnalystURL;
87
var options = {
@@ -54,8 +53,15 @@ describe('openlayers_SpatialAnalystService_minDistanceAnalysis', () => {
5453
});
5554
});
5655
it('minDistanceAnalysis_byGeometry', (done) => {
56+
var pointGeometryData = {
57+
"type": "Feature",
58+
"geometry": {
59+
"type": "Point",
60+
"coordinates": [116, 40]
61+
}
62+
};
5763
var geometryMinDistanceAnalystParameters = new GeometryMinDistanceAnalystParameters({
58-
inputGeometries:[new Point(23, 23), new Point(33, 37)],
64+
inputGeometries:[pointGeometryData],
5965
referenceDatasetName:"Bounds@Interpolation",
6066
createResultDataset:false,
6167
minDistance:0,
@@ -67,7 +73,7 @@ describe('openlayers_SpatialAnalystService_minDistanceAnalysis', () => {
6773
expect(testUrl).toBe(url + "/geometry/mindistance?returnContent=true");
6874
var paramsObj = JSON.parse(params.replace(/'/g, "\""));
6975
expect(paramsObj.createResultDataset).toBeFalsy();
70-
expect(paramsObj.inputGeometries.length).toEqual(2);
76+
expect(paramsObj.inputGeometries.length).toEqual(1);
7177
return Promise.resolve(new Response((JSON.stringify(minDistanceAnalystEscapedJson))));
7278
});
7379
service.minDistanceAnalysis(geometryMinDistanceAnalystParameters, (result) => {

0 commit comments

Comments
 (0)