Skip to content

Commit 0913d67

Browse files
zhurczhurc
committed
Merge branch 'master' of https://github.com/SuperMap/iClient9 
2 parents e672c69 + 39d8414 commit 0913d67

File tree

7 files changed

+457
-161
lines changed

7 files changed

+457
-161
lines changed

‎test/common/iServer/BurstPipelineAnalystServiceSpec.js‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ function analyzeFailed(serviceFailedEventArgs) {
1919
function analyzeCompleted(analyseEventArgs) {
2020
serviceCompletedEventArgsSystem = analyseEventArgs;
2121
}
22-
2322
describe('BurstPipelineAnalystService', function () {
2423
var originalTimeout;
2524
var FetchRequest = SuperMap.FetchRequest;
@@ -42,6 +41,8 @@ describe('BurstPipelineAnalystService', function () {
4241
expect(burstPipelineAnalystParams.edgeID).toBeNull();
4342
expect(burstPipelineAnalystParams.nodeID).toBeNull();
4443
expect(burstPipelineAnalystParams.isUncertainDirectionValid).toBeFalsy();
44+
burstPipelineAnalystService.destroy();
45+
burstPipelineAnalystParams.destroy();
4546
});
4647

4748
it('constructor, destroy', function () {
@@ -64,7 +65,7 @@ describe('BurstPipelineAnalystService', function () {
6465
expect(burstPipelineAnalystParams.isUncertainDirectionValid).toBeFalsy();
6566
});
6667

67-
//参数不存在, 直接返回
68+
//参数不存在, 直接返回, 此处不应该直接返回,应该报错？待与开发协商
6869
it('processAsync_noParams', function (done) {
6970
var burstPipelineAnalystService = initBurstPipelineAnalystService();
7071
burstPipelineAnalystService.processAsync();
@@ -85,9 +86,16 @@ describe('BurstPipelineAnalystService', function () {
8586
nodeID: null,
8687
isUncertainDirectionValid: true
8788
});
88-
spyOn(FetchRequest, 'commit').and.callFake(function () {
89-
var burstPipelineEscapedJson = "{\"normalNodes\":[],\"edges\":[1,2,3,4,5,6,7,8,9],\"criticalNodes\":[2]}";
90-
return Promise.resolve(new Response(burstPipelineEscapedJson));
89+
spyOn(FetchRequest, 'commit').and.callFake(function (method, testUrl, params, options) {
90+
expect(method).toBe('GET');
91+
expect(testUrl).toBe(url + "/burstAnalyse.json?");
92+
expect(params.edgeID).toEqual(3434);
93+
expect(params.isUncertainDirectionValid).toBe(true);
94+
expect(params.sourceNodeIDs[0]).toEqual(1);
95+
expect(params.sourceNodeIDs[1]).toEqual(2);
96+
expect(options).not.toBeNull();
97+
var escapedJson = "{\"normalNodes\":[],\"edges\":[1,2,3,4,5,6,7,8,9],\"criticalNodes\":[2]}";
98+
return Promise.resolve(new Response(escapedJson));
9199
});
92100
burstPipelineAnalystService.processAsync(burstPipelineAnalystParams);
93101
setTimeout(function () {

‎test/common/iServer/GenerateSpatialDataServiceSpec.js‎

Lines changed: 104 additions & 98 deletions
Large diffs are not rendered by default.

‎test/common/iServer/SetLayersInfoServiceSpec.js‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,27 @@ require('../../../src/common/util/FetchRequest');
44

55
var setLayersFailedEventArgsSystem = null;
66
var setLayersEventArgsSystem = null;
7-
var id;
8-
var url = GlobeParameter.WorldURL;
7+
var url = "http://supermap:8090/iserver/services/map-world/rest/maps/World";
98
var options = {
109
eventListeners: {
1110
"processCompleted": setLayersInfoCompleted,
1211
'processFailed': setLayersFailed
1312
},
1413
isTempLayers: false
1514
};
16-
1715
function initSetLayersInfoService() {
1816
return new SuperMap.SetLayersInfoService(url, options);
1917
}
20-
2118
function setLayersInfoCompleted(setLayersInfoArgs) {
2219
setLayersEventArgsSystem = setLayersInfoArgs;
2320
}
24-
2521
function setLayersFailed(serviceFailedEventArgs) {
2622
setLayersFailedEventArgsSystem = serviceFailedEventArgs;
2723
}
2824

2925
describe('SetLayersInfoService', function () {
3026
var originalTimeout;
27+
var id;
3128
var FetchRequest = SuperMap.FetchRequest;
3229
beforeEach(function () {
3330
originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
@@ -45,6 +42,15 @@ describe('SetLayersInfoService', function () {
4542
var setLayersInfoService = initSetLayersInfoService();
4643
expect(setLayersInfoService).not.toBeNull();
4744
expect(setLayersInfoService.url).toEqual(url);
45+
spyOn(FetchRequest, 'commit').and.callFake(function (method, testUrl, params, options) {
46+
expect(method).toBe('POST');
47+
expect(testUrl).toBe(url + "/tempLayersSet.json?");
48+
var expectParams = "[{'completeLineSymbolDisplayed':false,'visible':true,'maxScale':0,'caption':null,'description':\"\",'symbolScalable':false,'subLayers':{'layers':[{'joinItems':null,'completeLineSymbolDisplayed':false,'ugcLayerType':\"VECTOR\",'displayFilter':null,'visible':true,'maxScale':1.350238165824801e-8,'fieldValuesDisplayFilter':{'fieldName':\"\",'values':[],'fieldValuesDisplayMode':\"DISABLE\"},'caption':\"continent_T@World\",'description':\"\",'symbolScalable':false,'subLayers':{},'type':\"UGC\",'datasetInfo':{'charset':null,'isReadOnly':false,'encodeType':null,'recordCount':0,'bounds':{'top':65.22103117946571,'left':-150.51082428252954,'bottom':-84.34257921576281,'leftBottom':{'x':-150.51082428252954,'y':-84.34257921576281},'right':154.27853258850513,'rightTop':{'x':154.27853258850513,'y':65.22103117946571}},'name':\"continent_T\",'isFileCache':false,'description':null,'prjCoordSys':null,'type':\"TEXT\",'dataSourceName':\"World\",'tableName':null},'queryable':false,'opaqueRate':100,'minVisibleGeometrySize':0.4,'name':\"continent_T@World\",'bounds':{'top':65.22103117946571,'left':-150.51082428252954,'bottom':-84.34257921576281,'leftBottom':{'x':-150.51082428252954,'y':-84.34257921576281},'right':154.27853258850513,'rightTop':{'x':154.27853258850513,'y':65.22103117946571}},'style':{'fillGradientOffsetRatioX':0,'markerSize':2.4,'fillForeColor':{'red':208,'green':255,'blue':240,'alpha':255},'fillGradientOffsetRatioY':0,'markerWidth':0,'markerAngle':0,'fillSymbolID':0,'lineColor':{'red':0,'green':128,'blue':0,'alpha':255},'markerSymbolID':0,'lineWidth':0.1,'markerHeight':0,'fillOpaqueRate':100,'fillBackOpaque':true,'fillBackColor':{'red':255,'green':255,'blue':255,'alpha':255},'fillGradientMode':\"NONE\",'lineSymbolID':0,'fillGradientAngle':0},'displayOrderBy':null,'symbolScale':0,'minScale':3.3755954145620026e-9,'representationField':\"\",'colorDictionary':null}]},'type':\"UGC\",'queryable':false,'opaqueRate':100,'minVisibleGeometrySize':0,'name':\"World Map\",'bounds':{'top':118.05408801141,'left':-180,'bottom':-90,'leftBottom':{'x':-180,'y':-90},'right':180,'rightTop':{'x':180,'y':118.05408801141}},'symbolScale':0,'minScale':0,'ugcLayerType':\"VECTOR\",'object':null}]";
49+
expect(params).toBe(expectParams);
50+
expect(options).not.toBeNull();
51+
var escapedJson = "{\"postResultType\":\"CreateChild\",\"newResourceID\":\"9e195daff6974da6b366eb37c97e5ad9_a932e5360977478596dfa4cfd9936d53\",\"succeed\":true,\"newResourceLocation\":\"http://localhost:8090/iserver/services/map-world/rest/maps/World/tempLayersSet/9e195daff6974da6b366eb37c97e5ad9_a932e5360977478596dfa4cfd9936d53.json\"}";
52+
return Promise.resolve(new Response(escapedJson));
53+
});
4854
setLayersInfoService.events.on({"processCompleted": setLayersInfoCompleted});
4955
setLayersInfoService.processAsync(layers);
5056
setTimeout(function () {
@@ -58,7 +64,7 @@ describe('SetLayersInfoService', function () {
5864
id = serviceResult.newResourceID;
5965
setLayersInfoService.destroy();
6066
done();
61-
}, 5000)
67+
}, 1000)
6268
});
6369

6470
//修改临时图层的信息 isTempLayers=true
@@ -74,6 +80,16 @@ describe('SetLayersInfoService', function () {
7480
var layers = layersInfo;
7581
layers.description = "test";
7682
setLayersInfoService.events.on({"processCompleted": setLayersInfoCompleted});
83+
spyOn(FetchRequest, 'commit').and.callFake(function (method, testUrl, params, options) {
84+
expect(method).toBe('PUT');
85+
expect(testUrl).toBe(url + "/tempLayersSet/" + id + ".json?");
86+
var expectParams = "[{'completeLineSymbolDisplayed':false,'visible':true,'maxScale':0,'caption':null,'description':\"test\",'symbolScalable':false,'subLayers':{'layers':[{'joinItems':null,'completeLineSymbolDisplayed':false,'ugcLayerType':\"VECTOR\",'displayFilter':null,'visible':true,'maxScale':1.350238165824801e-8,'fieldValuesDisplayFilter':{'fieldName':\"\",'values':[],'fieldValuesDisplayMode':\"DISABLE\"},'caption':\"continent_T@World\",'description':\"\",'symbolScalable':false,'subLayers':{},'type':\"UGC\",'datasetInfo':{'charset':null,'isReadOnly':false,'encodeType':null,'recordCount':0,'bounds':{'top':65.22103117946571,'left':-150.51082428252954,'bottom':-84.34257921576281,'leftBottom':{'x':-150.51082428252954,'y':-84.34257921576281},'right':154.27853258850513,'rightTop':{'x':154.27853258850513,'y':65.22103117946571}},'name':\"continent_T\",'isFileCache':false,'description':null,'prjCoordSys':null,'type':\"TEXT\",'dataSourceName':\"World\",'tableName':null},'queryable':false,'opaqueRate':100,'minVisibleGeometrySize':0.4,'name':\"continent_T@World\",'bounds':{'top':65.22103117946571,'left':-150.51082428252954,'bottom':-84.34257921576281,'leftBottom':{'x':-150.51082428252954,'y':-84.34257921576281},'right':154.27853258850513,'rightTop':{'x':154.27853258850513,'y':65.22103117946571}},'style':{'fillGradientOffsetRatioX':0,'markerSize':2.4,'fillForeColor':{'red':208,'green':255,'blue':240,'alpha':255},'fillGradientOffsetRatioY':0,'markerWidth':0,'markerAngle':0,'fillSymbolID':0,'lineColor':{'red':0,'green':128,'blue':0,'alpha':255},'markerSymbolID':0,'lineWidth':0.1,'markerHeight':0,'fillOpaqueRate':100,'fillBackOpaque':true,'fillBackColor':{'red':255,'green':255,'blue':255,'alpha':255},'fillGradientMode':\"NONE\",'lineSymbolID':0,'fillGradientAngle':0},'displayOrderBy':null,'symbolScale':0,'minScale':3.3755954145620026e-9,'representationField':\"\",'colorDictionary':null}]},'type':\"UGC\",'queryable':false,'opaqueRate':100,'minVisibleGeometrySize':0,'name':\"World Map\",'bounds':{'top':118.05408801141,'left':-180,'bottom':-90,'leftBottom':{'x':-180,'y':-90},'right':180,'rightTop':{'x':180,'y':118.05408801141}},'symbolScale':0,'minScale':0,'ugcLayerType':\"VECTOR\",'object':null}]";
87+
expect(params).toBe(expectParams);
88+
expect(options).not.toBeNull();
89+
var escapedJson = "{\"succeed\":true}";
90+
return Promise.resolve(new Response(escapedJson));
91+
});
92+
setLayersInfoService.events.on({"processCompleted": setLayersInfoCompleted});
7793
setLayersInfoService.processAsync(layers);
7894
setTimeout(function () {
7995
expect(setLayersEventArgsSystem.type).toEqual("processCompleted");
@@ -82,20 +98,22 @@ describe('SetLayersInfoService', function () {
8298
expect(serviceResult.succeed).toBeTruthy();
8399
setLayersInfoService.destroy();
84100
done();
85-
}, 4000)
101+
}, 1000)
86102
});
87103

88104
//失败事件
89105
it('failedEvent', function (done) {
90-
var wrongLayer = layerInfo;
91-
var testUrl = "http://supermap:8090/iserver/services/map-world/rest/maps/World";
92-
var setLayersInfoService = new SuperMap.SetLayersInfoService(testUrl, options);
93-
spyOn(FetchRequest, 'commit').and.callFake(function () {
106+
var wrongLayerInfo = layerInfo;
107+
var setLayersInfoService = new SuperMap.SetLayersInfoService(url, options);
108+
spyOn(FetchRequest, 'commit').and.callFake(function (method, testUrl, params, options) {
109+
expect(method).toBe('POST');
110+
expect(testUrl).toBe(url + "/tempLayersSet.json?");
111+
expect(options).not.toBeNull();
94112
var escapedJson = "{\"succeed\":false,\"error\":{\"code\":500,\"errorMsg\":\"Index:0不在（0，-1）范围之内。\"}}";
95113
return Promise.resolve(new Response(escapedJson));
96114
});
97115
setLayersInfoService.events.on({"processFailed": setLayersFailed});
98-
setLayersInfoService.processAsync(wrongLayer);
116+
setLayersInfoService.processAsync(wrongLayerInfo);
99117
setTimeout(function () {
100118
expect(setLayersEventArgsSystem).toBeNull();
101119
expect(setLayersFailedEventArgsSystem).not.toBeNull();

‎test/leaflet/overlay/GraphThemeLayerSpec.js‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -175,20 +175,20 @@ describe('leaflet_GraphThemeLayer', function () {
175175
});
176176

177177
// 此方法为iclient8的私有方法,不支持leaflet对象,此处测试传入iclient对象的情况
178-
//it('isPointInPoly', function () {
179-
// var graphThemeLayer = L.supermap.graphThemeLayer("BarThemeLayer", "Bar", options).addTo(map);
180-
// graphThemeLayer.themeFields = ["CON2009", "CON2010", "CON2011", "CON2012", "CON2013"];
181-
// graphThemeLayer.chartsSetting = {
182-
// width: 240,
183-
// height: 100,
184-
// codomain: [0, 40000]
185-
// };
186-
// var point = {"x": 2, "y": 5};
187-
// var polygon = [{"x": 1, "y": 1}, {"x": 3, "y": 1}, {"x": 6, "y": 4}, {"x": 2, "y": 10}, {"x": 1, "y": 1}];
188-
// var isPointInPoly = graphThemeLayer.isPointInPoly(point, polygon);
189-
// expect(isPointInPoly).toBeTruthy();
190-
// graphThemeLayer.clear();
191-
//});
178+
it('isPointInPoly', function () {
179+
var graphThemeLayer = L.supermap.graphThemeLayer("BarThemeLayer", "Bar", options).addTo(map);
180+
graphThemeLayer.themeFields = ["CON2009", "CON2010", "CON2011", "CON2012", "CON2013"];
181+
graphThemeLayer.chartsSetting = {
182+
width: 240,
183+
height: 100,
184+
codomain: [0, 40000]
185+
};
186+
var point = {"x": 2, "y": 5};
187+
var polygon = [{"x": 1, "y": 1}, {"x": 3, "y": 1}, {"x": 6, "y": 4}, {"x": 2, "y": 10}, {"x": 1, "y": 1}];
188+
var isPointInPoly = graphThemeLayer.isPointInPoly(point, polygon);
189+
expect(isPointInPoly).toBeTruthy();
190+
graphThemeLayer.clear();
191+
});
192192

193193
//overlayWeightField默认为空
194194
it('drawCharts_overlayWeightField = null', function () {

0 commit comments

Comments
 (0)