fix 测试

songyumeng · songyumeng · commit d681721cb4b2 · 2017-06-14T17:44:08.000+08:00
diff --git a/dist/iclient9-leaflet.js b/dist/iclient9-leaflet.js
diff --git a/dist/iclient9-leaflet.min.js b/dist/iclient9-leaflet.min.js
diff --git a/src/leaflet/mapping/WebMap.js b/src/leaflet/mapping/WebMap.js
@@ -242,13 +242,10 @@ var WebMap = L.LayerGroup.extend({
             if (type == "ter")type = "cta"
         }
         wmtsURL = wmtsURL.replace("{type}", type).replace("{proj}", proj);
-        var layer = L.tileLayer.wmts(wmtsURL,
+        var layer = L.supermap.tiandituTileLayer(wmtsURL,
             {
                 layer: type,
-                style: "default",
                 tilematrixSet: proj,
-                format: "tiles",
-                subdomains: [0, 1, 2, 3, 4, 5, 6, 7]
             }
         );
         return layer;
diff --git a/test/common/iServer/GenerateSpatialDataServiceSpec.js b/test/common/iServer/GenerateSpatialDataServiceSpec.js
@@ -206,7 +206,7 @@ describe('testGenerateSpatialDataService_processAsync',function(){
                 generateSpatialDataParameters.destroy();
                 done();
             }
-        },1000)
+        },2000)
     });
 });
 
diff --git a/test/common/iServer/MathExpressionAnalysisServiceSpec.js b/test/common/iServer/MathExpressionAnalysisServiceSpec.js
@@ -62,7 +62,7 @@ describe('testMathExpressionAnalysisService_processAsync',function(){
                 mathExpressionAnalysisParameters.destroy();
                 done();
             }
-        },2000);
+        },6000);
     });
 
     it('fail',function(done){
@@ -93,7 +93,7 @@ describe('testMathExpressionAnalysisService_processAsync',function(){
                 mathExpressionAnalysisParameters.destroy();
                 done();
             }
-        },2000);
+        },6000);
     })
 });
 
diff --git a/test/common/iServer/SurfaceAnalystServiceSpec.js b/test/common/iServer/SurfaceAnalystServiceSpec.js
@@ -114,7 +114,7 @@ describe('testSurfaceAnalystService_processAsync', function () {
                 expect(false).toBeTruthy();
                 done();
             }
-        }, 4000);
+        }, 6000);
     });
 
     //对象提取等值线
diff --git a/test/common/iServer/TerrainCurvatureCalculationServiceSpec.js b/test/common/iServer/TerrainCurvatureCalculationServiceSpec.js
@@ -60,7 +60,7 @@ describe('testTerrainCurvatureCalculationService_processAsync',function(){
                 terrainCurvatureCalculationParameters.destroy();
                 done();
             }
-        },2000);
+        },6000);
     });
 
     //测试失败事件
@@ -94,7 +94,7 @@ describe('testTerrainCurvatureCalculationService_processAsync',function(){
                 terrainCurvatureCalculationParameters.destroy();
                 done();
             }
-        },2000);
+        },6000);
     });
 });
 
diff --git a/test/common/iServer/ThemeServiceSpec.js b/test/common/iServer/ThemeServiceSpec.js
@@ -103,7 +103,7 @@ describe('testThemeService_processAsync', function () {
                 themeParameters.destroy();
                 done();
             }
-        }, 2000);
+        }, 4000);
     });
 
     it('Range_1',function(done){

Original file line number	Diff line number	Diff line change
`@@ -242,13 +242,10 @@ var WebMap = L.LayerGroup.extend({`
`242`	`242`	`if (type == "ter")type = "cta"`
`243`	`243`	`}`
`244`	`244`	`wmtsURL = wmtsURL.replace("{type}", type).replace("{proj}", proj);`
`245`		`- var layer = L.tileLayer.wmts(wmtsURL,`
	`245`	`+ var layer = L.supermap.tiandituTileLayer(wmtsURL,`
`246`	`246`	`{`
`247`	`247`	`layer: type,`
`248`		`- style: "default",`
`249`	`248`	`tilematrixSet: proj,`
`250`		`- format: "tiles",`
`251`		`- subdomains: [0, 1, 2, 3, 4, 5, 6, 7]`
`252`	`249`	`}`
`253`	`250`	`);`
`254`	`251`	`return layer;`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ describe('testGenerateSpatialDataService_processAsync',function(){`
`206`	`206`	`generateSpatialDataParameters.destroy();`
`207`	`207`	`done();`
`208`	`208`	`}`
`209`		`- },1000)`
	`209`	`+ },2000)`
`210`	`210`	`});`
`211`	`211`	`});`
`212`	`212`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ describe('testSurfaceAnalystService_processAsync', function () {`
`114`	`114`	`expect(false).toBeTruthy();`
`115`	`115`	`done();`
`116`	`116`	`}`
`117`		`- }, 4000);`
	`117`	`+ }, 6000);`
`118`	`118`	`});`
`119`	`119`
`120`	`120`	`//对象提取等值线`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ describe('testThemeService_processAsync', function () {`
`103`	`103`	`themeParameters.destroy();`
`104`	`104`	`done();`
`105`	`105`	`}`
`106`		`- }, 2000);`
	`106`	`+ }, 4000);`
`107`	`107`	`});`
`108`	`108`
`109`	`109`	`it('Range_1',function(done){`