@@ -383,9 +383,7 @@ pub mod tests {
383
383
384
384
#[ fixture]
385
385
pub async fn train_with_simulation_output_fixture_set (
386
- #[ future] db_pool : Data < DbPool > ,
387
- #[ future] pathfinding : TestFixture < Pathfinding > ,
388
- #[ future] fast_rolling_stock : TestFixture < RollingStockModel > ,
386
+ db_pool : Data < DbPool > ,
389
387
) -> TrainScheduleWithSimulationOutputFixtureSet {
390
388
let ScenarioFixtureSet {
391
389
project,
@@ -394,10 +392,10 @@ pub mod tests {
394
392
timetable,
395
393
infra,
396
394
} = scenario_fixture_set ( ) . await ;
397
- let rolling_stock = fast_rolling_stock ( db_pool ( ) ) . await ;
398
- let pathfinding = pathfinding ( db_pool ( ) ) . await ;
395
+ let rolling_stock = fast_rolling_stock ( db_pool. clone ( ) ) . await ;
396
+ let pathfinding = pathfinding ( db_pool. clone ( ) ) . await ;
399
397
let train_schedule = make_train_schedule (
400
- db_pool ( ) . clone ( ) ,
398
+ db_pool. clone ( ) ,
401
399
pathfinding. id ( ) ,
402
400
timetable. id ( ) ,
403
401
rolling_stock. id ( ) ,
@@ -436,13 +434,13 @@ pub mod tests {
436
434
..Default :: default ( )
437
435
} ;
438
436
let simulation_output: SimulationOutput = simulation_output
439
- . create ( db_pool ( ) . clone ( ) )
437
+ . create ( db_pool. clone ( ) )
440
438
. await
441
439
. unwrap ( )
442
440
. into ( ) ;
443
441
444
- let train_schedule = TestFixture :: new ( train_schedule, db_pool ( ) . clone ( ) ) ;
445
- let simulation_output = TestFixture :: new ( simulation_output, db_pool ( ) ) ;
442
+ let train_schedule = TestFixture :: new ( train_schedule, db_pool. clone ( ) ) ;
443
+ let simulation_output = TestFixture :: new ( simulation_output, db_pool) ;
446
444
TrainScheduleWithSimulationOutputFixtureSet {
447
445
project,
448
446
study,
0 commit comments