[fix]修复UT, 文档 review by xiongjj

YOUYOUNG · YOUYOUNG · commit e39a85c1ba34 · 2022-01-06T09:25:53.000+08:00
diff --git a/src/common/commontypes/Vector.js b/src/common/commontypes/Vector.js
@@ -29,7 +29,7 @@ import {Util} from './Util';
  * @usage
  */
 // TRASH THIS
-const State = {
+export const State = {
   /** states */
   UNKNOWN: 'Unknown',
   INSERT: 'Insert',
diff --git a/src/common/iServer/CommonServiceBase.js b/src/common/iServer/CommonServiceBase.js
@@ -314,8 +314,7 @@ export class CommonServiceBase {
                 return requestResult;
             })
             .catch(function (e) {
-                var failure = options.scope ? FunctionExt.bind(options.failure, options.scope) : options.failure;
-                failure(e);
+                return { error: e };
             })
             .then((requestResult) => {
                 if (requestResult.error) {
diff --git a/src/common/overlay/feature/Circle.js b/src/common/overlay/feature/Circle.js
@@ -14,7 +14,6 @@ import {ShapeParameters} from './ShapeParameters';
  * @param {number} y - 圆心 y 坐标。
  * @param {number} r - 圆半径。
  * @usage
- * @private
  */
 
 export class Circle extends ShapeParameters {
diff --git a/src/common/overlay/feature/Point.js b/src/common/overlay/feature/Point.js
@@ -13,7 +13,6 @@ import { ShapeParameters } from './ShapeParameters';
  * @param {number} x - 点 x 坐标。
  * @param {number} y - 点 y 坐标。
  * @usage
- * @private
  */
 
 export class Point extends ShapeParameters {
diff --git a/test/common/commontypes/VectorSpec.js b/test/common/commontypes/VectorSpec.js
@@ -1,4 +1,4 @@
-import {Vector} from '../../../src/common/commontypes/Vector';
+import {Vector, State} from '../../../src/common/commontypes/Vector';
 import {Point} from '../../../src/common/commontypes/geometry/Point';
 
 describe('Vector', ()=> {
@@ -43,36 +43,36 @@ describe('Vector', ()=> {
         };
         var vector = new Vector(point, null, style);
         spyOn(vector,'toState').and.callThrough();
-        vector.state = SuperMap.State.DELETE;
-        vector.toState(SuperMap.State.UPDATE);
-        expect( vector.toState).toHaveBeenCalledWith(SuperMap.State.UPDATE);
+        vector.state = State.DELETE;
+        vector.toState(State.UPDATE);
+        expect( vector.toState).toHaveBeenCalledWith(State.UPDATE);
         expect(vector.state).toEqual("Update");
-        vector.state = SuperMap.State.INSERT;
-        vector.toState(SuperMap.State.UPDATE);
-        expect( vector.toState).toHaveBeenCalledWith(SuperMap.State.UPDATE);
+        vector.state = State.INSERT;
+        vector.toState(State.UPDATE);
+        expect( vector.toState).toHaveBeenCalledWith(State.UPDATE);
         expect(vector.state).toEqual("Insert");
-        vector.state = SuperMap.State.INSERT;
-        vector.toState(SuperMap.State.INSERT);
-        expect( vector.toState).toHaveBeenCalledWith(SuperMap.State.INSERT);
+        vector.state = State.INSERT;
+        vector.toState(State.INSERT);
+        expect( vector.toState).toHaveBeenCalledWith(State.INSERT);
         expect(vector.state).toEqual("Insert");
-        vector.state = SuperMap.State.UNKNOWN;
-        vector.toState(SuperMap.State.INSERT);
-        expect( vector.toState).toHaveBeenCalledWith(SuperMap.State.INSERT);
+        vector.state = State.UNKNOWN;
+        vector.toState(State.INSERT);
+        expect( vector.toState).toHaveBeenCalledWith(State.INSERT);
         expect(vector.state).toEqual("Unknown");
-        vector.state = SuperMap.State.INSERT;
-        vector.toState(SuperMap.State.DELETE);
-        expect( vector.toState).toHaveBeenCalledWith(SuperMap.State.DELETE);
+        vector.state = State.INSERT;
+        vector.toState(State.DELETE);
+        expect( vector.toState).toHaveBeenCalledWith(State.DELETE);
         expect(vector.state).toEqual("Insert");
-        vector.state = SuperMap.State.DELETE;
-        vector.toState(SuperMap.State.DELETE);
-        expect( vector.toState).toHaveBeenCalledWith(SuperMap.State.DELETE);
+        vector.state = State.DELETE;
+        vector.toState(State.DELETE);
+        expect( vector.toState).toHaveBeenCalledWith(State.DELETE);
         expect(vector.state).toEqual("Delete");
-        vector.state = SuperMap.State.UNKNOWN;
-        vector.toState(SuperMap.State.DELETE);
-        expect( vector.toState).toHaveBeenCalledWith(SuperMap.State.DELETE);
+        vector.state = State.UNKNOWN;
+        vector.toState(State.DELETE);
+        expect( vector.toState).toHaveBeenCalledWith(State.DELETE);
         expect(vector.state).toEqual("Delete");
-        vector.toState(SuperMap.State.UNKNOWN);
-        expect( vector.toState).toHaveBeenCalledWith(SuperMap.State.UNKNOWN);
+        vector.toState(State.UNKNOWN);
+        expect( vector.toState).toHaveBeenCalledWith(State.UNKNOWN);
         expect(vector.state).toEqual("Unknown");
     });
 });
diff --git a/test/common/components/chart/ChartViewModelSpec.js b/test/common/components/chart/ChartViewModelSpec.js
@@ -31,6 +31,9 @@ describe('ChartViewModel', () => {
     var chartViewModel = new ChartViewModel(options);
     beforeAll(() => {
         spyOn(FetchRequest, 'get').and.callFake((url) => {
+            if(url === options.datasets.url + '/content.json?pageSize=9999999&currentPage=1') {
+              return Promise.resolve(new Response((JSON.stringify(getFeaturesBySQLService))));
+            }
             if(url.indexOf('Rivers@World@@World') > -1){
                 return Promise.resolve(new Response(JSON.stringify(layerInfo)));
             }
@@ -67,6 +70,7 @@ describe('ChartViewModel', () => {
         var successed = function () {};
         chartViewModel.getDatasetInfo(successed);
         expect(chartViewModel.createChart).toBe(successed);
+        expect(chartViewModel.features).not.toBeNull();
     });
     it('_getDatasetInfoSuccess, _getLayerFeatures', () => {
         var datasetInf = {
diff --git a/test/leaflet/overlay/UniqueThemeLayerSpec.js b/test/leaflet/overlay/UniqueThemeLayerSpec.js
@@ -400,7 +400,9 @@ describe('leaflet_UniqueThemeLayer', () => {
                 }
             }, 6000);
         } else {
+            expect(false).toBeTruthy();
             console.log("'addFeatures'案例未获取到待添加的数据");
+            done();
         }
     });
 });

Original file line number	Diff line number	Diff line change
`@@ -400,7 +400,9 @@ describe('leaflet_UniqueThemeLayer', () => {`
`400`	`400`	`}`
`401`	`401`	`}, 6000);`
`402`	`402`	`} else {`
	`403`	`+ expect(false).toBeTruthy();`
`403`	`404`	`console.log("'addFeatures'案例未获取到待添加的数据");`
	`405`	`+ done();`
`404`	`406`	`}`
`405`	`407`	`});`
`406`	`408`	`});`