Skip to content

Commit 4c0d02b

Browse files
chenmeiyiSupermapchenmeiyiSupermap
committed
增加iClient9单元测试。review by zhurch
1 parent 0a581f2 commit 4c0d02b

22 files changed

+3149
-295
lines changed

‎karma.conf.js‎

Lines changed: 53 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,25 @@ module.exports = function (config) {
2020
// list of files patterns to load in the browser
2121
// false 表示初始化的时候不会使用 script 标签直接将相关 js 引入到浏览器，需要自己写代码加载, 注意添加顺序
2222
files: [
23-
/***legacy文件夹下的源码添加至此***/
23+
/***legacy文件夹下的源码添加至此***/
2424
{pattern: 'src/legacy/libs/SuperMap_Basic-8.1.1-14426.js', include: false},
2525
{pattern: 'src/legacy/libs/Lang/*.js', include: false},
2626
{pattern: 'src/legacy/theme/default/*.css', include: false},
27-
/***common文件夹下的源码添加至此***/
27+
/***common文件夹下的源码添加至此***/
2828
'src/common/SuperMap.js',
2929
'src/common/REST.js',
3030
'src/common/style/CartoCSS.js',
3131
'src/common/**/*.js',
32-
33-
/***Leaflet文件夹下的源码添加至此，暂未添加***/
34-
35-
/***OL3文件夹下的源码添加至此，暂未添加***/
36-
37-
/***以下全是测试文件***/
32+
/***Leaflet文件夹下的源码添加至此，暂未添加***/
33+
'src/leaflet/**/*.js',
34+
'src/leaflet/overlay/**/*.js',
35+
/***OL3文件夹下的源码添加至此，暂未添加***/
36+
//'src/openlayers/**/*.js',
37+
//'src/openlayers/overlay/**/*.js',
38+
39+
/***以下全是测试文件***/
3840
'test/tool/GlobeParameter.js',
39-
/**common --iServer**/
41+
/**common --iServer**/
4042
//'test/common/iServer/AreaSolarRadiationServiceSpec.js', //iclient8注释掉
4143
'test/common/iServer/BufferAnalystServiceSpec.js',
4244
'test/common/iServer/BufferDistanceSpec.js',
@@ -46,7 +48,7 @@ module.exports = function (config) {
4648
//'test/common/iServer/ChartQueryServiceSpec.js', //iclient8注释掉
4749
'test/common/iServer/ComputeWeightMatrixServiceSpec.js',
4850
//'test/common/iServer/DensityAnalystServiceSpec.js', //iclient8注释掉,fieldName
49-
'test/common/iServer/EditFeaturesServiceSpec.js', //delete方法有问题，暂时将delete方法注释掉
51+
'test/common/iServer/EditFeaturesServiceSpec.js',
5052
//三维网络分析Facility系列的测试全部被iClient8注释掉
5153
//'test/common/iServer/FacilityAnalystSinks3DServiceSpec.js',
5254
//'test/common/iServer/FacilityAnalystSources3DServiceSpec.js',
@@ -87,24 +89,44 @@ module.exports = function (config) {
8789
//'test/common/iServer/SetLayersInfoServiceSpec.js', //待开发先进行验证,再进行测试,暂时忽略
8890
'test/common/iServer/SetLayerStatusServiceSpec.js',
8991
'test/common/iServer/StopQueryServiceSpec.js',
90-
'test/common/iServer/SurfaceAnalystServiceSpec.js', //待开发将等值线LinearRing添加到GeoJason后再补充对应测试
92+
//'test/common/iServer/SurfaceAnalystServiceSpec.js', //待开发将等值线LinearRing添加到GeoJason后再补充对应测试
9193
'test/common/iServer/TerrainCurvatureCalculationServiceSpec.js',
9294
'test/common/iServer/ThemeServiceSpec.js',
9395
'test/common/iServer/ThiessenAnalystServiceSpec.js',
9496
'test/common/iServer/TilesetsServiceSpec.js',
9597
'test/common/iServer/TransferPathServiceSpec.js',
9698
'test/common/iServer/TransferSolutionServiceSpec.js',
9799
'test/common/iServer/UpdateEdgeWeightServiceSpec.js',
98-
'test/common/iServer/UpdateTurnNodeWeightServiceSpec.js'
100+
'test/common/iServer/UpdateTurnNodeWeightServiceSpec.js',
99101

100102
/*Leaflet、OL3、legacy文件夹测试代码，暂未添加*/
101-
103+
/**leaflet --services**/
104+
'test/leaflet/services/QueryByBoundsServiceSpec.js',
105+
'test/leaflet/services/QueryByDistanceServiceSpec.js',
106+
'test/leaflet/services/QueryBySQLServiceSpec.js',
107+
'test/leaflet/services/QueryByGeometryServiceSpec.js',
108+
'test/leaflet/services/GetFeaturesByIDsServiceSpec.js',
109+
'test/leaflet/services/GetFeaturesByBoundsServiceSpec.js',
110+
'test/leaflet/services/GetFeaturesByBufferServiceSpec.js',
111+
'test/leaflet/services/GetFeaturesBySQLServiceSpec.js',
112+
'test/leaflet/services/GetFeaturesByGeometryServiceSpec.js',
113+
'test/leaflet/services/EditFeaturesServiceRegionSpec.js',
114+
'test/leaflet/services/EditFeaturesServiceLineSpec.js',
115+
'test/leaflet/services/EditFeaturesServicePointSpec.js',
116+
'test/leaflet/services/AddressServiceSpec.js',
117+
'test/leaflet/services/FieldServiceSpec.js',
118+
'test/leaflet/services/ThemeServiceSpec.js',
119+
120+
/**openlayers --services**/
121+
//'test/openlayers/services/QueryServiceSpec.js'
102122
],
103123

104124
// list of files to exclude 测试时排除的文件
105125
exclude: [
106126
//暂时先排除(因为Request引用了node_modules中的库，但在karma下识别不到路径，暂时找不到解决办法)
107127

128+
/*leaflet*/
129+
'test/leaflet/services/AddressServiceSpec.js' //启了服务再测
108130
],
109131

110132

@@ -116,8 +138,22 @@ module.exports = function (config) {
116138
'./node_modules/fetch-jsonp/build/fetch-jsonp.js': ['browserify'],
117139
'src/legacy/libs/Lang/*.js': ['browserify'],
118140
'src/common/**/*.js': ['browserify'],
119-
'test/common/**/*Spec.js': ['browserify']
120-
},
141+
'test/common/**/*Spec.js': ['browserify'],
142+
143+
'src/leaflet/**/*.js': ['browserify'],
144+
'src/leaflet/overlay/**/*.js': ['browserify'],
145+
'./node_modules/leaflet/dist/leaflet-src.js': ['browserify'],
146+
'./node_modules/leaflet/dist/leaflet.js': ['browserify'],
147+
'./node_modules/leaflet/src/Leaflet.js': ['browserify'],
148+
'test/leaflet/**/*Spec.js': ['browserify'],
149+
150+
//'src/openlayers/**/*.js': ['browserify'],
151+
//'src/openlayers/overlay/**/*.js': ['browserify'],
152+
//'node_modules/openlayers/dist/ol-debug.js': ['browserify'],
153+
//'node_modules/openlayers/dist/ol.js': ['browserify'],
154+
//'test/openlayers/**/*Spec.js': ['browserify']
155+
}
156+
,
121157

122158
// test results reporter to use
123159
// possible values: 'dots', 'progress'
@@ -134,7 +170,8 @@ module.exports = function (config) {
134170
reporters: [
135171
{type: 'lcov', subdir: '.'}
136172
]
137-
},
173+
}
174+
,
138175

139176
// web server port
140177
port: 9876,

‎test/common/iServer/BufferAnalystServiceSpec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ describe('testBufferAnalystService_processAsync', function () {
6767
}, 4000)
6868
});
6969

70-
it('byGeometry_NotReturnContent', function (done) {
70+
it('SuccessEvent:byGeometry_NotReturnContent', function (done) {
7171

7272
var bfServiceByGeometry = initBufferAnalystService();
7373
expect(bfServiceByGeometry).not.toBeNull();
@@ -112,7 +112,7 @@ describe('testBufferAnalystService_processAsync', function () {
112112
});
113113

114114
//测试失败事件
115-
it('byGeometry_NotReturnContent', function (done) {
115+
it('failEvent:byGeometry_NotReturnContent', function (done) {
116116
var bfServiceByGeometry = initBufferAnalystService();
117117
expect(bfServiceByGeometry).not.toBeNull();
118118
expect(bfServiceByGeometry.url).toEqual(url);

0 commit comments

Comments
 (0)