Skip to content

Commit 2f534a0

Browse files
zhurczhurc
committed
代码结构调整步骤3(测试部分)
1 parent 34ca6f2 commit 2f534a0

Some content is hidden

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

46 files changed

+638
-630
lines changed

‎test/README.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/Core/iServer/BufferAnalystServiceSpec.js renamed to test/common/iServer/BufferAnalystServiceSpec.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require('../../../src/Core/iServer/BufferAnalystService');
1+
require('../../../src/common/iServer/BufferAnalystService');
22

33
var serviceFailedEventArgsSystem = null;
44
var analystEventArgsSystem = null;
@@ -32,16 +32,16 @@ describe('testBufferAnalystService_processAsync', function () {
3232
//测试成功事件
3333
it('SuccessEvent:byDatasets_NotReturnContent', function (done) {
3434
var bfServiceByDatasets = initBufferAnalystService();
35-
var resultSetting = new DataReturnOption({
35+
var resultSetting = new SuperMap.DataReturnOption({
3636
expectCount: 1000,
3737
dataset: null,
38-
dataReturnMode: DataReturnMode.DATASET_ONLY,
38+
dataReturnMode: SuperMap.DataReturnMode.DATASET_ONLY,
3939
deleteExistResultDataset: true
4040
});
41-
var dsBufferAnalystParameters = new DatasetBufferAnalystParameters();
41+
var dsBufferAnalystParameters = new SuperMap.DatasetBufferAnalystParameters();
4242
dsBufferAnalystParameters.dataset = "Landuse_R@Jingjin";
4343
dsBufferAnalystParameters.filterQueryParameter.attributeFilter = "smid like 48";
44-
dsBufferAnalystParameters.bufferSetting.endType = BufferEndType.ROUND;
44+
dsBufferAnalystParameters.bufferSetting.endType = SuperMap.BufferEndType.ROUND;
4545
dsBufferAnalystParameters.bufferSetting.semicircleLineSegment = 5;
4646
dsBufferAnalystParameters.bufferSetting.leftDistance.value = 100;
4747
dsBufferAnalystParameters.resultSetting = resultSetting;
@@ -74,17 +74,17 @@ describe('testBufferAnalystService_processAsync', function () {
7474
expect(bfServiceByGeometry.url).toEqual(url);
7575

7676
var sourceGeometry = new SuperMap.Geometry.Point(7884.79277012316, 5072.18865322196);
77-
var bufferSetting = new BufferSetting();
78-
bufferSetting.endType = BufferEndType.ROUND;
77+
var bufferSetting = new SuperMap.BufferSetting();
78+
bufferSetting.endType = SuperMap.BufferEndType.ROUND;
7979
bufferSetting.leftDistance.value = 300;
8080
bufferSetting.semicircleLineSegment = 5;
81-
var resultSetting = new DataReturnOption({
81+
var resultSetting = new SuperMap.DataReturnOption({
8282
expectCount: 1000,
8383
dataset: "Landuse_R@Jingjin",
84-
dataReturnMode: DataReturnMode.DATASET_ONLY,
84+
dataReturnMode: SuperMap.DataReturnMode.DATASET_ONLY,
8585
deleteExistResultDataset: false
8686
});
87-
var geometryBufferAnalystParameters = new GeometryBufferAnalystParameters();
87+
var geometryBufferAnalystParameters = new SuperMap.GeometryBufferAnalystParameters();
8888
geometryBufferAnalystParameters.sourceGeometry = sourceGeometry;
8989
geometryBufferAnalystParameters.bufferSetting = bufferSetting;
9090
geometryBufferAnalystParameters.resultSetting = resultSetting;
@@ -118,17 +118,17 @@ describe('testBufferAnalystService_processAsync', function () {
118118
expect(bfServiceByGeometry.url).toEqual(url);
119119

120120
var sourceGeometry = new SuperMap.Geometry.Point(7884.79277012316, 5072.18865322196);
121-
var bufferSetting = new BufferSetting();
122-
bufferSetting.endType = BufferEndType.ROUND;
121+
var bufferSetting = new SuperMap.BufferSetting();
122+
bufferSetting.endType = SuperMap.BufferEndType.ROUND;
123123
bufferSetting.leftDistance.value = -1;
124124
bufferSetting.semicircleLineSegment = 5;
125-
var resultSetting = new DataReturnOption({
125+
var resultSetting = new SuperMap.DataReturnOption({
126126
expectCount: 1000,
127127
dataset: null,
128-
dataReturnMode: DataReturnMode.DATASET_ONLY,
128+
dataReturnMode: SuperMap.DataReturnMode.DATASET_ONLY,
129129
deleteExistResultDataset: true
130130
});
131-
var geometryBufferAnalystParameters = new GeometryBufferAnalystParameters();
131+
var geometryBufferAnalystParameters = new SuperMap.GeometryBufferAnalystParameters();
132132
geometryBufferAnalystParameters.sourceGeometry = sourceGeometry;
133133
geometryBufferAnalystParameters.bufferSetting = bufferSetting;
134134
geometryBufferAnalystParameters.resultSetting = resultSetting;

test/Core/iServer/BufferDistanceSpec.js renamed to test/common/iServer/BufferDistanceSpec.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
require('../../../src/Core/iServer/BufferDistance');
1+
require('../../../src/common/iServer/BufferDistance');
22

33
describe('testBufferDistance_constructor',function(){
44
it('constructorDefault',function(){
5-
var bufferDistance = new BufferDistance();
5+
var bufferDistance = new SuperMap.BufferDistance();
66
expect(bufferDistance).not.toBeNull();
77
expect(bufferDistance.value).toEqual(100);
88
expect(bufferDistance.exp).toBeNull();
@@ -12,7 +12,7 @@ describe('testBufferDistance_constructor',function(){
1212
expect(bufferDistance.exp).toBeNull();
1313
});
1414
it('constructorCustom',function(){
15-
var bufferDistance = new BufferDistance({
15+
var bufferDistance = new SuperMap.BufferDistance({
1616
value: 200
1717
});
1818
expect(bufferDistance).not.toBeNull();

test/Core/iServer/BufferSettingSpec.js renamed to test/common/iServer/BufferSettingSpec.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
require('../../../src/Core/iServer/BufferSetting');
1+
require('../../../src/common/iServer/BufferSetting');
22

33
describe('testBufferSetting_constructor',function(){
44
it('constructorDefault',function(){
5-
var bufferSetting = new BufferSetting();
5+
var bufferSetting = new SuperMap.BufferSetting();
66
expect(bufferSetting).not.toBeNull();
77
expect(bufferSetting.leftDistance).not.toBeNull();
88
expect(bufferSetting.rightDistance).not.toBeNull();
9-
expect(bufferSetting.endType).toEqual(BufferEndType.FLAT);
9+
expect(bufferSetting.endType).toEqual(SuperMap.BufferEndType.FLAT);
1010
expect(bufferSetting.semicircleLineSegment).toEqual(4);
1111

1212
bufferSetting.semicircleLineSegment = 5;
13-
bufferSetting.endType = BufferEndType.ROUND;
13+
bufferSetting.endType = SuperMap.BufferEndType.ROUND;
1414
bufferSetting.leftDistance.value = 150;
15-
expect(bufferSetting.endType).toEqual(BufferEndType.ROUND);
15+
expect(bufferSetting.endType).toEqual(SuperMap.BufferEndType.ROUND);
1616
expect(bufferSetting.leftDistance.value).toEqual(150);
1717
expect(bufferSetting.semicircleLineSegment).toEqual(5);
1818

@@ -23,15 +23,15 @@ describe('testBufferSetting_constructor',function(){
2323
expect(bufferSetting.semicircleLineSegment).toBeNull();
2424
});
2525
it('constructorCustom',function(){
26-
var bufferSetting = new BufferSetting({
27-
leftDistance: new BufferDistance({
26+
var bufferSetting = new SuperMap.BufferSetting({
27+
leftDistance: new SuperMap.BufferDistance({
2828
value: 200
2929
})
3030
});
3131
expect(bufferSetting).not.toBeNull();
3232
expect(bufferSetting.leftDistance).not.toBeNull();
3333
expect(bufferSetting.rightDistance).not.toBeNull();
34-
expect(bufferSetting.endType).toEqual(BufferEndType.FLAT);
34+
expect(bufferSetting.endType).toEqual(SuperMap.BufferEndType.FLAT);
3535
expect(bufferSetting.semicircleLineSegment).toEqual(4);
3636
bufferSetting.destroy();
3737
});

test/Core/iServer/BurstPipelineAnalystServiceSpec.js renamed to test/common/iServer/BurstPipelineAnalystServiceSpec.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require('../../../src/Core/iServer/BurstPipelineAnalystService');
1+
require('../../../src/common/iServer/BurstPipelineAnalystService');
22

33
var serviceFailedEventArgsSystem = null,
44
serviceCompletedEventArgsSystem = null;
@@ -23,7 +23,7 @@ describe('testBurstPipelineAnalystService_constructor',function(){
2323
var burstPipelineAnalystService = new SuperMap.REST.BurstPipelineAnalystService();
2424
expect(burstPipelineAnalystService).not.toBeNull();
2525
expect(burstPipelineAnalystService.CLASS_NAME).toBe("SuperMap.REST.BurstPipelineAnalystService");
26-
var burstPipelineAnalystParams = new BurstPipelineAnalystParameters();
26+
var burstPipelineAnalystParams = new SuperMap.BurstPipelineAnalystParameters();
2727
expect(burstPipelineAnalystParams.sourceNodeIDs).toBeNull();
2828
expect(burstPipelineAnalystParams.edgeID).toBeNull();
2929
expect(burstPipelineAnalystParams.nodeID).toBeNull();
@@ -33,7 +33,7 @@ describe('testBurstPipelineAnalystService_constructor',function(){
3333
it('constructor and destroy',function(){
3434
var burstPipelineAnalystService = initBurstPipelineAnalystService();
3535
burstPipelineAnalystService.events.on({"processCompleted": analyzeCompleted});
36-
var burstPipelineAnalystParams = new BurstPipelineAnalystParameters();
36+
var burstPipelineAnalystParams = new SuperMap.BurstPipelineAnalystParameters();
3737
burstPipelineAnalystParams.edgeID = 124;
3838
burstPipelineAnalystParams.isUncertainDirectionValid = true;
3939
expect(burstPipelineAnalystParams.sourceNodeIDs).toBeNull();
@@ -88,7 +88,7 @@ describe('testBurstPipelineAnalystService_processAsync',function(){
8888
//正确返回结果
8989
it('pass',function(done){
9090
var burstPipelineAnalystService = initBurstPipelineAnalystService();
91-
var burstPipelineAnalystParams = new BurstPipelineAnalystParameters({
91+
var burstPipelineAnalystParams = new SuperMap.BurstPipelineAnalystParameters({
9292
sourceNodeIDs:[1,2],
9393
edgeID:3434,
9494
nodeID:null,

test/Core/iServer/ComputeWeightMatrixServiceSpec.js renamed to test/common/iServer/ComputeWeightMatrixServiceSpec.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require('../../../src/Core/iServer/ComputeWeightMatrixService');
1+
require('../../../src/common/iServer/ComputeWeightMatrixService');
22

33
var serviceFailedEventArgsSystem = null;
44
//服务初始化时注册事件监听函数
@@ -34,7 +34,7 @@ describe('testComputeWeightMatrixService_processAsync',function(){
3434
var nodeArray = [new SuperMap.Geometry.Point(119.6100397551, -122.6278394459),
3535
new SuperMap.Geometry.Point(171.9035599945, -113.2491141857)
3636
];
37-
var resultSetting = new TransportationAnalystResultSetting({
37+
var resultSetting = new SuperMap.TransportationAnalystResultSetting({
3838
returnEdgeFeatures: true,
3939
returnEdgeGeometry: true,
4040
returnEdgeIDs: true,
@@ -44,11 +44,11 @@ describe('testComputeWeightMatrixService_processAsync',function(){
4444
returnPathGuides: true,
4545
returnRoutes: true
4646
});
47-
var analystParameter = new TransportationAnalystParameter({
47+
var analystParameter = new SuperMap.TransportationAnalystParameter({
4848
resultSetting: resultSetting,
4949
weightFieldName: "length"
5050
});
51-
var parameter = new ComputeWeightMatrixParameters({
51+
var parameter = new SuperMap.ComputeWeightMatrixParameters({
5252
isAnalyzeById: false,
5353
nodes: nodeArray,
5454
parameter: analystParameter
@@ -87,7 +87,7 @@ describe('testComputeWeightMatrixService_processAsync',function(){
8787
var nodeArray = [new SuperMap.Geometry.Point(119.6100397551, -122.6278394459),
8888
new SuperMap.Geometry.Point(171.9035599945, -113.2491141857)
8989
];
90-
var resultSetting = new TransportationAnalystResultSetting({
90+
var resultSetting = new SuperMap.TransportationAnalystResultSetting({
9191
returnEdgeFeatures: false,
9292
returnEdgeGeometry: false,
9393
returnEdgeIDs: false,
@@ -97,11 +97,11 @@ describe('testComputeWeightMatrixService_processAsync',function(){
9797
returnPathGuides: false,
9898
returnRoutes: false
9999
});
100-
var analystParameter = new TransportationAnalystParameter({
100+
var analystParameter = new SuperMap.TransportationAnalystParameter({
101101
resultSetting: resultSetting,
102102
weightFieldName: "length"
103103
});
104-
var parameter = new ComputeWeightMatrixParameters({
104+
var parameter = new SuperMap.ComputeWeightMatrixParameters({
105105
isAnalyzeById: true,
106106
nodes: nodeArray,
107107
parameter: analystParameter
@@ -131,7 +131,7 @@ describe('testComputeWeightMatrixService_processAsync',function(){
131131
var nodeArray = [new SuperMap.Geometry.Point(119.6100397551, -122.6278394459),
132132
new SuperMap.Geometry.Point(171.9035599945, -113.2491141857)
133133
];
134-
var resultSetting = new TransportationAnalystResultSetting({
134+
var resultSetting = new SuperMap.TransportationAnalystResultSetting({
135135
returnEdgeFeatures: false,
136136
returnEdgeGeometry: false,
137137
returnEdgeIDs: false,
@@ -141,11 +141,11 @@ describe('testComputeWeightMatrixService_processAsync',function(){
141141
returnPathGuides: false,
142142
returnRoutes: false
143143
});
144-
var analystParameter = new TransportationAnalystParameter({
144+
var analystParameter = new SuperMap.TransportationAnalystParameter({
145145
resultSetting: resultSetting,
146146
weightFieldName: "TurnCost1"
147147
});
148-
var parameter = new FindPathParameters({
148+
var parameter = new SuperMap.FindPathParameters({
149149
isAnalyzeById: false,
150150
nodes: nodeArray,
151151
parameter: analystParameter
@@ -193,7 +193,7 @@ describe('testComputeWeightMatrixService_processAsync',function(){
193193
var nodeArray = [new SuperMap.Geometry.Point(119.6100397551, -122.6278394459),
194194
new SuperMap.Geometry.Point(171.9035599945, -113.2491141857)
195195
];
196-
var resultSetting = new TransportationAnalystResultSetting({
196+
var resultSetting = new SuperMap.TransportationAnalystResultSetting({
197197
returnEdgeFeatures: true,
198198
returnEdgeGeometry: true,
199199
returnEdgeIDs: true,
@@ -203,11 +203,11 @@ describe('testComputeWeightMatrixService_processAsync',function(){
203203
returnPathGuides: true,
204204
returnRoutes: true
205205
});
206-
var analystParameter = new TransportationAnalystParameter({
206+
var analystParameter = new SuperMap.TransportationAnalystParameter({
207207
resultSetting: resultSetting,
208208
weightFieldName: "length"
209209
});
210-
var parameter = new ComputeWeightMatrixParameters({
210+
var parameter = new SuperMap.ComputeWeightMatrixParameters({
211211
isAnalyzeById: 2,
212212
nodes: nodeArray,
213213
parameter: analystParameter

test/Core/iServer/EditFeaturesServiceSpec.js renamed to test/common/iServer/EditFeaturesServiceSpec.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require('../../../src/Core/iServer/EditFeaturesService');
1+
require('../../../src/common/iServer/EditFeaturesService');
22

33
var serviceFailedEventArgsSystem = null;
44
var editFeaturesEventArgsSystem = null;
@@ -72,9 +72,9 @@ describe('testEditFeaturesService_processAsync', function () {
7272
fieldValues:[],
7373
geometry:polygon1
7474
});
75-
editFeatureParameter = new EditFeaturesParameters({
75+
editFeatureParameter = new SuperMap.EditFeaturesParameters({
7676
features: features,
77-
editType: EditType.ADD,
77+
editType: SuperMap.EditType.ADD,
7878
returnContent:true,
7979
isUseBatch: true
8080
});
@@ -133,9 +133,9 @@ describe('testEditFeaturesService_processAsync', function () {
133133
fieldValues:[],
134134
geometry:polygon
135135
};
136-
editFeatureParameter = new EditFeaturesParameters({
136+
editFeatureParameter = new SuperMap.EditFeaturesParameters({
137137
features: [features],
138-
editType: EditType.ADD,
138+
editType: SuperMap.EditType.ADD,
139139
returnContent:false
140140
});
141141
var editFeaturesService = initEditFeaturesService();
@@ -163,8 +163,8 @@ describe('testEditFeaturesService_processAsync', function () {
163163

164164
it('addFeatures_noParameters',function(done) {
165165
var editFeaturesService = initEditFeaturesService();
166-
editFeatureParameter = new EditFeaturesParameters({
167-
editType: EditType.ADD,
166+
editFeatureParameter = new SuperMap.EditFeaturesParameters({
167+
editType: SuperMap.EditType.ADD,
168168
returnContent: true
169169
});
170170
editFeaturesService.processAsync(editFeatureParameter);
@@ -213,9 +213,9 @@ describe('testEditFeaturesService_processAsync', function () {
213213
fieldValues:[],
214214
geometry:polygon
215215
};
216-
editFeatureParameter = new EditFeaturesParameters({
216+
editFeatureParameter = new SuperMap.EditFeaturesParameters({
217217
features: [features],
218-
editType: EditType.UPDATE
218+
editType: SuperMap.EditType.UPDATE
219219
});
220220
editFeaturesService.processAsync(editFeatureParameter);
221221

@@ -245,9 +245,9 @@ describe('testEditFeaturesService_processAsync', function () {
245245
/* //测试删除要素
246246
it('deleteFeatures',function(done){
247247
var editFeaturesService = initEditFeaturesService();
248-
var editFeatureParameter = new EditFeaturesParameters({
248+
var editFeatureParameter = new SuperMap.EditFeaturesParameters({
249249
IDs: [172, 173],
250-
editType: EditType.DELETE
250+
editType: SuperMap.EditType.DELETE
251251
});
252252
editFeaturesService.processAsync(editFeatureParameter);
253253

test/Core/iServer/FieldStatisticServiceSpec.js renamed to test/common/iServer/FieldStatisticServiceSpec.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require('../../../src/Core/iServer/FieldStatisticService');
1+
require('../../../src/common/iServer/FieldStatisticService');
22

33
var serviceFailedEventArgsSystem = null;
44
var fieldStatisticEventArgsSystem = null;
@@ -37,7 +37,7 @@ describe('testFieldStatisticService_processAsync', function () {
3737
fieldStatisticService.dataset = "Countries";
3838
fieldStatisticService.datasource = "World";
3939
fieldStatisticService.field = "SmID";
40-
fieldStatisticService.statisticMode = StatisticMode.AVERAGE;
40+
fieldStatisticService.statisticMode = SuperMap.StatisticMode.AVERAGE;
4141
fieldStatisticService.events.on({'processCompleted': fieldStatisticCompleted});
4242
fieldStatisticService.processAsync();
4343
setTimeout(function(){
@@ -68,7 +68,7 @@ describe('testFieldStatisticService_processAsync', function () {
6868
fieldStatisticService.dataset = "NoDataset";
6969
fieldStatisticService.datasource = "World";
7070
fieldStatisticService.field = "NotIDThis";
71-
fieldStatisticService.statisticMode = StatisticMode.AVERAGE;
71+
fieldStatisticService.statisticMode = SuperMap.StatisticMode.AVERAGE;
7272
fieldStatisticService.events.on({'processFailed': fieldStatisticFailed});
7373
fieldStatisticService.processAsync();
7474
setTimeout(function(){

0 commit comments

Comments
 (0)