Skip to content

Commit 3416acf

Browse files
m-reddingm-redding
committed
upgrade nunit
1 parent e717cca commit 3416acf

File tree

10 files changed

+81
-70
lines changed

10 files changed

+81
-70
lines changed

‎tests/Assistants/Assistants.VectorStoresTests.cs‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,9 @@ public async Task CanAssociateFiles()
228228
? await client.RemoveFileFromVectorStoreAsync(vectorStore.Id, files[0].Id)
229229
: client.RemoveFileFromVectorStore(vectorStore.Id, files[0].Id);
230230
Assert.That(removalResult.FileId, Is.EqualTo(files[0].Id));
231-
Assert.True(removalResult.Removed);
232-
_vectorStoreFilesToRemove.RemoveAt(0);
231+
232+
Assert.That(removalResult.Removed);
233+
_associationsToRemove.RemoveAt(0);
233234

234235
// Errata: removals aren't immediately reflected when requesting the list
235236
Thread.Sleep(2000);
@@ -284,8 +285,9 @@ public async Task Pagination_CanRehydrateVectorStoreFileCollectionAsync()
284285

285286
FileFromStoreRemovalResult removalResult = await client.RemoveFileFromVectorStoreAsync(vectorStore.Id, files[0].Id);
286287
Assert.That(removalResult.FileId, Is.EqualTo(files[0].Id));
287-
Assert.True(removalResult.Removed);
288-
_vectorStoreFilesToRemove.RemoveAt(0);
288+
289+
Assert.That(removalResult.Removed);
290+
_associationsToRemove.RemoveAt(0);
289291

290292
// Errata: removals aren't immediately reflected when requesting the list
291293
Thread.Sleep(2000);
@@ -364,8 +366,9 @@ public void Pagination_CanRehydrateVectorStoreFileCollection()
364366

365367
FileFromStoreRemovalResult removalResult = client.RemoveFileFromVectorStore(vectorStore.Id, files[0].Id);
366368
Assert.That(removalResult.FileId, Is.EqualTo(files[0].Id));
367-
Assert.True(removalResult.Removed);
368-
_vectorStoreFilesToRemove.RemoveAt(0);
369+
370+
Assert.That(removalResult.Removed);
371+
_associationsToRemove.RemoveAt(0);
369372

370373
// Errata: removals aren't immediately reflected when requesting the list
371374
Thread.Sleep(2000);

‎tests/Batch/BatchTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void ListBatchesProtocol()
5353
pageCount++;
5454
}
5555

56-
Assert.GreaterOrEqual(pageCount, 1);
56+
Assert.That(pageCount, Is.GreaterThanOrEqualTo(1));
5757
}
5858

5959
[Test]
@@ -85,7 +85,7 @@ public async Task ListBatchesProtocolAsync()
8585
pageCount++;
8686
}
8787

88-
Assert.GreaterOrEqual(pageCount, 1);
88+
Assert.That(pageCount, Is.GreaterThanOrEqualTo(1));
8989
}
9090

9191
[Test]
@@ -227,8 +227,8 @@ static bool Validate(CreateBatchOperation operation)
227227
return true;
228228
}
229229

230-
Assert.IsTrue(Validate(batchOperation));
231-
Assert.IsTrue(Validate(rehydratedOperation));
230+
Assert.That(Validate(batchOperation));
231+
Assert.That(Validate(rehydratedOperation));
232232

233233
// We don't test wait for completion live because this is documented to
234234
// sometimes take 24 hours.

‎tests/Chat/ChatStoreTests.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using NUnit.Framework;
1+
using Microsoft.ClientModel.TestFramework;
2+
using NUnit.Framework;
23
using OpenAI.Chat;
34
using OpenAI.Tests.Utility;
45
using System;

