1- import { spatialAnalystService } from '../../../src/leaflet/services/SpatialAnalystService' ;
2- import { GeometryBufferAnalystParameters } from '../../../src/common/iServer/GeometryBufferAnalystParameters' ;
3- import { DatasetBufferAnalystParameters } from '../../../src/common/iServer/DatasetBufferAnalystParameters' ;
4- import { BufferSetting } from '../../../src/common/iServer/BufferSetting' ;
5- import { BufferDistance } from '../../../src/common/iServer/BufferDistance' ;
6- import { FilterParameter } from '../../../src/common/iServer/FilterParameter' ;
7- import { DataReturnOption } from '../../../src/common/iServer/DataReturnOption' ;
8- import { BufferEndType } from '../../../src/common/REST' ;
9- import { DataReturnMode } from '../../../src/common/REST' ;
1+ import { spatialAnalystService } from '../../../src/leaflet/services/SpatialAnalystService' ;
2+ import { GeometryBufferAnalystParameters } from '../../../src/common/iServer/GeometryBufferAnalystParameters' ;
3+ import { DatasetBufferAnalystParameters } from '../../../src/common/iServer/DatasetBufferAnalystParameters' ;
4+ import { BufferSetting } from '../../../src/common/iServer/BufferSetting' ;
5+ import { BufferDistance } from '../../../src/common/iServer/BufferDistance' ;
6+ import { FilterParameter } from '../../../src/common/iServer/FilterParameter' ;
7+ import { DataReturnOption } from '../../../src/common/iServer/DataReturnOption' ;
8+ import { BufferEndType } from '../../../src/common/REST' ;
9+ import { DataReturnMode } from '../../../src/common/REST' ;
1010import request from 'request' ;
1111import { FetchRequest } from '../../../src/common/util/FetchRequest' ;
1212
@@ -63,13 +63,13 @@ describe('leaflet_SpatialAnalystService_bufferAnalysis', () => {
6363 [ - 4210.533 , 8182.656 ] ,
6464 [ - 4261.485 , 8554.893 ]
6565 ] ;
66- var roadLine = L . polyline ( pointsList , { color : 'red' } ) ;
66+ var roadLine = L . polyline ( pointsList , { color : 'red' } ) ;
6767 var geoBufferAnalystParams = new GeometryBufferAnalystParameters ( {
6868 sourceGeometry : roadLine ,
6969 bufferSetting : new BufferSetting ( {
7070 endType : BufferEndType . ROUND ,
71- leftDistance : new BufferDistance ( { value : 250 } ) ,
72- rightDistance : new BufferDistance ( { value : 250 } ) ,
71+ leftDistance : new BufferDistance ( { value : 250 } ) ,
72+ rightDistance : new BufferDistance ( { value : 250 } ) ,
7373 semicircleLineSegment : 10
7474 } )
7575 } ) ;
@@ -84,10 +84,7 @@ describe('leaflet_SpatialAnalystService_bufferAnalysis', () => {
8484 expect ( options ) . not . toBeNull ( ) ;
8585 return Promise . resolve ( new Response ( JSON . stringify ( bufferAnalysis_byGeometryResultJson ) ) ) ;
8686 } ) ;
87- bufferAnalystService . bufferAnalysis ( geoBufferAnalystParams , ( result ) => {
88- serviceResult = result ;
89- } ) ;
90- setTimeout ( ( ) => {
87+ bufferAnalystService . bufferAnalysis ( geoBufferAnalystParams , ( serviceResult ) => {
9188 try {
9289 expect ( bufferAnalystService ) . not . toBeNull ( ) ;
9390 expect ( serviceResult ) . not . toBeNull ( ) ;
@@ -112,7 +109,8 @@ describe('leaflet_SpatialAnalystService_bufferAnalysis', () => {
112109 expect ( false ) . toBeTruthy ( ) ;
113110 done ( ) ;
114111 }
115- } , 5000 ) ;
112+ } ) ;
113+
116114 } ) ;
117115
118116 var resultDataset = "bufferAnalystByDatasets_leafletTest" ;
@@ -124,8 +122,8 @@ describe('leaflet_SpatialAnalystService_bufferAnalysis', () => {
124122 } ) ,
125123 bufferSetting : new BufferSetting ( {
126124 endType : BufferEndType . ROUND ,
127- leftDistance : { value : 10 } ,
128- rightDistance : { value : 10 } ,
125+ leftDistance : { value : 10 } ,
126+ rightDistance : { value : 10 } ,
129127 semicircleLineSegment : 10
130128 } ) ,
131129 resultSetting : new DataReturnOption ( {
@@ -149,13 +147,20 @@ describe('leaflet_SpatialAnalystService_bufferAnalysis', () => {
149147 } ) ;
150148 bufferAnalystService . bufferAnalysis ( dsBufferAnalystParameters , ( result ) => {
151149 serviceResult = result ;
150+ try {
151+ expect ( serviceResult ) . not . toBeNull ( ) ;
152+ expect ( serviceResult . type ) . toBe ( 'processCompleted' ) ;
153+ expect ( serviceResult . result . succeed ) . toBeTruthy ( ) ;
154+ expect ( serviceResult . result . dataset ) . toEqual ( resultDataset + "@Changchun" ) ;
155+ done ( ) ;
156+ } catch ( exception ) {
157+ console . log ( "'bufferAnalysis_byDatasets'案例失败" + exception . name + ":" + exception . message ) ;
158+ bufferAnalystService . destroy ( ) ;
159+ expect ( false ) . toBeTruthy ( ) ;
160+ done ( ) ;
161+ }
152162 } ) ;
153- setTimeout ( ( ) => {
154- expect ( serviceResult ) . not . toBeNull ( ) ;
155- expect ( serviceResult . type ) . toBe ( 'processCompleted' ) ;
156- expect ( serviceResult . result . succeed ) . toBeTruthy ( ) ;
157- done ( ) ;
158- } , 5000 ) ;
163+
159164 } ) ;
160165
161166} ) ;
0 commit comments