Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/DiffEngine.Tests/DiffRunnerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ public async Task MaxInstancesToLaunch()
{
await Task.Delay(500);
ProcessCleanup.Refresh();
var result = await DiffRunner.LaunchAsync(file1, "fake.txt");
var result = DiffRunner.Launch(file1, "fake.txt");
await Task.Delay(300);
await Assert.That(result).IsEqualTo(LaunchResult.StartedNewInstance);
ProcessCleanup.Refresh();
result = await DiffRunner.LaunchAsync(file2, "fake.txt");
result = DiffRunner.Launch(file2, "fake.txt");
await Assert.That(result).IsEqualTo(LaunchResult.TooManyRunningDiffTools);
ProcessCleanup.Refresh();
DiffRunner.Kill(file1, "fake.txt");
Expand Down Expand Up @@ -119,7 +119,7 @@ public async Task LaunchAndKillDisabled()
await WaitForRunning(false);
await Assert.That(IsRunning()).IsFalse();
await Assert.That(ProcessCleanup.IsRunning(command)).IsFalse();
var result = await DiffRunner.LaunchAsync(file1, file2);
var result = DiffRunner.Launch(file1, file2);
await Assert.That(result).IsEqualTo(LaunchResult.Disabled);
Thread.Sleep(500);
ProcessCleanup.Refresh();
Expand Down Expand Up @@ -170,7 +170,7 @@ public async Task LaunchAndKill()
await WaitForRunning(false);
await Assert.That(IsRunning()).IsFalse();
await Assert.That(ProcessCleanup.IsRunning(command)).IsFalse();
var result = await DiffRunner.LaunchAsync(file1, file2);
var result = DiffRunner.Launch(file1, file2);
await Assert.That(result).IsEqualTo(LaunchResult.StartedNewInstance);
await WaitForRunning(true);
await Assert.That(IsRunning()).IsTrue();
Expand Down
Loading