Skip to content

Commit 1bed1f5

Browse files
#2443 fix test
1 parent a3e23db commit 1bed1f5

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

src/OSPSuite.Core/Domain/Services/SimModelManager.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public SimulationRunResults RunSimulation(IModelCoreSimulation simulation, Simul
6363
public async Task<SimulationRunResults> RunSimulationAsync(IModelCoreSimulation simulation, SimulationRunOptions simulationRunOptions = null)
6464
{
6565
var cancellationToken = _globalCancellationTokenSource.Token;
66-
66+
_simulationRunOptions = simulationRunOptions ?? new SimulationRunOptions();
6767
try
6868
{
6969
_simulationRunOptions = simulationRunOptions ?? new SimulationRunOptions();
@@ -77,6 +77,10 @@ public async Task<SimulationRunResults> RunSimulationAsync(IModelCoreSimulation
7777

7878
return new SimulationRunResults(WarningsFrom(_simModelSimulation), SimulationWasCanceled);
7979
}
80+
catch (OperationCanceledException)
81+
{
82+
return new SimulationRunResults(WarningsFrom(_simModelSimulation), SimulationWasCanceled);
83+
}
8084
finally
8185
{
8286
_simModelSimulation?.Dispose();
@@ -125,7 +129,7 @@ await Task.Run(() =>
125129
cancellationToken.ThrowIfCancellationRequested();
126130
}, cancellationToken);
127131
}
128-
catch (TaskCanceledException)
132+
catch (OperationCanceledException)
129133
{
130134
}
131135
finally

tests/OSPSuite.Core.IntegrationTests/SimModelManagerSpecs.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,19 +132,19 @@ private bool molWeightShouldBeSetFor(DataColumn dataColumn)
132132
}
133133
}
134134

135-
public class When_canceling_a_simulation_run : concern_for_SimModelManager
135+
public class When_canceling_a_simulation_run : concern_for_SimModelManagerAsync
136136
{
137137
private SimulationRunResults _runResults;
138138

139-
protected override void Context()
139+
protected override async Task Context()
140140
{
141-
base.Context();
141+
await base.Context();
142142
var interval = _simulation.Settings.OutputSchema.Intervals.ElementAt(0);
143143
interval.GetSingleChildByName<IParameter>(Constants.Parameters.END_TIME).Value = 5000000;
144144
interval.GetSingleChildByName<IParameter>(Constants.Parameters.RESOLUTION).Value = 10000;
145145
}
146146

147-
protected override void Because()
147+
protected override async Task Because()
148148
{
149149
var task = Task.Run(() => sut.RunSimulation(_simulation));
150150
//needs to sleep so that the action actually starts

0 commit comments

Comments
 (0)