Skip to content

Commit 511b451

Browse files
authored
Merge pull request #3846 from AdmiringWorm/fix/null-coalesce-process-output
(maint) Guard against null Data in process output callbacks
2 parents c4cf0a6 + a51043b commit 511b451

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

src/chocolatey.tests.integration/scenarios/InstallScenarios.cs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ public void Should_have_a_console_shim_that_is_set_for_non_gui_access()
262262
shimfile,
263263
"--shimgen-noop",
264264
10,
265-
stdOutAction: (s, e) => messages.Add(e.Data),
266-
stdErrAction: (s, e) => messages.Add(e.Data)
265+
stdOutAction: (s, e) => messages.Add(e.Data ?? string.Empty),
266+
stdErrAction: (s, e) => messages.Add(e.Data ?? string.Empty)
267267
);
268268

269269
messages.Should()
@@ -283,8 +283,8 @@ public void Should_have_a_graphical_shim_that_is_set_for_gui_access()
283283
shimfile,
284284
"--shimgen-noop",
285285
10,
286-
stdOutAction: (s, e) => messages.Add(e.Data),
287-
stdErrAction: (s, e) => messages.Add(e.Data)
286+
stdOutAction: (s, e) => messages.Add(e.Data ?? string.Empty),
287+
stdErrAction: (s, e) => messages.Add(e.Data ?? string.Empty)
288288
);
289289

290290
messages.Should()
@@ -3208,8 +3208,8 @@ public void Should_have_a_console_shim_that_is_set_for_non_gui_access()
32083208
shimfile,
32093209
"--shimgen-noop",
32103210
10,
3211-
stdOutAction: (s, e) => messages.Add(e.Data),
3212-
stdErrAction: (s, e) => messages.Add(e.Data)
3211+
stdOutAction: (s, e) => messages.Add(e.Data ?? string.Empty),
3212+
stdErrAction: (s, e) => messages.Add(e.Data ?? string.Empty)
32133213
);
32143214

32153215
messages.Should()
@@ -3229,8 +3229,8 @@ public void Should_have_a_graphical_shim_that_is_set_for_gui_access()
32293229
shimfile,
32303230
"--shimgen-noop",
32313231
10,
3232-
stdOutAction: (s, e) => messages.Add(e.Data),
3233-
stdErrAction: (s, e) => messages.Add(e.Data)
3232+
stdOutAction: (s, e) => messages.Add(e.Data ?? string.Empty),
3233+
stdErrAction: (s, e) => messages.Add(e.Data ?? string.Empty)
32343234
);
32353235

32363236
messages.Should()
@@ -3455,8 +3455,8 @@ public void Should_have_a_console_shim_that_is_set_for_non_gui_access()
34553455
shimfile,
34563456
"--shimgen-noop",
34573457
10,
3458-
stdOutAction: (s, e) => messages.Add(e.Data),
3459-
stdErrAction: (s, e) => messages.Add(e.Data)
3458+
stdOutAction: (s, e) => messages.Add(e.Data ?? string.Empty),
3459+
stdErrAction: (s, e) => messages.Add(e.Data ?? string.Empty)
34603460
);
34613461

34623462
messages.Should()
@@ -3476,8 +3476,8 @@ public void Should_have_a_graphical_shim_that_is_set_for_gui_access()
34763476
shimfile,
34773477
"--shimgen-noop",
34783478
10,
3479-
stdOutAction: (s, e) => messages.Add(e.Data),
3480-
stdErrAction: (s, e) => messages.Add(e.Data)
3479+
stdOutAction: (s, e) => messages.Add(e.Data ?? string.Empty),
3480+
stdErrAction: (s, e) => messages.Add(e.Data ?? string.Empty)
34813481
);
34823482

34833483
messages.Should()
@@ -4377,8 +4377,8 @@ public void Should_have_a_console_shim_that_is_set_for_non_gui_access()
43774377
shimfile,
43784378
"--shimgen-noop",
43794379
10,
4380-
stdOutAction: (s, e) => messages.Add(e.Data),
4381-
stdErrAction: (s, e) => messages.Add(e.Data)
4380+
stdOutAction: (s, e) => messages.Add(e.Data ?? string.Empty),
4381+
stdErrAction: (s, e) => messages.Add(e.Data ?? string.Empty)
43824382
);
43834383

43844384
messages.Should()
@@ -4398,8 +4398,8 @@ public void Should_have_a_graphical_shim_that_is_set_for_gui_access()
43984398
shimfile,
43994399
"--shimgen-noop",
44004400
10,
4401-
stdOutAction: (s, e) => messages.Add(e.Data),
4402-
stdErrAction: (s, e) => messages.Add(e.Data)
4401+
stdOutAction: (s, e) => messages.Add(e.Data ?? string.Empty),
4402+
stdErrAction: (s, e) => messages.Add(e.Data ?? string.Empty)
44034403
);
44044404

44054405
messages.Should()

0 commit comments

Comments
 (0)