‎tests/Chat/ChatTests.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ public void StreamingChatCanBeCancelled()
179179
Assert.Throws<OperationCanceledException>(() =>
180180
{
181181
// Should throw for the second update.
182-
Assert.True(cancellationTokenSource.IsCancellationRequested);
183-
Assert.True(cancellationTokenSource.Token.IsCancellationRequested);
182+
Assert.That(cancellationTokenSource.IsCancellationRequested);
183+
Assert.That(cancellationTokenSource.Token.IsCancellationRequested);
184184
enumerator.MoveNext();
185185
enumerator.MoveNext();
186186
});
@@ -225,8 +225,8 @@ public async Task StreamingChatCanBeCancelledAsync()
225225
Assert.ThrowsAsync<OperationCanceledException>(async () =>
226226
{
227227
// Should throw for the second update.
228-
Assert.True(cancellationTokenSource.IsCancellationRequested);
229-
Assert.True(cancellationTokenSource.Token.IsCancellationRequested);
228+
Assert.That(cancellationTokenSource.IsCancellationRequested);
229+
Assert.That(cancellationTokenSource.Token.IsCancellationRequested);
230230
await enumerator.MoveNextAsync();
231231
await enumerator.MoveNextAsync();
232232
});
@@ -261,7 +261,7 @@ public void CompleteChatStreamingClosesNetworkStream()
261261
CollectionResult<StreamingChatCompletionUpdate> streamingResult = client.CompleteChatStreaming(messages);
262262

263263
Assert.That(streamingResult, Is.InstanceOf<CollectionResult<StreamingChatCompletionUpdate>>());
264-
Assert.IsFalse(response.IsDisposed);
264+
Assert.That(response.IsDisposed, Is.False);
265265

266266
foreach (StreamingChatCompletionUpdate chatUpdate in streamingResult)
267267
{
@@ -274,7 +274,7 @@ public void CompleteChatStreamingClosesNetworkStream()
274274

275275
stopwatch.Stop();
276276

277-
Assert.IsTrue(response.IsDisposed);
277+
Assert.That(response.IsDisposed);
278278
}
279279

280280
[Test]
@@ -306,7 +306,7 @@ public async Task CompleteChatStreamingClosesNetworkStreamAsync()
306306
AsyncCollectionResult<StreamingChatCompletionUpdate> streamingResult = client.CompleteChatStreamingAsync(messages);
307307

308308
Assert.That(streamingResult, Is.InstanceOf<AsyncCollectionResult<StreamingChatCompletionUpdate>>());
309-
Assert.IsFalse(response.IsDisposed);
309+
Assert.That(response.IsDisposed, Is.False);
310310

311311
await foreach (StreamingChatCompletionUpdate chatUpdate in streamingResult)
312312
{
@@ -319,7 +319,7 @@ public async Task CompleteChatStreamingClosesNetworkStreamAsync()
319319

320320
stopwatch.Stop();
321321

322-
Assert.IsTrue(response.IsDisposed);
322+
Assert.That(response.IsDisposed);
323323
}
324324

325325
[Test]
@@ -751,10 +751,10 @@ public async Task StructuredOutputsWork()
751751
Assert.That(completion.Content?.Count, Is.EqualTo(1));
752752
JsonDocument contentDocument = null;
753753
Assert.DoesNotThrow(() => contentDocument = JsonDocument.Parse(completion.Content[0].Text));
754-
Assert.IsTrue(contentDocument.RootElement.TryGetProperty("answer", out JsonElement answerProperty));
755-
Assert.IsTrue(answerProperty.ValueKind == JsonValueKind.String);
756-
Assert.IsTrue(contentDocument.RootElement.TryGetProperty("steps", out JsonElement stepsProperty));
757-
Assert.IsTrue(stepsProperty.ValueKind == JsonValueKind.Array);
754+
Assert.That(contentDocument.RootElement.TryGetProperty("answer", out JsonElement answerProperty));
755+
Assert.That(answerProperty.ValueKind == JsonValueKind.String);
756+
Assert.That(contentDocument.RootElement.TryGetProperty("steps", out JsonElement stepsProperty));
757+
Assert.That(stepsProperty.ValueKind == JsonValueKind.Array);
758758
}
759759

760760
[Test]
@@ -913,8 +913,8 @@ public async Task HelloWorldChatWithTracingAndMetrics()
913913
List<TestMeasurement> usages = meterListener.GetMeasurements("gen_ai.client.token.usage");
914914
Assert.That(usages.Count, Is.EqualTo(2));
915915

