Skip to content

Commit 13ab848

Browse files
xilanhuaweidapaoxilanhuaweidapao
committed
fix ut
1 parent b57eea6 commit 13ab848

File tree

9 files changed

+546
-607
lines changed

9 files changed

+546
-607
lines changed

‎src/common/components/chart/ChartModel.js‎

Lines changed: 13 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,8 @@ export class ChartModel {
8080
fromIndex: 0,
8181
toIndex: 100000
8282
});
83-
getFeatureBySQLService = new GetFeaturesBySQLService(datasetsInfo.dataUrl, {
84-
eventListeners: {
85-
processCompleted: success,
86-
processFailed: function () {}
87-
}
88-
});
89-
getFeatureBySQLService.processAsync(getFeatureBySQLParams);
83+
getFeatureBySQLService = new GetFeaturesBySQLService(datasetsInfo.dataUrl);
84+
getFeatureBySQLService.processAsync(getFeatureBySQLParams, success);
9085
}
9186

9287
/**
@@ -108,13 +103,8 @@ export class ChartModel {
108103
queryParams: [queryParam],
109104
expectCount: 100000
110105
});
111-
queryBySQLService = new QueryBySQLService(datasetsInfo.dataUrl, {
112-
eventListeners: {
113-
processCompleted: success,
114-
processFailed: function () {}
115-
}
116-
});
117-
queryBySQLService.processAsync(queryBySQLParams);
106+
queryBySQLService = new QueryBySQLService(datasetsInfo.dataUrl);
107+
queryBySQLService.processAsync(queryBySQLParams, success);
118108
}
119109

120110
/**
@@ -398,18 +388,14 @@ export class ChartModel {
398388
toIndex: 100000,
399389
returnContent: true
400390
});
401-
let options = {
402-
eventListeners: {
403-
processCompleted: (getFeaturesEventArgs) => {
404-
processCompleted && processCompleted(getFeaturesEventArgs);
405-
},
406-
processFailed: (e) => {
407-
processFaild && processFaild(e);
408-
}
409-
}
410-
};
411-
getFeatureBySQLService = new GetFeaturesBySQLService(url, options);
412-
getFeatureBySQLService.processAsync(getFeatureBySQLParams);
391+
getFeatureBySQLService = new GetFeaturesBySQLService(url);
392+
getFeatureBySQLService.processAsync(getFeatureBySQLParams, function(getFeaturesEventArgs) {
393+
if (getFeaturesEventArgs.type = 'processCompleted') {
394+
processCompleted && processCompleted(getFeaturesEventArgs);
395+
} else {
396+
processFaild && processFaild(getFeaturesEventArgs);
397+
}
398+
});
413399
}
414400

415401
/**
@@ -466,15 +452,10 @@ export class ChartModel {
466452
_queryBySQL(url, params, callback, resultFormat) {
467453
var me = this;
468454
var queryBySQLService = new QueryBySQLService(url, {
469-
eventListeners: {
470-
scope: me,
471-
processCompleted: callback,
472-
processFailed: callback
473-
},
474455
format: me._processFormat(resultFormat)
475456
});
476457

477-
queryBySQLService.processAsync(params);
458+
queryBySQLService.processAsync(params, callback);
478459
}
479460
/**
480461
* @function ChartModel.prototype._processFormat

‎test/classic/services/AddressMatchServiceSpec.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ describe('classic_AddressMatchService', () => {
6161
var codeFailed = (serviceFailedEventArgs) => {
6262
codingFailedEventArgs = serviceFailedEventArgs;
6363
};
64-
var options = {
65-
eventListeners: {"processCompleted": codeCompleted, "processFailed": codeFailed}
66-
};
6764
var GeoCodingParams = new GeoCodingParameter({
6865
address: '公司',
6966
fromIndex: 0,
@@ -72,7 +69,7 @@ describe('classic_AddressMatchService', () => {
7269
prjCoordSys: '{epsgcode:4326}',
7370
maxReturn: -1
7471
});
75-
var addressCodeService = new AddressMatchService(addressMatchURL, options);
72+
var addressCodeService = new AddressMatchService(addressMatchURL);
7673

7774
spyOn(FetchRequest, 'get').and.callFake((testUrl, params, options) => {
7875
expect(testUrl).toBe(addressMatchURL + "/geocoding");

‎test/leaflet/components/clientcomputation/ClientComputationViewSpec.js‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,7 @@ describe('leaflet_clientcomputation_ClientComputationView', () => {
8282
}
8383

8484
};
85-
var options = {
86-
eventListeners: {
87-
'processFailed': QueryBySQLFailed,
88-
'processCompleted': QueryBySQLCompleted
89-
}
90-
};
91-
var queryBySQLService = new QueryBySQLService(queryUrl, options);
85+
var queryBySQLService = new QueryBySQLService(queryUrl);
9286
var params = new QueryBySQLParameters({
9387

9488
expectCount: 2,
@@ -98,7 +92,7 @@ describe('leaflet_clientcomputation_ClientComputationView', () => {
9892
name: "中国历史5级以上地震_1900至2016@自然气候数据",
9993
}))
10094
})
101-
queryBySQLService.processAsync(params);
95+
queryBySQLService.processAsync(params, QueryBySQLCompleted);
10296

10397
});
10498

‎test/leaflet/components/search/SearchViewSpec.js‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,19 +102,13 @@ describe('leaflet_search_SearchView', () => {
102102
done();
103103
}
104104
};
105-
var options = {
106-
eventListeners: {
107-
'processFailed': QueryBySQLFailed,
108-
'processCompleted': QueryBySQLCompleted
109-
}
110-
};
111105
var polygon = L.polygon([[90, 180], [90, -180], [-90, -180], [-90, 180], [90, 180]]);
112106
var params = new QueryBySQLParameters({
113107
queryParams: { name: "Capitals@World.1" },
114108
bounds: polygon.getBounds()
115109
});
116-
queryBySQLService = new QueryBySQLService(queryUrl, options);
117-
queryBySQLService.processAsync(params);
110+
queryBySQLService = new QueryBySQLService(queryUrl);
111+
queryBySQLService.processAsync(params, QueryBySQLCompleted);
118112
// }, 4000);
119113
});
120114

‎test/mapboxgl/overlay/RangeTheme3DLayerSpec.js‎

Lines changed: 56 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -66,67 +66,64 @@ describe('mapboxgl_RangeTheme3DLayer', () => {
6666
datasetNames: ["Jingjin:BaseMap_R"]
6767
});
6868
var queryFeatures = new GetFeaturesBySQLService(dataUrl, {
69-
eventListeners: {
70-
processCompleted: (serviceResult) => {
71-
if (serviceResult.error) {
72-
alert("error:" + JSON.stringify(serviceResult.error));
73-
return;
74-
}
75-
var result = serviceResult.result;
76-
if (result.features) {
77-
//创建专题图图层
78-
themeLayer = new RangeTheme3DLayer("range3DThemeLayer", {
79-
heightField: themeField,
80-
parseNumber: true,
81-
enableHighlight: true,
82-
83-
heightStops: [
84-
[0.01, 1000], [0.1, 5000], [0.2, 6000]
85-
],
86-
colorStops: [
87-
[0, "#FDE2CA"], [0.02, "#FACE9C"], [0.04, "#F09C42"], [0.06, "#D0770B"], [0.1, "#945305"], [0.2, "#593000"]
88-
],
89-
// 显示图例
90-
showLegend: true,
91-
legendTitle: "人口密度"
92-
});
93-
themeLayer.setHighlightStyleOptions({color: "#058e94"});
94-
themeLayer.setData(result.features).addTo(map);
95-
map.easeTo({
96-
pitch: 60,
97-
bearing: 0
98-
})
99-
}
100-
expect(themeLayer).not.toBeNull();
101-
expect(themeLayer.colorStops.length).toEqual(6);
102-
expect(themeLayer.data.type).toBe("FeatureCollection");
103-
expect(themeLayer.data.features.length).toBeGreaterThan(0);
104-
for (var i = 0; i < themeLayer.data.features.length; i++) {
105-
expect(themeLayer.data.features[i].type).toBe("Feature");
106-
expect(themeLayer.data.features[i].id).not.toBeNull();
107-
expect(themeLayer.data.features[i].properties).not.toBeNull();
108-
expect(themeLayer.data.features[i].geometry).not.toBeNull();
109-
}
110-
expect(themeLayer.enableHighlight).toBeTruthy();
111-
expect(themeLayer.heightField).toBe("POP_DENSITY99");
112-
expect(themeLayer.heightStops.length).toEqual(3);
113-
expect(themeLayer.id).toBe("range3DThemeLayer");
114-
expect(themeLayer._highlightLayerId).toBe("range3DThemeLayer-highlightLayer");
115-
expect(themeLayer.highlight.color).toBe("#058e94");
116-
expect(themeLayer.legendTitle).toBe("人口密度");
117-
var layerStyleOptions = themeLayer.getLayerStyleOptions();
118-
expect(layerStyleOptions).not.toBeNull();
119-
expect(layerStyleOptions).not.toBeUndefined();
120-
var highlightStyleOptions = themeLayer.getHighlightStyleOptions();
121-
expect(highlightStyleOptions).not.toBeNull();
122-
expect(highlightStyleOptions).not.toBeUndefined();
123-
themeLayer.remove();
124-
done();
125-
}
126-
},
12769
format: DataFormat.GEOJSON
12870
});
129-
queryFeatures.processAsync(getFeatureBySQLParams);
71+
queryFeatures.processAsync(getFeatureBySQLParams, (serviceResult) => {
72+
if (serviceResult.error) {
73+
alert("error:" + JSON.stringify(serviceResult.error));
74+
return;
75+
}
76+
var result = serviceResult.result;
77+
if (result.features) {
78+
//创建专题图图层
79+
themeLayer = new RangeTheme3DLayer("range3DThemeLayer", {
80+
heightField: themeField,
81+
parseNumber: true,
82+
enableHighlight: true,
83+
84+
heightStops: [
85+
[0.01, 1000], [0.1, 5000], [0.2, 6000]
86+
],
87+
colorStops: [
88+
[0, "#FDE2CA"], [0.02, "#FACE9C"], [0.04, "#F09C42"], [0.06, "#D0770B"], [0.1, "#945305"], [0.2, "#593000"]
89+
],
90+
// 显示图例
91+
showLegend: true,
92+
legendTitle: "人口密度"
93+
});
94+
themeLayer.setHighlightStyleOptions({color: "#058e94"});
95+
themeLayer.setData(result.features).addTo(map);
96+
map.easeTo({
97+
pitch: 60,
98+
bearing: 0
99+
})
100+
}
101+
expect(themeLayer).not.toBeNull();
102+
expect(themeLayer.colorStops.length).toEqual(6);
103+
expect(themeLayer.data.type).toBe("FeatureCollection");
104+
expect(themeLayer.data.features.length).toBeGreaterThan(0);
105+
for (var i = 0; i < themeLayer.data.features.length; i++) {
106+
expect(themeLayer.data.features[i].type).toBe("Feature");
107+
expect(themeLayer.data.features[i].id).not.toBeNull();
108+
expect(themeLayer.data.features[i].properties).not.toBeNull();
109+
expect(themeLayer.data.features[i].geometry).not.toBeNull();
110+
}
111+
expect(themeLayer.enableHighlight).toBeTruthy();
112+
expect(themeLayer.heightField).toBe("POP_DENSITY99");
113+
expect(themeLayer.heightStops.length).toEqual(3);
114+
expect(themeLayer.id).toBe("range3DThemeLayer");
115+
expect(themeLayer._highlightLayerId).toBe("range3DThemeLayer-highlightLayer");
116+
expect(themeLayer.highlight.color).toBe("#058e94");
117+
expect(themeLayer.legendTitle).toBe("人口密度");
118+
var layerStyleOptions = themeLayer.getLayerStyleOptions();
119+
expect(layerStyleOptions).not.toBeNull();
120+
expect(layerStyleOptions).not.toBeUndefined();
121+
var highlightStyleOptions = themeLayer.getHighlightStyleOptions();
122+
expect(highlightStyleOptions).not.toBeNull();
123+
expect(highlightStyleOptions).not.toBeUndefined();
124+
themeLayer.remove();
125+
done();
126+
});
130127
// setTimeout(() => {
131128

132129
// }, 5000)

0 commit comments

Comments
 (0)