Skip to content

Commit 89052bc

Browse files
FrankRay78FrankRay78
authored
Upgraded spectre.console NuGets (#134)
* Upgraded spectre.console NuGets * Bumped up tolerance to make the test more reliable * Added using statement to ensure the cancellation token is disposed of
1 parent 3e9ddff commit 89052bc

15 files changed

+98
-148
lines changed

‎src/NetPace.Console.Tests/NetPace.Console.Tests.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
11-
<PackageReference Include="Spectre.Console.Testing" Version="0.51.1" />
11+
<PackageReference Include="Spectre.Console.Cli" Version="1.0.0-alpha.0.11" />
12+
<PackageReference Include="Spectre.Console.Cli.Testing" Version="1.0.0-alpha.0.11" />
13+
<PackageReference Include="Spectre.Console.Testing" Version="0.54.0" />
1214
<PackageReference Include="Verify" Version="30.19.2" />
1315
<PackageReference Include="Verify.Xunit" Version="30.19.2" />
1416
<PackageReference Include="xunit" Version="2.9.3" />

‎src/NetPace.Console.Tests/NetPaceConsoleTests.CSV.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public async Task Should_Perform_Speed_Test_With_CSV()
1717
var app = GetCommandAppTester(registrar);
1818

1919
// When
20-
var result = await app.RunAsync("--csv");
20+
var result = await app.RunAsync([ "--csv" ]);
2121

2222
// Then
2323
Assert.Equal(0, result.ExitCode);
@@ -35,10 +35,10 @@ public async Task Should_Perform_Speed_Test_With_CSV_Continuously()
3535
registrar.Register(typeof(ISpeedTestService), typeof(SpeedTestStub));
3636
registrar.Register(typeof(IClock), typeof(IncrementingClockStub));
3737
registrar.RegisterInstance(typeof(IWaiter), waiter);
38-
var app = GetCommandAppTester(registrar, cancellationTokenSource.Token);
38+
var app = GetCommandAppTester(registrar);
3939

4040
// When
41-
var result = await app.RunAsync("--csv", "--loop");
41+
var result = await app.RunAsync([ "--csv", "--loop" ], cancellationTokenSource.Token);
4242

4343
// Then
4444
Assert.Equal(0, result.ExitCode);
@@ -57,7 +57,7 @@ public async Task Should_Perform_Speed_Test_With_CSV_Multiple_Times(int count)
5757
var app = GetCommandAppTester(registrar);
5858

5959
// When
60-
var result = await app.RunAsync("--csv", "--count", $"{count}");
60+
var result = await app.RunAsync([ "--csv", "--count", $"{count}" ]);
6161

6262
// Then
6363
Assert.Equal(0, result.ExitCode);
@@ -78,7 +78,7 @@ public async Task Should_Perform_Speed_Test_With_CSV_Multiple_Times_With_Delay(i
7878
var app = GetCommandAppTester(registrar);
7979

8080
// When
81-
var result = await app.RunAsync("--csv", "--count", $"{count}", "--delay", $"{delay}");
81+
var result = await app.RunAsync([ "--csv", "--count", $"{count}", "--delay", $"{delay}" ]);
8282

8383
// Then
8484
Assert.Equal(count - 1, waiter.CallCount);
@@ -97,7 +97,7 @@ public async Task Should_Perform_Speed_Test_With_CSV_With_Scale_In_Header()
9797
var app = GetCommandAppTester(registrar);
9898

9999
// When
100-
var result = await app.RunAsync("--csv", "--csv-header-units");
100+
var result = await app.RunAsync([ "--csv", "--csv-header-units" ]);
101101

102102
// Then
103103
Assert.Equal(0, result.ExitCode);
@@ -115,7 +115,7 @@ public async Task Should_Perform_Speed_Test_With_CSV_Multiple_Times_With_Fixed_S
115115
var app = GetCommandAppTester(registrar);
116116

117117
// When
118-
var result = await app.RunAsync("--csv", "--count", "3", "--unit-scale", "Mega");
118+
var result = await app.RunAsync([ "--csv", "--count", "3", "--unit-scale", "Mega" ]);
119119

120120
// Then
121121
Assert.Equal(0, result.ExitCode);
@@ -136,7 +136,7 @@ public async Task Should_Perform_Speed_Test_With_CSV_Multiple_Times_With_Fixed_S
136136
var app = GetCommandAppTester(registrar);
137137

138138
// When
139-
var result = await app.RunAsync("--csv", "--csv-header-units", "--count", "3", "--unit-scale", $"{scale}");
139+
var result = await app.RunAsync([ "--csv", "--csv-header-units", "--count", "3", "--unit-scale", $"{scale}" ]);
140140

141141
// Then
142142
Assert.Equal(0, result.ExitCode);
@@ -154,7 +154,7 @@ public async Task Should_Return_Validation_Error_For_Speed_Test_With_CSV_Multipl
154154
var app = GetCommandAppTester(registrar);
155155

156156
// When
157-
var result = await app.RunAsync("--csv", "--csv-header-units", "--count", "3", "--unit-scale", "Auto");
157+
var result = await app.RunAsync([ "--csv", "--csv-header-units", "--count", "3", "--unit-scale", "Auto" ]);
158158

159159
// Then
160160
Assert.Equal(-1, result.ExitCode);
@@ -172,7 +172,7 @@ public async Task Should_Perform_Speed_Test_With_CSV_No_Download()
172172
var app = GetCommandAppTester(registrar);
173173

174174
// When
175-
var result = await app.RunAsync("--csv", "--no-download");
175+
var result = await app.RunAsync([ "--csv", "--no-download" ]);
176176

177177
// Then
178178
Assert.Equal(0, result.ExitCode);
@@ -190,7 +190,7 @@ public async Task Should_Perform_Speed_Test_With_CSV_No_Upload()
190190
var app = GetCommandAppTester(registrar);
191191

192192
// When
193-
var result = await app.RunAsync("--csv", "--no-upload");
193+
var result = await app.RunAsync([ "--csv", "--no-upload" ]);
194194

195195
// Then
196196
Assert.Equal(0, result.ExitCode);
@@ -211,7 +211,7 @@ public async Task Should_Perform_Speed_Test_With_CSV_Delimiter(char delimiter)
211211
var app = GetCommandAppTester(registrar);
212212

213213
// When
214-
var result = await app.RunAsync("--csv", "--csv-delimiter", delimiter.ToString());
214+
var result = await app.RunAsync([ "--csv", "--csv-delimiter", delimiter.ToString() ]);
215215

216216
// Then
217217
Assert.Equal(0, result.ExitCode);
@@ -229,7 +229,7 @@ public async Task Should_Perform_Speed_Test_With_CSV_No_Latency()
229229
var app = GetCommandAppTester(registrar);
230230

231231
// When
232-
var result = await app.RunAsync("--csv", "--no-latency");
232+
var result = await app.RunAsync([ "--csv", "--no-latency" ]);
233233

234234
// Then
235235
Assert.Equal(0, result.ExitCode);
@@ -247,7 +247,7 @@ public async Task Should_Perform_Speed_Test_With_CSV_Header_Units_No_Latency()
247247
var app = GetCommandAppTester(registrar);
248248

249249
// When
250-
var result = await app.RunAsync("--csv", "--csv-header-units", "--no-latency");
250+
var result = await app.RunAsync([ "--csv", "--csv-header-units", "--no-latency" ]);
251251

252252
// Then
253253
Assert.Equal(0, result.ExitCode);

‎src/NetPace.Console.Tests/NetPaceConsoleTests.File.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public async Task Should_Write_Output_To_File(string file)
2323
var app = GetCommandAppTester(registrar);
2424

2525
// When
26-
var result = await app.RunAsync(file, testFile);
26+
var result = await app.RunAsync([ file, testFile ]);
2727

2828
// Then
2929
Assert.Equal(0, result.ExitCode);
@@ -58,7 +58,7 @@ public async Task Should_Write_CSV_Output_To_File(string file)
5858
var app = GetCommandAppTester(registrar);
5959

6060
// When
61-
var result = await app.RunAsync("--csv", file, testFile);
61+
var result = await app.RunAsync([ "--csv", file, testFile ]);
6262

6363
// Then
6464
Assert.Equal(0, result.ExitCode);
@@ -93,7 +93,7 @@ public async Task Should_Write_Json_Output_To_File(string file)
9393
var app = GetCommandAppTester(registrar);
9494

9595
// When
96-
var result = await app.RunAsync("--json", file, testFile);
96+
var result = await app.RunAsync([ "--json", file, testFile ]);
9797

9898
// Then
9999
Assert.Equal(0, result.ExitCode);
@@ -126,7 +126,7 @@ public async Task Should_Create_New_File_When_FileMode_Is_Append_And_File_Does_N
126126
var app = GetCommandAppTester(registrar);
127127

128128
// When
129-
var result = await app.RunAsync("--file", testFile, "--file-mode", "Append");
129+
var result = await app.RunAsync([ "--file", testFile, "--file-mode", "Append" ]);
130130

131131
// Then
132132
Assert.Equal(0, result.ExitCode);
@@ -159,7 +159,7 @@ public async Task Should_Create_New_File_When_FileMode_Is_Overwrite_And_File_Doe
159159
var app = GetCommandAppTester(registrar);
160160

161161
// When
162-
var result = await app.RunAsync("--file", testFile, "--file-mode", "Overwrite");
162+
var result = await app.RunAsync([ "--file", testFile, "--file-mode", "Overwrite" ]);
163163

164164
// Then
165165
Assert.Equal(0, result.ExitCode);
@@ -195,7 +195,7 @@ public async Task Should_Overwrite_Existing_File_When_FileMode_Is_Overwrite()
195195
var app = GetCommandAppTester(registrar);
196196

197197
// When
198-
var result = await app.RunAsync("--file", testFile, "--file-mode", "Overwrite");
198+
var result = await app.RunAsync([ "--file", testFile, "--file-mode", "Overwrite" ]);
199199

200200
// Then
201201
Assert.Equal(0, result.ExitCode);
@@ -230,7 +230,7 @@ public async Task Should_Append_To_Existing_File_When_FileMode_Not_Specified()
230230
var app = GetCommandAppTester(registrar);
231231

232232
// When
233-
var result = await app.RunAsync("--file", testFile);
233+
var result = await app.RunAsync([ "--file", testFile ]);
234234

235235
// Then
236236
Assert.Equal(0, result.ExitCode);
@@ -265,7 +265,7 @@ public async Task Should_Append_To_Existing_File_When_FileMode_Is_Append()
265265
var app = GetCommandAppTester(registrar);
266266

267267
// When
268-
var result = await app.RunAsync("--file", testFile, "--file-mode", "Append");
268+
var result = await app.RunAsync([ "--file", testFile, "--file-mode", "Append" ]);
269269

270270
// Then
271271
Assert.Equal(0, result.ExitCode);
@@ -295,7 +295,7 @@ public async Task Should_Handle_File_Creation_Exception()
295295
var app = GetCommandAppTester(registrar);
296296

297297
// When
298-
var result = await app.RunAsync("--file", invalidPath);
298+
var result = await app.RunAsync([ "--file", invalidPath ]);
299299

300300
// Then
301301
Assert.NotEqual(0, result.ExitCode);
@@ -323,7 +323,7 @@ public async Task Should_Handle_Configuration_Exceptions_In_File_Output_And_Quie
323323
var app = GetCommandAppTester(registrar);
324324

325325
// When
326-
var result = await app.RunAsync(quiet, "--count", "ABC", "--file", testFile);
326+
var result = await app.RunAsync([ quiet, "--count", "ABC", "--file", testFile ]);
327327

328328
// Then
329329
Assert.NotEqual(0, result.ExitCode);
@@ -365,7 +365,7 @@ public async Task Should_Handle_Network_Exceptions_In_File_Output_And_Quiet_Mode
365365
var app = GetCommandAppTester(registrar);
366366

367367
// When
368-
var result = await app.RunAsync(quiet, "--file", testFile);
368+
var result = await app.RunAsync([ quiet, "--file", testFile ]);
369369

370370
// Then
371371
Assert.Equal(0, result.ExitCode);

‎src/NetPace.Console.Tests/NetPaceConsoleTests.Json.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public async Task Should_Perform_Speed_Test_With_Json(string jsonSwitch)
1919
var app = GetCommandAppTester(registrar);
2020

2121
// When
22-
var result = await app.RunAsync(jsonSwitch);
22+
var result = await app.RunAsync([ jsonSwitch ]);
2323

2424
// Then
2525
Assert.Equal(0, result.ExitCode);
@@ -39,10 +39,10 @@ public async Task Should_Perform_Speed_Test_With_Json_Continuously(string jsonSw
3939
registrar.Register(typeof(ISpeedTestService), typeof(SpeedTestStub));
4040
registrar.Register(typeof(IClock), typeof(IncrementingClockStub));
4141
registrar.RegisterInstance(typeof(IWaiter), waiter);
42-
var app = GetCommandAppTester(registrar, cancellationTokenSource.Token);
42+
var app = GetCommandAppTester(registrar);
4343

4444
// When
45-
var result = await app.RunAsync(jsonSwitch, "--loop");
45+
var result = await app.RunAsync([ jsonSwitch, "--loop" ], cancellationTokenSource.Token);
4646

4747
// Then
4848
Assert.Equal(0, result.ExitCode);
@@ -62,7 +62,7 @@ public async Task Should_Perform_Speed_Test_With_Json_Multiple_Times(string json
6262
var app = GetCommandAppTester(registrar);
6363

6464
// When
65-
var result = await app.RunAsync(jsonSwitch, "--count", $"{count}");
65+
var result = await app.RunAsync([ jsonSwitch, "--count", $"{count}" ]);
6666

6767
// Then
6868
Assert.Equal(0, result.ExitCode);
@@ -84,7 +84,7 @@ public async Task Should_Perform_Speed_Test_With_Json_Multiple_Times_With_Delay(
8484
var app = GetCommandAppTester(registrar);
8585

8686
// When
87-
var result = await app.RunAsync(jsonSwitch, "--count", $"{count}", "--delay", $"{delay}");
87+
var result = await app.RunAsync([ jsonSwitch, "--count", $"{count}", "--delay", $"{delay}" ]);
8888

8989
// Then
9090
Assert.Equal(count - 1, waiter.CallCount);
@@ -109,7 +109,7 @@ public async Task Should_Perform_Speed_Test_With_Json_Multiple_Times_With_Fixed_
109109
var app = GetCommandAppTester(registrar);
110110

111111
// When
112-
var result = await app.RunAsync(jsonSwitch, "--count", "3", "--unit-scale", $"{scale}");
112+
var result = await app.RunAsync([ jsonSwitch, "--count", "3", "--unit-scale", $"{scale}" ]);
113113

114114
// Then
115115
Assert.Equal(0, result.ExitCode);
@@ -129,7 +129,7 @@ public async Task Should_Perform_Speed_Test_With_Json_No_Download(string jsonSwi
129129
var app = GetCommandAppTester(registrar);
130130

131131
// When
132-
var result = await app.RunAsync(jsonSwitch, "--no-download");
132+
var result = await app.RunAsync([ jsonSwitch, "--no-download" ]);
133133

134134
// Then
135135
Assert.Equal(0, result.ExitCode);
@@ -149,7 +149,7 @@ public async Task Should_Perform_Speed_Test_With_Json_No_Upload(string jsonSwitc
149149
var app = GetCommandAppTester(registrar);
150150

151151
// When
152-
var result = await app.RunAsync(jsonSwitch, "--no-upload");
152+
var result = await app.RunAsync([ jsonSwitch, "--no-upload" ]);
153153

154154
// Then
155155
Assert.Equal(0, result.ExitCode);
@@ -169,7 +169,7 @@ public async Task Should_Perform_Speed_Test_With_Json_No_Latency(string jsonSwit
169169
var app = GetCommandAppTester(registrar);
170170

171171
// When
172-
var result = await app.RunAsync(jsonSwitch, "--no-latency");
172+
var result = await app.RunAsync([ jsonSwitch, "--no-latency" ]);
173173

174174
// Then
175175
Assert.Equal(0, result.ExitCode);

‎src/NetPace.Console.Tests/NetPaceConsoleTests.Quiet.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public async Task Should_Suppress_Console_In_Quiet_Mode(string quiet)
2020
var app = GetCommandAppTester(registrar);
2121

2222
// When
23-
var result = await app.RunAsync(quiet);
23+
var result = await app.RunAsync([ quiet ]);
2424

2525
// Then
2626
Assert.Equal(0, result.ExitCode);
@@ -44,7 +44,7 @@ public async Task Should_Suppress_Console_But_Write_To_File_In_Quiet_Mode(string
4444
var app = GetCommandAppTester(registrar);
4545

4646
// When
47-
var result = await app.RunAsync(quiet, "--file", testFile);
47+
var result = await app.RunAsync([ quiet, "--file", testFile ]);
4848

4949
// Then
5050
Assert.Equal(0, result.ExitCode);
@@ -79,7 +79,7 @@ public async Task Should_Suppress_Console_With_CSV_Format_In_Quiet_Mode(string q
7979
var app = GetCommandAppTester(registrar);
8080

8181
// When
82-
var result = await app.RunAsync(quiet, "--csv");
82+
var result = await app.RunAsync([ quiet, "--csv" ]);
8383

8484
// Then
8585
Assert.Equal(0, result.ExitCode);
@@ -99,7 +99,7 @@ public async Task Should_Suppress_Console_With_Json_Format_In_Quiet_Mode(string
9999
var app = GetCommandAppTester(registrar);
100100

101101
// When
102-
var result = await app.RunAsync(quiet, "--json");
102+
var result = await app.RunAsync([ quiet, "--json" ]);
103103

104104
// Then
105105
Assert.Equal(0, result.ExitCode);
@@ -123,7 +123,7 @@ public async Task Should_Suppress_Console_With_Verbosity_In_Quiet_Mode(string qu
123123
var app = GetCommandAppTester(registrar);
124124

125125
// When
126-
var result = await app.RunAsync(quiet, "--verbosity", verbosity);
126+
var result = await app.RunAsync([ quiet, "--verbosity", verbosity ]);
127127

128128
// Then
129129
Assert.Equal(0, result.ExitCode);
@@ -143,7 +143,7 @@ public async Task Should_Handle_Configuration_Exceptions_In_Quiet_Mode(string qu
143143
var app = GetCommandAppTester(registrar);
144144

145145
// When
146-
var result = await app.RunAsync(quiet, "--count", "ABC");
146+
var result = await app.RunAsync([ quiet, "--count", "ABC" ]);
147147

148148
// Then
149149
Assert.NotEqual(0, result.ExitCode);
@@ -177,7 +177,7 @@ public async Task Should_Handle_Network_Exceptions_In_Quiet_Mode(string quiet)
177177
var app = GetCommandAppTester(registrar);
178178

179179
// When
180-
var result = await app.RunAsync(quiet);
180+
var result = await app.RunAsync([ quiet ]);
181181

182182
// Then
183183
Assert.Equal(0, result.ExitCode);

0 commit comments

Comments
 (0)