916-
Assert.True(usages[0].tags.TryGetValue("gen_ai.token.type", out var type));
917-
Assert.IsInstanceOf<string>(type);
916+
Assert.That(usages[0].tags.TryGetValue("gen_ai.token.type", out var type));
917+
Assert.That(type, Is.InstanceOf<string>());
918918

919919
TestMeasurement input = (type is "input") ? usages[0] : usages[1];
920920
TestMeasurement output = (type is "input") ? usages[1] : usages[0];
@@ -1098,7 +1098,7 @@ ChatMessageContentPart binaryFileContentPart
10981098
private List<string> FileIdsToDelete = [];
10991099
private void Validate<T>(T item)
11001100
{
1101-
Assert.IsNotNull(item);
1101+
Assert.That(item, Is.Not.Null);
11021102
if (item is OpenAIFile file)
11031103
{
11041104
FileIdsToDelete.Add(file.Id);

‎tests/FineTuning/FineTuningClientTests.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,16 @@ public async Task MinimalRequiredParams([Values(Method.Sync, Method.Async)] Meth
7171
: client.FineTune("gpt-3.5-turbo", sampleFile.Id, false);
7272

7373
// Assert.AreEqual(0, ft.Hyperparameters.CycleCount);
74-
Assert.True(ft.Status.InProgress);
75-
Assert.False(ft.HasCompleted);
74+
Assert.That(ft.Status.InProgress);
75+
Assert.That(ft.HasCompleted, Is.False);
7676

7777
_ = method.IsAsync()
7878
? await ft.CancelAndUpdateAsync()
7979
: ft.CancelAndUpdate();
8080

8181
Assert.That(ft.Status, Is.EqualTo(FineTuningStatus.Cancelled));
82-
Assert.False(ft.Status.InProgress);
83-
Assert.True(ft.HasCompleted);
82+
Assert.That(ft.Status.InProgress, Is.False);
83+
Assert.That(ft.HasCompleted);
8484
}
8585

8686

@@ -211,14 +211,14 @@ public void GetJobs([Values(Method.Sync, Method.Async)] Method method)
211211
{
212212
Console.WriteLine($"{counter} jobs");
213213
Console.WriteLine($"Job: {job.JobId}");
214-
Assert.IsTrue(job.JobId.StartsWith("ftjob"));
214+
Assert.That(job.JobId.StartsWith("ftjob"));
215215
counter++;
216216
}
217217
Console.WriteLine($"Got {counter} jobs");
218218

219219
// Assert
220-
Assert.Greater(counter, 0);
221-
Assert.LessOrEqual(counter, 10);
220+
Assert.That(counter, Is.GreaterThan(0));
221+
Assert.That(counter, Is.LessThanOrEqualTo(10));
222222
}
223223

224224
[Test]
@@ -293,8 +293,8 @@ public void GetCheckpoints([Values(Method.Sync, Method.Async)] Method method)
293293
}
294294

295295
FineTuningCheckpointMetrics metrics = first.Metrics;
296-
Assert.NotNull(metrics);
297-
Assert.Greater(metrics.StepNumber, 0);
296+
Assert.That(metrics, Is.Not.Null);
297+
Assert.That(metrics.StepNumber, Is.GreaterThan(0));
298298
}
299299

300300
private static FineTuningClient GetTestClient() => GetTestClient<FineTuningClient>(TestScenario.FineTuning);

‎tests/FineTuning/FineTuningOperationTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ internal class FineTuningOperationTests
1919
public void TestInProgress()
2020
{
2121
var success = FineTuningStatus.Queued;
22-
Assert.IsTrue(success.InProgress);
22+
Assert.That(success.InProgress);
2323

2424
var fail = FineTuningStatus.Failed;
25-
Assert.IsFalse(fail.InProgress);
25+
Assert.That(fail.InProgress, Is.False);
2626
}
2727
}

‎tests/OpenAI.Tests.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,15 @@
1515
</ItemGroup>
1616
<ItemGroup>
1717
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
18+
<<<<<<< HEAD
1819
<PackageReference Include="NUnit" Version="3.13.2" />
1920
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
21+
=======
22+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.7" />
23+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.7" />
24+
<PackageReference Include="NUnit" Version="4.4.0" />
25+
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
26+
>>>>>>> 3ce1c87 (upgrade nunit)
2027
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
2128
<PackageReference Include="Moq" Version="[4.18.2]" />
2229
<PackageReference Include="System.Linq.Async" Version="6.0.1" />

