@@ -284,57 +284,60 @@ public Task SetRangeEnd_StepTest(double stepFrequency, double rangeStart, double
284
284
285
285
private async Task Initialize ( double stepFrequency , double minimum , double rangeStart , double rangeEnd , double maximum , double expectedStepFrequency , double expectedMinimum , double expectedRangeStart , double expectedRangeEnd , double expectedMaximum )
286
286
{
287
- var input = new TestRecord ( stepFrequency , minimum , rangeStart , rangeEnd , maximum ) ;
288
- var expected = new TestRecord ( expectedStepFrequency , expectedMinimum , expectedRangeStart , expectedRangeEnd , expectedMaximum ) ;
287
+ var initalProps = new TestRecord ( stepFrequency , minimum , rangeStart , rangeEnd , maximum ) ;
288
+ var inital = await InitGetProps ( initalProps ) ;
289
289
290
- await App . DispatcherQueue . EnqueueAsync ( async ( ) =>
291
- {
292
- var r = BuildRangeSelecor ( input ) ;
290
+ Assert . AreEqual ( new TestRecord ( expectedStepFrequency , expectedMinimum , expectedRangeStart , expectedRangeEnd , expectedMaximum ) , inital . Item2 ) ;
291
+ }
293
292
294
- await SetTestContentAsync ( r ) ;
293
+ private async Task SetProp ( double stepFrequency , double minimum , double rangeStart , double rangeEnd , double maximum , Property targetProp , double propInput , double expectedStepFrequency , double expectedMinimum , double expectedRangeStart , double expectedRangeEnd , double expectedMaximum )
294
+ {
295
+ var initalProps = new TestRecord ( stepFrequency , minimum , rangeStart , rangeEnd , maximum ) ;
296
+ var inital = await InitGetProps ( initalProps ) ;
297
+ Assert . AreEqual ( initalProps , inital . Item2 ) ;
295
298
296
- var actual = BuildTestRecord ( r ) ;
299
+ var post = await SetPropGetProps ( inital . Item1 , targetProp , propInput ) ;
300
+ Assert . AreEqual ( new TestRecord ( expectedStepFrequency , expectedMinimum , expectedRangeStart , expectedRangeEnd , expectedMaximum ) , post ) ;
301
+ }
297
302
298
- Assert . AreEqual ( expected , actual ) ;
303
+ private async Task < ( RangeSelector , TestRecord ) > InitGetProps ( TestRecord testRecord )
304
+ {
305
+ var t = testRecord ;
306
+ return await App . DispatcherQueue . EnqueueAsync ( async ( ) =>
307
+ {
308
+ var ragneSelector = BuildRangeSelecor ( t ) ;
309
+ await SetTestContentAsync ( ragneSelector ) ;
310
+ var testRecord = BuildTestRecord ( ragneSelector ) ;
311
+ return ( ragneSelector , testRecord ) ;
299
312
} ) ;
300
313
}
301
314
302
- private async Task SetProp ( double stepFrequency , double minimum , double rangeStart , double rangeEnd , double maximum , Property targetProp , double propInput , double expectedStepFrequency , double expectedMinimum , double expectedRangeStart , double expectedRangeEnd , double expectedMaximum )
315
+ private static async Task < TestRecord > SetPropGetProps ( RangeSelector test , Property targetProp , double propInput )
303
316
{
304
- await App . DispatcherQueue . EnqueueAsync ( async ( ) =>
317
+ return await App . DispatcherQueue . EnqueueAsync ( ( ) =>
305
318
{
306
- var inital = new TestRecord ( stepFrequency , minimum , rangeStart , rangeEnd , maximum ) ;
307
- var r = BuildRangeSelecor ( inital ) ;
308
-
309
- await SetTestContentAsync ( r ) ;
310
-
311
- Assert . AreEqual ( inital , BuildTestRecord ( r ) ) ;
312
-
313
319
switch ( targetProp )
314
320
{
315
321
case Property . Minimum :
316
- r . Minimum = propInput ;
322
+ test . Minimum = propInput ;
317
323
break ;
318
324
case Property . Maximum :
319
- r . Maximum = propInput ;
325
+ test . Maximum = propInput ;
320
326
break ;
321
327
case Property . RangeStart :
322
- r . RangeStart = propInput ;
328
+ test . RangeStart = propInput ;
323
329
break ;
324
330
case Property . RangeEnd :
325
- r . RangeEnd = propInput ;
331
+ test . RangeEnd = propInput ;
326
332
break ;
327
333
case Property . StepFrequency :
328
- r . StepFrequency = propInput ;
334
+ test . StepFrequency = propInput ;
329
335
break ;
330
336
default :
331
- Assert . Fail ( "Invalid param {0}" , targetProp ) ;
332
337
break ;
333
338
}
334
-
335
- var expected = new TestRecord ( expectedStepFrequency , expectedMinimum , expectedRangeStart , expectedRangeEnd , expectedMaximum ) ;
336
339
337
- Assert . AreEqual ( expected , BuildTestRecord ( r ) ) ;
340
+ return BuildTestRecord ( test ) ;
338
341
} ) ;
339
342
}
340
343
0 commit comments