Skip to content

Commit 887de1b

Browse files
jborean93jborean93
committed
Fix test overloads and other review suggestions
1 parent 966b854 commit 887de1b

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

‎test/PowerShellEditorServices.Test.E2E/DebugAdapterProtocolMessageTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -576,9 +576,9 @@ await RunWithAttachableProcess(logStatements, async (filePath, processId) =>
576576
nextStoppedTask = nextStopped;
577577

578578
// It is important we wait for the stack trace before continue.
579-
// The stopped event starts getting the stack trace info in the
580-
// background and requesting the st is the only wait to ensure
581-
// it is done and won't conflict with the cotinue request.
579+
// The stopped event starts to get the stack trace info in the
580+
// background and requesting the stack trace is the only way to
581+
// ensure it is done and won't conflict with the continue request.
582582
await client.RequestStackTrace(new StackTraceArguments { ThreadId = (int)stoppedEvent.ThreadId });
583583
await client.RequestContinue(new ContinueArguments { ThreadId = (int)stoppedEvent.ThreadId });
584584

‎test/PowerShellEditorServices.Test/Debugging/DebugServiceTests.cs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ await debugService.SetCommandBreakpointsAsync(
201201
public async Task DebuggerAcceptsScriptArgs(string[] args)
202202
{
203203
IReadOnlyList<BreakpointDetails> breakpoints = await debugService.SetLineBreakpointsAsync(
204-
oddPathScriptFile,
204+
oddPathScriptFile.FilePath,
205205
new[] { BreakpointDetails.Create(oddPathScriptFile.FilePath, 3) });
206206

207207
Assert.Single(breakpoints);
@@ -310,7 +310,7 @@ public async Task DebuggerSetsAndClearsLineBreakpoints()
310310
{
311311
IReadOnlyList<BreakpointDetails> breakpoints =
312312
await debugService.SetLineBreakpointsAsync(
313-
debugScriptFile,
313+
debugScriptFile.FilePath,
314314
new[] {
315315
BreakpointDetails.Create(debugScriptFile.FilePath, 5),
316316
BreakpointDetails.Create(debugScriptFile.FilePath, 10)
@@ -323,15 +323,15 @@ await debugService.SetLineBreakpointsAsync(
323323
Assert.Equal(10, breakpoints[1].LineNumber);
324324

325325
breakpoints = await debugService.SetLineBreakpointsAsync(
326-
debugScriptFile,
326+
debugScriptFile.FilePath,
327327
new[] { BreakpointDetails.Create(debugScriptFile.FilePath, 2) });
328328
confirmedBreakpoints = await GetConfirmedBreakpoints(debugScriptFile);
329329

330330
Assert.Single(confirmedBreakpoints);
331331
Assert.Equal(2, breakpoints[0].LineNumber);
332332

333333
await debugService.SetLineBreakpointsAsync(
334-
debugScriptFile,
334+
debugScriptFile.FilePath,
335335
Array.Empty<BreakpointDetails>());
336336

337337
IReadOnlyList<LineBreakpoint> remainingBreakpoints = await GetConfirmedBreakpoints(debugScriptFile);
@@ -342,7 +342,7 @@ await debugService.SetLineBreakpointsAsync(
342342
public async Task DebuggerStopsOnLineBreakpoints()
343343
{
344344
await debugService.SetLineBreakpointsAsync(
345-
debugScriptFile,
345+
debugScriptFile.FilePath,
346346
new[] {
347347
BreakpointDetails.Create(debugScriptFile.FilePath, 5),
348348
BreakpointDetails.Create(debugScriptFile.FilePath, 7)
@@ -361,7 +361,7 @@ public async Task DebuggerStopsOnConditionalBreakpoints()
361361
const int breakpointValue2 = 20;
362362

363363
await debugService.SetLineBreakpointsAsync(
364-
debugScriptFile,
364+
debugScriptFile.FilePath,
365365
new[] {
366366
BreakpointDetails.Create(debugScriptFile.FilePath, 7, null, $"$i -eq {breakpointValue1} -or $i -eq {breakpointValue2}"),
367367
});
@@ -397,7 +397,7 @@ public async Task DebuggerStopsOnHitConditionBreakpoint()
397397
const int hitCount = 5;
398398

399399
await debugService.SetLineBreakpointsAsync(
400-
debugScriptFile,
400+
debugScriptFile.FilePath,
401401
new[] {
402402
BreakpointDetails.Create(debugScriptFile.FilePath, 6, null, null, $"{hitCount}"),
403403
});
@@ -420,7 +420,7 @@ public async Task DebuggerStopsOnConditionalAndHitConditionBreakpoint()
420420
const int hitCount = 5;
421421

422422
await debugService.SetLineBreakpointsAsync(
423-
debugScriptFile,
423+
debugScriptFile.FilePath,
424424
new[] { BreakpointDetails.Create(debugScriptFile.FilePath, 6, null, "$i % 2 -eq 0", $"{hitCount}") });
425425

426426
Task _ = ExecuteDebugFileAsync();
@@ -441,7 +441,7 @@ public async Task DebuggerProvidesMessageForInvalidConditionalBreakpoint()
441441
{
442442
IReadOnlyList<BreakpointDetails> breakpoints =
443443
await debugService.SetLineBreakpointsAsync(
444-
debugScriptFile,
444+
debugScriptFile.FilePath,
445445
new[] {
446446
// TODO: Add this breakpoint back when it stops moving around?! The ordering
447447
// of these two breakpoints seems to do with which framework executes the
@@ -469,7 +469,7 @@ public async Task DebuggerFindsParsableButInvalidSimpleBreakpointConditions()
469469
{
470470
IReadOnlyList<BreakpointDetails> breakpoints =
471471
await debugService.SetLineBreakpointsAsync(
472-
debugScriptFile,
472+
debugScriptFile.FilePath,
473473
new[] {
474474
BreakpointDetails.Create(debugScriptFile.FilePath, 5, column: null, condition: "$i == 100"),
475475
BreakpointDetails.Create(debugScriptFile.FilePath, 7, column: null, condition: "$i > 100")
@@ -620,7 +620,7 @@ public async Task OddFilePathsLaunchCorrectly()
620620
public async Task DebuggerVariableStringDisplaysCorrectly()
621621
{
622622
await debugService.SetLineBreakpointsAsync(
623-
variableScriptFile,
623+
variableScriptFile.FilePath,
624624
new[] { BreakpointDetails.Create(variableScriptFile.FilePath, 8) });
625625

626626
Task _ = ExecuteVariableScriptFileAsync();
@@ -638,7 +638,7 @@ await debugService.SetLineBreakpointsAsync(
638638
public async Task DebuggerGetsVariables()
639639
{
640640
await debugService.SetLineBreakpointsAsync(
641-
variableScriptFile,
641+
variableScriptFile.FilePath,
642642
new[] { BreakpointDetails.Create(variableScriptFile.FilePath, 21) });
643643

644644
Task _ = ExecuteVariableScriptFileAsync();
@@ -688,7 +688,7 @@ await debugService.SetLineBreakpointsAsync(
688688
public async Task DebuggerSetsVariablesNoConversion()
689689
{
690690
await debugService.SetLineBreakpointsAsync(
691-
variableScriptFile,
691+
variableScriptFile.FilePath,
692692
new[] { BreakpointDetails.Create(variableScriptFile.FilePath, 14) });
693693

694694
Task _ = ExecuteVariableScriptFileAsync();
@@ -741,7 +741,7 @@ await debugService.SetLineBreakpointsAsync(
741741
public async Task DebuggerSetsVariablesWithConversion()
742742
{
743743
await debugService.SetLineBreakpointsAsync(
744-
variableScriptFile,
744+
variableScriptFile.FilePath,
745745
new[] { BreakpointDetails.Create(variableScriptFile.FilePath, 14) });
746746

747747
// Execute the script and wait for the breakpoint to be hit
@@ -797,7 +797,7 @@ await debugService.SetLineBreakpointsAsync(
797797
public async Task DebuggerVariableEnumDisplaysCorrectly()
798798
{
799799
await debugService.SetLineBreakpointsAsync(
800-
variableScriptFile,
800+
variableScriptFile.FilePath,
801801
new[] { BreakpointDetails.Create(variableScriptFile.FilePath, 15) });
802802

803803
// Execute the script and wait for the breakpoint to be hit
@@ -817,7 +817,7 @@ await debugService.SetLineBreakpointsAsync(
817817
public async Task DebuggerVariableHashtableDisplaysCorrectly()
818818
{
819819
await debugService.SetLineBreakpointsAsync(
820-
variableScriptFile,
820+
variableScriptFile.FilePath,
821821
new[] { BreakpointDetails.Create(variableScriptFile.FilePath, 11) });
822822

823823
// Execute the script and wait for the breakpoint to be hit
@@ -850,7 +850,7 @@ await debugService.SetLineBreakpointsAsync(
850850
public async Task DebuggerVariableNullStringDisplaysCorrectly()
851851
{
852852
await debugService.SetLineBreakpointsAsync(
853-
variableScriptFile,
853+
variableScriptFile.FilePath,
854854
new[] { BreakpointDetails.Create(variableScriptFile.FilePath, 16) });
855855

856856
// Execute the script and wait for the breakpoint to be hit
@@ -870,7 +870,7 @@ await debugService.SetLineBreakpointsAsync(
870870
public async Task DebuggerVariablePSObjectDisplaysCorrectly()
871871
{
872872
await debugService.SetLineBreakpointsAsync(
873-
variableScriptFile,
873+
variableScriptFile.FilePath,
874874
new[] { BreakpointDetails.Create(variableScriptFile.FilePath, 17) });
875875

876876
// Execute the script and wait for the breakpoint to be hit
@@ -1066,7 +1066,7 @@ await GetVariables(VariableContainerDetails.ScriptScopeName),
10661066
public async Task DebuggerVariablePSCustomObjectDisplaysCorrectly()
10671067
{
10681068
await debugService.SetLineBreakpointsAsync(
1069-
variableScriptFile,
1069+
variableScriptFile.FilePath,
10701070
new[] { BreakpointDetails.Create(variableScriptFile.FilePath, 18) });
10711071

10721072
// Execute the script and wait for the breakpoint to be hit
@@ -1095,7 +1095,7 @@ await debugService.SetLineBreakpointsAsync(
10951095
public async Task DebuggerVariableProcessObjectDisplaysCorrectly()
10961096
{
10971097
await debugService.SetLineBreakpointsAsync(
1098-
variableScriptFile,
1098+
variableScriptFile.FilePath,
10991099
new[] { BreakpointDetails.Create(variableScriptFile.FilePath, 19) });
11001100

11011101
// Execute the script and wait for the breakpoint to be hit

0 commit comments

Comments
 (0)