‎tests/Telemetry/ChatTelemetryTests.cs‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ public class ChatTelemetryTests
3737
public void AllTelemetryOff()
3838
{
3939
var telemetry = new OpenTelemetrySource(RequestModel, new Uri(Endpoint));
40-
Assert.IsNull(telemetry.StartChatScope(new ChatCompletionOptions()));
41-
Assert.IsNull(Activity.Current);
40+
Assert.That(telemetry.StartChatScope(new ChatCompletionOptions()), Is.Null);
41+
Assert.That(Activity.Current, Is.Null);
4242
}
4343

4444
[Test]
@@ -47,8 +47,8 @@ public void SwitchOffAllTelemetryOn()
4747
using var activityListener = new TestActivityListener("OpenAI.ChatClient");
4848
using var meterListener = new TestMeterListener("OpenAI.ChatClient");
4949
var telemetry = new OpenTelemetrySource(RequestModel, new Uri(Endpoint));
50-
Assert.IsNull(telemetry.StartChatScope(new ChatCompletionOptions()));
51-
Assert.IsNull(Activity.Current);
50+
Assert.That(telemetry.StartChatScope(new ChatCompletionOptions()), Is.Null);
51+
Assert.That(Activity.Current, Is.Null);
5252
}
5353

5454
[Test]
@@ -64,8 +64,8 @@ public void MetricsOnTracingOff()
6464
using var scope = telemetry.StartChatScope(new ChatCompletionOptions());
6565
var elapsedMin = Stopwatch.StartNew();
6666

67-
Assert.Null(Activity.Current);
68-
Assert.NotNull(scope);
67+
Assert.That(Activity.Current, Is.Null);
68+
Assert.That(scope, Is.Not.Null);
6969

7070
// so we have some duration to measure
7171
Thread.Sleep(20);
@@ -94,7 +94,7 @@ public void MetricsOnTracingOffException()
9494
}
9595

9696
ValidateDuration(meterListener, null, TimeSpan.MinValue, TimeSpan.MaxValue);
97-
Assert.IsNull(meterListener.GetMeasurements("gen_ai.client.token.usage"));
97+
Assert.That(meterListener.GetMeasurements("gen_ai.client.token.usage"), Is.Null);
9898
}
9999

100100
[Test]
@@ -111,16 +111,16 @@ public void TracingOnMetricsOff()
111111
using (var scope = telemetry.StartChatScope(new ChatCompletionOptions()))
112112
{
113113
activity = Activity.Current;
114-
Assert.IsNull(activity.GetTagItem("gen_ai.request.temperature"));
115-
Assert.IsNull(activity.GetTagItem("gen_ai.request.top_p"));
116-
Assert.IsNull(activity.GetTagItem("gen_ai.request.max_tokens"));
114+
Assert.That(activity.GetTagItem("gen_ai.request.temperature"), Is.Null);
115+
Assert.That(activity.GetTagItem("gen_ai.request.top_p"), Is.Null);
116+
Assert.That(activity.GetTagItem("gen_ai.request.max_tokens"), Is.Null);
117117

118-
Assert.NotNull(scope);
118+
Assert.That(scope, Is.Not.Null);
119119

120120
scope.RecordChatCompletion(chatCompletion);
121121
}
122122

123-
Assert.Null(Activity.Current);
123+
Assert.That(Activity.Current, Is.Null);
124124
Assert.That(listener.Activities.Count, Is.EqualTo(1));
125125

126126
ValidateChatActivity(listener.Activities.Single(), chatCompletion, RequestModel, Host, Port);
@@ -149,7 +149,7 @@ public void ChatTracingAllAttributes()
149149
Assert.That(Activity.Current.GetTagItem("gen_ai.request.max_tokens"), Is.EqualTo(options.MaxOutputTokenCount.Value));
150150
scope.RecordChatCompletion(chatCompletion);
151151
}
152-
Assert.Null(Activity.Current);
152+
Assert.That(Activity.Current, Is.Null);
153153

