fix 测试

songyumeng · songyumeng · commit 5dc25da8f03a · 2017-10-12T09:37:19.000+08:00
diff --git a/test/leaflet/services/AddressMatchServiceSpec.js b/test/leaflet/services/AddressMatchServiceSpec.js
@@ -138,25 +138,26 @@ describe('leaflet_testAddressMatchService', function () {
             maxReturn: -1,
             geoDecodingRadius: 500
         });
-        var GeoDecodingService = L.supermap.addressMatchService(addressMatchURL, options).decode(GeoDecodingParams, function (result) {
+        var geoDecodingService = L.supermap.addressMatchService(addressMatchURL, options);
+        geoDecodingService.decode(GeoDecodingParams, function (result) {
             serviceResult = result
         });
         setTimeout(function () {
             try {
-                expect(GeoDecodingService).not.toBeNull();
-                expect(GeoDecodingService.options.serverType).toBe("iServer");
+                expect(geoDecodingService).not.toBeNull();
+                expect(geoDecodingService.options.serverType).toBe("iServer");
                 expect(serviceResult.type).toBe("processCompleted");
                 var result = serviceResult.result;
                 expect(result).not.toBeNull();
                 expect(result).not.toBeNull();
                 expect(result.success).toBeFalsy();
                 expect(result.error.code).toEqual(400);
                 expect(result.error.errorMsg).toBe("location not valid!");
-                GeoDecodingService.destroy();
+                geoDecodingService.destroy();
                 done();
             } catch (exception) {
                 console.log("'failEvent:GeoDecodingLocationInvalid'案例失败：" + exception.name + ":" + exception.message);
-                GeoDecodingService.destroy();
+                geoDecodingService.destroy();
                 expect(false).toBeTruthy();
                 done();
             }
diff --git a/test/leaflet/services/ThemeServiceSpec.js b/test/leaflet/services/ThemeServiceSpec.js
@@ -333,7 +333,7 @@ describe('leaflet_testThemeService', function () {
             dataSourceNames: ["World"]
         });
         var themeLableService = L.supermap.themeService(WorldURL, options);
-        themeGridRangeService.getThemeInfo(themeLableParameters, function (result) {
+        themeLableService.getThemeInfo(themeLableParameters, function (result) {
             serviceResult = result
         });
         setTimeout(function () {
@@ -394,7 +394,7 @@ describe('leaflet_testThemeService', function () {
             themes: [themeRange]
         });
         var themeRangeService = L.supermap.themeService(ChinaURL, options);
-        themeGridRangeService.getThemeInfo(themeRangeParameters, function (result) {
+        themeRangeService.getThemeInfo(themeRangeParameters, function (result) {
             serviceResult = result
         });
         setTimeout(function () {
@@ -454,7 +454,7 @@ describe('leaflet_testThemeService', function () {
             themes: [themeUnique]
         });
         var themeUniqueService = L.supermap.themeService(ChinaURL, options);
-        themeGridRangeService.getThemeInfo(themeUniqueParameters, function (result) {
+        themeUniqueService.getThemeInfo(themeUniqueParameters, function (result) {
             serviceResult = result
         });
         setTimeout(function () {
diff --git a/test/openlayers/control/ChangeTileVersionSpec.js b/test/openlayers/control/ChangeTileVersionSpec.js
@@ -92,24 +92,24 @@ describe('openlayers_testChangeTileVersion', function () {
         var options = {
             orientation: "horizontal"
         };
-        var changetileversion = new ol.supermap.control.ChangeTileVersion(options);
-        var result = changetileversion.setLayer(baseLayer);
-        expect(result).not.toBeNull();
-        expect(result.firstLoad).toBeTruthy();
-        expect(result.options.collapsed).toBeTruthy();
-        expect(result.options.switch).toBeTruthy();
-        expect(result.options.orientation).toBe("horizontal");
-        expect(result.options.title).toBe("切换缓存版本");
-        expect(result.options.tooltip).toBe("top");
+        var changeTileVersion = new ol.supermap.control.ChangeTileVersion(options);
+        changeTileVersion.setLayer(baseLayer);
+        expect(changeTileVersion).not.toBeNull();
+        expect(changeTileVersion.firstLoad).toBeTruthy();
+        expect(changeTileVersion.options.collapsed).toBeTruthy();
+        expect(changeTileVersion.options.switch).toBeTruthy();
+        expect(changeTileVersion.options.orientation).toBe("horizontal");
+        expect(changeTileVersion.options.title).toBe("切换缓存版本");
+        expect(changeTileVersion.options.tooltip).toBe("top");
     });
 
     it("removeLayer", function () {
         var options = {
             orientation: "horizontal"
         };
-        var changetileversion = new ol.supermap.control.ChangeTileVersion(options);
-        var result = changetileversion.removeLayer();
-        expect(result.options.layer).toBeNull();
+        var changeTileVersion = new ol.supermap.control.ChangeTileVersion(options);
+        changeTileVersion.removeLayer();
+        expect(changeTileVersion.options.layer).toBeNull();
     });
 
     it("tilesVersion", function () {
