Onboard to test framework

examples/Responses/Example02_SimpleResponseStreaming.cs

@@ -11,6 +11,7 @@ namespace OpenAI.Examples;
 
 public partial class ResponseExamples
 {
+    [Ignore("Test org cannot use streaming")]
     [Test]
     public void Example02_SimpleResponseStreaming()
     {

examples/Responses/Example02_SimpleResponseStreamingAsync.cs

@@ -13,6 +13,7 @@ namespace OpenAI.Examples;
 
 public partial class ResponseExamples
 {
+    [Ignore("Test org cannot use streaming")]
     [Test]
     public async Task Example02_SimpleResponseStreamingAsync()
     {

tests/Assistants/AssistantsSmokeTests.cs

@@ -79,7 +79,7 @@ public void ResponseFormatEquality()
         Assert.That((AssistantResponseFormat)null != AssistantResponseFormat.CreateTextFormat());
         Assert.That(AssistantResponseFormat.CreateTextFormat() != null);
         Assert.That(AssistantResponseFormat.CreateTextFormat(), Is.Not.EqualTo(null));
-        Assert.That(null, Is.Not.EqualTo(AssistantResponseFormat.CreateTextFormat()));
+        Assert.That(AssistantResponseFormat.CreateTextFormat(), Is.Not.Null);
 
         AssistantResponseFormat jsonSchemaFormat = AssistantResponseFormat.CreateJsonSchemaFormat(
             name: "test_schema",

tests/Assistants/AssistantsTests.cs

@@ -1,4 +1,5 @@
-using NUnit.Framework;
+using Microsoft.ClientModel.TestFramework;
+using NUnit.Framework;
 using OpenAI.Assistants;
 using OpenAI.Files;
 using OpenAI.Tests.Utility;
@@ -598,11 +599,10 @@
         Assert.That(messages[0].Content[0].Text.ToLowerInvariant(), Does.Contain("tacos"));
     }
 
+    [AsyncOnly]
     [Test]
     public async Task StreamingRunWorksAsync()
     {
-        AssertAsyncOnly();
-
         AssistantClient client = GetTestClient();
         Assistant assistant = await client.CreateAssistantAsync("gpt-4o-mini");
         Validate(assistant);
@@ -648,11 +648,10 @@
         Print(">>> Done <<<");
     }
 
+    [SyncOnly]
     [Test]
     public void StreamingRunWorks()
     {
-        AssertSyncOnly();
-
         AssistantClient client = GetTestClient();
         Assistant assistant = client.CreateAssistant("gpt-4o-mini");
         Validate(assistant);
@@ -698,11 +697,10 @@
         Print(">>> Done <<<");
     }
 
+    [AsyncOnly]
     [TestCase]
     public async Task StreamingToolCallAsync()
     {
-        AssertAsyncOnly();
-
         AssistantClient client = GetTestClient();
         FunctionToolDefinition getWeatherTool = new("get_current_weather")
         {
@@ -761,11 +759,10 @@
         } while (run?.Status.IsTerminal == false);
     }
 
+    [SyncOnly]
     [TestCase]
     public void StreamingToolCall()
     {
-        AssertSyncOnly();
-
         AssistantClient client = GetTestClient();
         FunctionToolDefinition getWeatherTool = new("get_current_weather")
         {
@@ -1027,11 +1024,10 @@
         });
     }
 
+    [SyncOnly]
     [Test]
     public void FileSearchStreamingWorksSync()
     {
-        AssertSyncOnly();
-
         const string fileContent = """
                 The favorite food of several people:
                 - Summanus Ferdinand: tacos
@@ -1118,11 +1114,10 @@
         Assert.That(message, Does.Contain("cake"));
     }
 
+    [AsyncOnly]
     [Test]
     public async Task FileSearchStreamingWorksAsync()
     {
-        AssertAsyncOnly();
-
         const string fileContent = """
                 The favorite food of several people:
                 - Summanus Ferdinand: tacos
@@ -1211,11 +1206,10 @@
         Assert.That(message, Does.Contain("cake"));
     }
 
+    [AsyncOnly]
     [Test]
     public async Task Pagination_CanEnumerateAssistantsAsync()
     {
-        AssertAsyncOnly();
-
         const int TestAssistantCount = 10;
 
         AssistantClient client = GetTestClient();
@@ -1256,11 +1250,10 @@
         Assert.That(count, Is.GreaterThanOrEqualTo(TestAssistantCount));
     }
 
+    [SyncOnly]
     [Test]
     public void Pagination_CanEnumerateAssistants()
     {
-        AssertSyncOnly();
-
         const int TestAssistantCount = 10;
 
         AssistantClient client = GetTestClient();
@@ -1301,11 +1294,10 @@
         Assert.That(count, Is.GreaterThanOrEqualTo(TestAssistantCount));
     }
 
+    [AsyncOnly]
     [Test]
     public async Task Pagination_CanPageThroughAssistantCollectionAsync()
     {
-        AssertAsyncOnly();
-
         const int TestAssistantCount = 10;
         const int TestPageSizeLimit = 2;
 
@@ -1359,11 +1351,10 @@
         Assert.That(pageCount, Is.GreaterThanOrEqualTo(TestAssistantCount / TestPageSizeLimit));
     }
 
+    [SyncOnly]
     [Test]
     public void Pagination_CanPageThroughAssistantCollection()
     {
-        AssertSyncOnly();
-
         const int TestAssistantCount = 10;
         const int TestPageSizeLimit = 2;
 
@@ -1427,11 +1418,10 @@
         return els.Select(el => ModelReaderWriter.Read<Assistant>(BinaryData.FromString(el.GetRawText())));
     }
 
+    [AsyncOnly]
     [Test]
     public async Task Pagination_CanRehydrateAssistantPageCollectionFromBytesAsync()
     {
-        AssertAsyncOnly();
-
         const int TestAssistantCount = 10;
         const int TestPageSizeLimit = 2;
 
@@ -1495,11 +1485,10 @@
         Assert.That(pageCount, Is.GreaterThanOrEqualTo(TestAssistantCount / TestPageSizeLimit));
     }
 
+    [SyncOnly]
     [Test]
     public void Pagination_CanRehydrateAssistantPageCollectionFromBytes()
     {
-        AssertSyncOnly();
-
         const int TestAssistantCount = 10;
         const int TestPageSizeLimit = 2;
 
@@ -1564,11 +1553,10 @@
         Assert.That(pageCount, Is.GreaterThanOrEqualTo(TestAssistantCount / TestPageSizeLimit));
     }
 
+    [AsyncOnly]
     [Test]
     public async Task Pagination_CanRehydrateAssistantPageCollectionFromPageTokenAsync()
     {
-        AssertAsyncOnly();
-
         const int TestAssistantCount = 10;
         const int TestPageSizeLimit = 2;
 
@@ -1643,11 +1631,10 @@
         Assert.That(pageCount, Is.GreaterThanOrEqualTo(TestAssistantCount / TestPageSizeLimit));
     }
 
+    [SyncOnly]
     [Test]
     public void Pagination_CanRehydrateAssistantPageCollectionFromPageToken()
     {
-        AssertSyncOnly();
-
         const int TestAssistantCount = 10;
         const int TestPageSizeLimit = 2;
 
@@ -1721,11 +1708,10 @@
         Assert.That(pageCount, Is.GreaterThanOrEqualTo(TestAssistantCount / TestPageSizeLimit));
     }
 
+    [AsyncOnly]
     [Test]
     public async Task Pagination_CanCastAssistantPageCollectionToConvenienceFromProtocolAsync()
     {
-        AssertAsyncOnly();
-
         const int TestAssistantCount = 10;
         const int TestPageSizeLimit = 2;
 
@@ -1760,7 +1746,7 @@
         // functions correctly as the convenience return type.
         await foreach (Assistant assistant in assistants)
         {
-            Assert.AreEqual(createdAssistants[count++].Id, assistant.Id);
+            Assert.That(assistant.Id, Is.EqualTo(createdAssistants[count++].Id));
 
             if (count >= createdAssistants.Count)
             {
@@ -1771,11 +1757,10 @@
         Assert.That(count, Is.GreaterThanOrEqualTo(TestAssistantCount));
     }
 
+    [SyncOnly]
     [Test]
     public void Pagination_CanCastAssistantPageCollectionToConvenienceFromProtocol()
     {
-        AssertSyncOnly();
-
         const int TestAssistantCount = 10;
         const int TestPageSizeLimit = 2;
 
@@ -1810,7 +1795,7 @@
         // functions correctly as the convenience return type.
         foreach (Assistant assistant in assistants)
         {
-            Assert.AreEqual(createdAssistants[count++].Id, assistant.Id);
+            Assert.That(assistant.Id, Is.EqualTo(createdAssistants[count++].Id));
 
             if (count >= createdAssistants.Count)
             {
@@ -1821,11 +1806,10 @@
         Assert.That(count, Is.GreaterThanOrEqualTo(TestAssistantCount));
     }
 
+    [AsyncOnly]
     [Test]
     public async Task Pagination_CanRehydrateRunStepPageCollectionFromBytesAsync()
     {
-        AssertAsyncOnly();
-
         AssistantClient client = GetTestClient();
         Assistant assistant = client.CreateAssistant("gpt-4o", new AssistantCreationOptions()
         {
@@ -1893,14 +1877,13 @@
                 .ToListAsync();
         }
 
-        CollectionAssert.AreEqual(runSteps, rehydratedRunSteps);
+        Assert.That(rehydratedRunSteps, Is.EqualTo(runSteps).AsCollection);
     }
 
+    [SyncOnly]
     [Test]
     public void Pagination_CanRehydrateRunStepPageCollectionFromBytes()
     {
-        AssertSyncOnly();
-
         AssistantClient client = GetTestClient();
         Assistant assistant = client.CreateAssistant("gpt-4o", new AssistantCreationOptions()
         {
@@ -1967,7 +1950,7 @@
                 .ToList();
         }
 
-        CollectionAssert.AreEqual(runSteps, rehydratedRunSteps);
+        Assert.That(rehydratedRunSteps, Is.EqualTo(runSteps).AsCollection);
     }
 
     [Test]

tests/Audio/GenerateSpeechMockTests.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ClientModel;
 using System.Threading;
+using Microsoft.ClientModel.TestFramework;
 using NUnit.Framework;
 using OpenAI.Audio;
 using OpenAI.Tests.Utility;

tests/Audio/GenerateSpeechTests.cs

@@ -1,4 +1,5 @@
-using NUnit.Framework;
+using Microsoft.ClientModel.TestFramework;
+using NUnit.Framework;
 using OpenAI.Audio;
 using OpenAI.Tests.Utility;
 using System;

tests/Audio/TranscriptionMockTests.cs

@@ -4,6 +4,8 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.ClientModel.TestFramework;
+using Microsoft.ClientModel.TestFramework.Mocks;
 using NUnit.Framework;
 using OpenAI.Audio;
 using OpenAI.Tests.Utility;
@@ -160,12 +162,11 @@
 
     private OpenAIClientOptions GetClientOptionsWithMockResponse(int status, string content)
     {
-        MockPipelineResponse response = new MockPipelineResponse(status);
-        response.SetContent(content);
+        MockPipelineResponse response = new MockPipelineResponse(status).WithContent(content);
 
         return new OpenAIClientOptions()
         {
-            Transport = new MockPipelineTransport(response)
+            Transport = new MockPipelineTransport(_ => response)
         };
     }
 

tests/Audio/TranscriptionTests.cs

@@ -1,4 +1,5 @@
-using NUnit.Framework;
+using Microsoft.ClientModel.TestFramework;
+using NUnit.Framework;
 using OpenAI.Audio;
 using OpenAI.Tests.Utility;
 using System;
@@ -180,7 +181,6 @@
 
                 Assert.That(segment.Id, Is.EqualTo(i));
                 Assert.That(segment.EndTime, Is.GreaterThanOrEqualTo(segment.StartTime));
-                Assert.That(segment.TokenIds, Is.Not.Null);
                 Assert.That(segment.TokenIds.Length, Is.GreaterThan(0));
 
                 Assert.That(segment.AverageLogProbability, Is.LessThan(-0.001f).Or.GreaterThan(0.001f));

tests/Audio/TranslationMockTests.cs

@@ -4,6 +4,8 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.ClientModel.TestFramework;
+using Microsoft.ClientModel.TestFramework.Mocks;
 using NUnit.Framework;
 using OpenAI.Audio;
 using OpenAI.Tests.Utility;
@@ -136,12 +138,11 @@
 
     private OpenAIClientOptions GetClientOptionsWithMockResponse(int status, string content = null)
     {
-        MockPipelineResponse response = new MockPipelineResponse(status);
-        response.SetContent(content ?? "{}");
+        MockPipelineResponse response = new MockPipelineResponse(status).WithContent(content ?? "{}");
 
         return new OpenAIClientOptions()
         {
-            Transport = new MockPipelineTransport(response)
+            Transport = new MockPipelineTransport(_ => response)
         };
     }
 

tests/Audio/TranslationTests.cs

@@ -1,4 +1,5 @@
-using NUnit.Framework;
+using Microsoft.ClientModel.TestFramework;
+using NUnit.Framework;
 using OpenAI.Audio;
 using OpenAI.Tests.Utility;
 using System;