Skip to content

Commit 8833ebf

Browse files
chenmeiyiSupermapchenmeiyiSupermap
committed
调整iclient9D单元测试目录结构。
1 parent b4ec5b6 commit 8833ebf

File tree

3 files changed

+39
-39
lines changed

3 files changed

+39
-39
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"compress-leaflet": "uglifyjs --comments /Copyright©/i -c -m -o ./dist/iclient9-leaflet.min.js -- ./dist/iclient9-leaflet.js",
1717
"package": "node ./build/pack.js",
1818
"package-debug": "node ./build/pack.js - debug",
19-
"test": "karma start",
20-
"citest": "karma start --single-run"
19+
"test": "karma start ./test/karma.conf.js",
20+
"citest": "karma start ./test/karma.conf.js --single-run"
2121
},
2222
"keywords": [
2323
"SuperMap",

‎sonar-project.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ sonar.projectVersion=9.0.0
77
sonar.sources=src/
88
sonar.inclusions=src/**/*.js
99
sonar.exclusions=src/legacy/**/*.js,src/common/style/CartoCSS.js
10-
sonar.test.inclusions=test/**/*.js
10+
# sonar.test.inclusions=test/**/*.js
1111

1212
# Language
1313
sonar.language=js
@@ -17,4 +17,4 @@ sonar.sourceEncoding=UTF-8
1717
sonar.host.url=http://sonar.ispeco.com:9001
1818

1919
sonar.profile=Sonar way
20-
sonar.javascript.lcov.reportPath=testcoverage/lcov.info
20+
sonar.javascript.lcov.reportPath=test/testcoverage/lcov.info

karma.conf.js renamed to test/karma.conf.js

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,26 @@ module.exports = function (config) {
2222
// false 表示初始化的时候不会使用 script 标签直接将相关 js 引入到浏览器，需要自己写代码加载, 注意添加顺序
2323
files: [
2424
/***legacy的源码***/
25-
{pattern: './src/legacy/libs/SuperMap_Basic-8.1.1-14426.js', include: false},
26-
{pattern: './src/legacy/libs/Lang/*.js', include: false},
27-
{pattern: './src/legacy/theme/default/*.css', include: false},
25+
{pattern: '../src/legacy/libs/SuperMap_Basic-8.1.1-14426.js', include: false},
26+
{pattern: '../src/legacy/libs/Lang/*.js', include: false},
27+
{pattern: '../src/legacy/theme/default/*.css', include: false},
2828
/***common的源码***/
29-
'./src/common/*.js',
30-
'./src/common/**/*.js',
29+
'../src/common/*.js',
30+
'../src/common/**/*.js',
3131
/***leaflet的源码***/
32-
{pattern: './node_modules/leaflet/dist/leaflet.css', include: false},
33-
'./src/leaflet/**/*.js',
34-
'./src/leaflet/overlay/**/*.js',
32+
{pattern: '../node_modules/leaflet/dist/leaflet.css', include: false},
33+
'../src/leaflet/**/*.js',
34+
'../src/leaflet/overlay/**/*.js',
3535
/***openlayers的源码***/
36-
{pattern: './node_modules/openlayers/dist/ol-debug.css', include: false},
37-
'./src/openlayers/**/*.js',
38-
'./src/openlayers/overlay/**/*.js',
36+
{pattern: '../node_modules/openlayers/dist/ol-debug.css', include: false},
37+
'../src/openlayers/**/*.js',
38+
'../src/openlayers/overlay/**/*.js',
3939
/***测试文件***/
40-
'./test/tool/**.js',
40+
'./tool/**.js',
4141
// 以下为不同客户端对应的配置文件, 分别存放各自的测试用例以便调试
42-
'./test/test-main-common.js',
43-
'./test/test-main-leaflet.js',
44-
'./test/test-main-openlayers.js'
42+
'./test-main-common.js',
43+
'./test-main-leaflet.js',
44+
'./test-main-openlayers.js'
4545
],
4646

4747
// list of files to exclude 测试时排除的文件
@@ -51,25 +51,25 @@ module.exports = function (config) {
5151
// preprocess matching files before serving them to the browser
5252
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
5353
preprocessors: {
54-
'./node_modules/whatwg-fetch/fetch.js': ['browserify'],
55-
'./node_modules/fetch-jsonp/build/fetch-jsonp.js': ['browserify'],
56-
'./src/legacy/libs/SuperMap_Basic-8.1.1-14426.js': ['browserify'],
57-
'./src/legacy/libs/Lang/*.js': ['browserify'],
58-
'./src/common/**/*.js': ['browserify'],
59-
'./test/common/**/*Spec.js': ['browserify'],
60-
'./test/test-main-common.js': ['browserify'],
61-
62-
'./node_modules/leaflet/dist/leaflet-src.js': ['browserify'],
63-
'./src/leaflet/**/*.js': ['browserify'],
64-
'./src/leaflet/overlay/**/*.js': ['browserify'],
65-
'./test/leaflet/**/*Spec.js': ['browserify'],
66-
'./test/test-main-leaflet.js': ['browserify'],
67-
68-
'./node_modules/openlayers/dist/ol-debug.js': ['browserify'],
69-
'./src/openlayers/**/*.js': ['browserify'],
70-
'./src/openlayers/overlay/**/*.js': ['browserify'],
71-
'./test/openlayers/**/*Spec.js': ['browserify'],
72-
'./test/test-main-openlayers.js': ['browserify']
54+
'../node_modules/whatwg-fetch/fetch.js': ['browserify'],
55+
'../node_modules/fetch-jsonp/build/fetch-jsonp.js': ['browserify'],
56+
'../src/legacy/libs/SuperMap_Basic-8.1.1-14426.js': ['browserify'],
57+
'../src/legacy/libs/Lang/*.js': ['browserify'],
58+
'../src/common/**/*.js': ['browserify'],
59+
'./common/**/*Spec.js': ['browserify'],
60+
'./test-main-common.js': ['browserify'],
61+
62+
'../node_modules/leaflet/dist/leaflet-src.js': ['browserify'],
63+
'../src/leaflet/**/*.js': ['browserify'],
64+
'../src/leaflet/overlay/**/*.js': ['browserify'],
65+
'./leaflet/**/*Spec.js': ['browserify'],
66+
'./test-main-leaflet.js': ['browserify'],
67+
68+
'../node_modules/openlayers/dist/ol-debug.js': ['browserify'],
69+
'../src/openlayers/**/*.js': ['browserify'],
70+
'../src/openlayers/overlay/**/*.js': ['browserify'],
71+
'./openlayers/**/*Spec.js': ['browserify'],
72+
'./test-main-openlayers.js': ['browserify']
7373
},
7474

7575
// test results reporter to use
@@ -118,7 +118,7 @@ module.exports = function (config) {
118118

119119
// Concurrency level
120120
// how many browser should be started simultaneous
121-
concurrency: Infinity,
121+
concurrency: Infinity
122122

123123
})
124124
};

0 commit comments

Comments
 (0)