154154
ValidateChatActivity(listener.Activities.Single(), chatCompletion, RequestModel, Host, Port);
155155
}
@@ -168,7 +168,7 @@ public void ChatTracingException()
168168
scope.RecordException(error);
169169
}
170170

171-
Assert.Null(Activity.Current);
171+
Assert.That(Activity.Current, Is.Null);
172172

173173
ValidateChatActivity(listener.Activities.Single(), error, RequestModel, Host, Port);
174174
}
@@ -224,7 +224,7 @@ public async Task ChatTracingAndMetricsMultiple()
224224
var usages = meterListener.GetMeasurements("gen_ai.client.token.usage");
225225
// we don't report usage if there was no response
226226
Assert.That(usages.Count, Is.EqualTo(numberOfSuccessfulResponses * 2));
227-
Assert.IsEmpty(usages.Where(u => u.tags.ContainsKey("error.type")));
227+
Assert.That(usages.Where(u => u.tags.ContainsKey("error.type")), Is.Empty);
228228

229229
Assert.That(usages
230230
.Where(u => u.tags.Contains(new KeyValuePair<string, object>("gen_ai.token.type", "input")))
@@ -243,39 +243,39 @@ private void SetMessages(ChatCompletionOptions options, params ChatMessage[] mes
243243
private void ValidateDuration(TestMeterListener listener, ChatCompletion response, TimeSpan durationMin, TimeSpan durationMax)
244244
{
245245
var duration = listener.GetInstrument("gen_ai.client.operation.duration");
246-
Assert.IsNotNull(duration);
247-
Assert.IsInstanceOf<Histogram<double>>(duration);
246+
Assert.That(duration, Is.Not.Null);
247+
Assert.That(duration, Is.InstanceOf<Histogram<double>>());
248248

249249
var measurements = listener.GetMeasurements("gen_ai.client.operation.duration");
250-
Assert.IsNotNull(measurements);
250+
Assert.That(measurements, Is.Not.Null);
251251
Assert.That(measurements.Count, Is.EqualTo(1));
252252

253253
var measurement = measurements[0];
254-
Assert.IsInstanceOf<double>(measurement.value);
255-
Assert.GreaterOrEqual((double)measurement.value, durationMin.TotalSeconds);
256-
Assert.LessOrEqual((double)measurement.value, durationMax.TotalSeconds);
254+
Assert.That(measurement.value, Is.InstanceOf<double>());
255+
Assert.That((double)measurement.value, Is.GreaterThanOrEqualTo(durationMin.TotalSeconds));
256+
Assert.That((double)measurement.value, Is.LessThanOrEqualTo(durationMax.TotalSeconds));
257257

258258
ValidateChatMetricTags(measurement, response, RequestModel, Host, Port);
259259
}
260260

261261
private void ValidateUsage(TestMeterListener listener, ChatCompletion response, int inputTokens, int outputTokens)
262262
{
263263
var usage = listener.GetInstrument("gen_ai.client.token.usage");
264-
Assert.IsNotNull(usage);
265-
Assert.IsInstanceOf<Histogram<long>>(usage);
264+
Assert.That(usage, Is.Not.Null);
265+
Assert.That(usage, Is.InstanceOf<Histogram<long>>());
266266

267267
var measurements = listener.GetMeasurements("gen_ai.client.token.usage");
268-
Assert.IsNotNull(measurements);
268+
Assert.That(measurements, Is.Not.Null);
269269
Assert.That(measurements.Count, Is.EqualTo(2));
270270

271271
foreach (var measurement in measurements)
272272
{
273-
Assert.IsInstanceOf<long>(measurement.value);
273+
Assert.That(measurement.value, Is.InstanceOf<long>());
274274
ValidateChatMetricTags(measurement, response, RequestModel, Host, Port);
275275
}
276276

277-
Assert.True(measurements[0].tags.TryGetValue("gen_ai.token.type", out var type));
278-
Assert.IsInstanceOf<string>(type);
277+
Assert.That(measurements[0].tags.TryGetValue("gen_ai.token.type", out var type));
278+
Assert.That(type, Is.InstanceOf<string>());
279279

280280
TestMeasurement input = (type is "input") ? measurements[0] : measurements[1];
281281
TestMeasurement output = (type is "input") ? measurements[1] : measurements[0];

0 commit comments

Comments
 (0)