@@ -24,7 +24,7 @@ describe('InterpolationAnalystService', function () {
2424 var originalTimeout ;
2525 beforeEach ( function ( ) {
2626 originalTimeout = jasmine . DEFAULT_TIMEOUT_INTERVAL ;
27- jasmine . DEFAULT_TIMEOUT_INTERVAL = 10000 ;
27+ jasmine . DEFAULT_TIMEOUT_INTERVAL = 50000 ;
2828 serviceFailedEventArgsSystem = null ;
2929 analystEventArgsSystem = null ;
3030 } ) ;
@@ -61,7 +61,8 @@ describe('InterpolationAnalystService', function () {
6161 var serviceResult = analystEventArgsSystem . result ;
6262 expect ( serviceResult ) . not . toBeNull ( ) ;
6363 expect ( serviceResult . succeed ) . toBeTruthy ( ) ;
64- expect ( serviceResult . dataset ) . toEqual ( resultDataset_RBFByDS + "@Interpolation" ) ;
64+ expect ( serviceResult . dataset ) . toContain ( resultDataset_RBFByDS ) ;
65+ expect ( serviceResult . dataset ) . toContain ( "@Interpolation" ) ;
6566 interpolationAnalystService . destroy ( ) ;
6667 interpolationRBFAnalystParameters . destroy ( ) ;
6768 done ( ) ;
@@ -72,7 +73,7 @@ describe('InterpolationAnalystService', function () {
7273 interpolationRBFAnalystParameters . destroy ( ) ;
7374 done ( ) ;
7475 }
75- } , 5000 ) ;
76+ } , 10000 ) ;
7677 } ) ;
7778 // 删除测试过程中产生的数据集
7879 it ( 'delete test resources_RBFByDS' , function ( done ) {
@@ -106,7 +107,8 @@ describe('InterpolationAnalystService', function () {
106107 var serviceResult = analystEventArgsSystem . result ;
107108 expect ( serviceResult ) . not . toBeNull ( ) ;
108109 expect ( serviceResult . succeed ) . toBeTruthy ( ) ;
109- expect ( serviceResult . dataset ) . toEqual ( resultDataset_densityByDS + "@Interpolation" ) ;
110+ expect ( serviceResult . dataset ) . toContain ( resultDataset_densityByDS ) ;
111+ expect ( serviceResult . dataset ) . toContain ( "@Interpolation" ) ;
110112 interpolationAnalystService . destroy ( ) ;
111113 interpolationDensityAnalystParameters . destroy ( ) ;
112114 done ( ) ;
@@ -117,7 +119,7 @@ describe('InterpolationAnalystService', function () {
117119 interpolationDensityAnalystParameters . destroy ( ) ;
118120 done ( ) ;
119121 }
120- } , 5000 ) ;
122+ } , 10000 ) ;
121123 } ) ;
122124 // 删除测试过程中产生的数据集
123125 it ( 'delete test resources_densityByDS' , function ( done ) {
@@ -153,7 +155,8 @@ describe('InterpolationAnalystService', function () {
153155 var serviceResult = analystEventArgsSystem . result ;
154156 expect ( serviceResult ) . not . toBeNull ( ) ;
155157 expect ( serviceResult . succeed ) . toBeTruthy ( ) ;
156- expect ( serviceResult . dataset ) . toEqual ( resultDataset_IDWByDS + "@Interpolation" ) ;
158+ expect ( serviceResult . dataset ) . toContain ( resultDataset_IDWByDS ) ;
159+ expect ( serviceResult . dataset ) . toContain ( "@Interpolation" ) ;
157160 interpolationAnalystService . destroy ( ) ;
158161 interpolationIDWAnalystParameters . destroy ( ) ;
159162 done ( ) ;
@@ -164,7 +167,7 @@ describe('InterpolationAnalystService', function () {
164167 interpolationIDWAnalystParameters . destroy ( ) ;
165168 done ( ) ;
166169 }
167- } , 5000 ) ;
170+ } , 10000 ) ;
168171
169172 } ) ;
170173 // 删除测试过程中产生的数据集
@@ -208,7 +211,8 @@ describe('InterpolationAnalystService', function () {
208211 var serviceResult = analystEventArgsSystem . result ;
209212 expect ( serviceResult ) . not . toBeNull ( ) ;
210213 expect ( serviceResult . succeed ) . toBeTruthy ( ) ;
211- expect ( serviceResult . dataset ) . toEqual ( resultDataset_krigingByDS + "@Interpolation" ) ;
214+ expect ( serviceResult . dataset ) . toContain ( resultDataset_krigingByDS ) ;
215+ expect ( serviceResult . dataset ) . toContain ( "@Interpolation" ) ;
212216 interpolationAnalystService . destroy ( ) ;
213217 interpolationKrigingAnalystParameters . destroy ( ) ;
214218 done ( ) ;
@@ -219,7 +223,7 @@ describe('InterpolationAnalystService', function () {
219223 interpolationKrigingAnalystParameters . destroy ( ) ;
220224 done ( ) ;
221225 }
222- } , 5000 ) ;
226+ } , 10000 ) ;
223227 } ) ;
224228 // 删除测试过程中产生的数据集
225229 it ( 'delete test resources_krigingByDS' , function ( done ) {
0 commit comments