Onboard to test framework

.config/dotnet-tools.json

@@ -8,6 +8,13 @@
         "snippet-generator"
       ],
       "rollForward": false
+    },
+    "azure.sdk.tools.testproxy": {
+      "version": "1.0.0-dev.20250805.1",
+      "commands": [
+        "test-proxy"
+      ],
+      "rollForward": false
     }
   }
 }

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/Audio/GenerateSpeechMockTests.cs

@@ -1,18 +1,16 @@
 using System;
 using System.ClientModel;
 using System.Threading;
+using Microsoft.ClientModel.TestFramework;
 using NUnit.Framework;
 using OpenAI.Audio;
-using OpenAI.Tests.Utility;
 
 namespace OpenAI.Tests.Audio;
 
-[TestFixture(true)]
-[TestFixture(false)]
 [Parallelizable(ParallelScope.All)]
 [Category("Audio")]
 [Category("Smoke")]
-internal class GenerateSpeechMockTests : SyncAsyncTestBase
+internal class GenerateSpeechMockTests : ClientTestBase
 {
     private static readonly ApiKeyCredential s_fakeCredential = new ApiKeyCredential("key");
 
@@ -24,19 +22,11 @@ public GenerateSpeechMockTests(bool isAsync)
     [Test]
     public void GenerateSpeechRespectsTheCancellationToken()
     {
-        AudioClient client = new AudioClient("model", s_fakeCredential);
+        AudioClient client = CreateProxyFromClient(new AudioClient("model", s_fakeCredential));
         using CancellationTokenSource cancellationSource = new();
         cancellationSource.Cancel();
 
-        if (IsAsync)
-        {
-            Assert.That(async () => await client.GenerateSpeechAsync("text", GeneratedSpeechVoice.Echo, cancellationToken: cancellationSource.Token),
+        Assert.That(async () => await client.GenerateSpeechAsync("text", GeneratedSpeechVoice.Echo, cancellationToken: cancellationSource.Token),
                 Throws.InstanceOf<OperationCanceledException>());
-        }
-        else
-        {
-            Assert.That(() => client.GenerateSpeech("text", GeneratedSpeechVoice.Echo, cancellationToken: cancellationSource.Token),
-                Throws.InstanceOf<OperationCanceledException>());
-        }
     }
 }

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;
@@ -8,11 +9,8 @@
 
 namespace OpenAI.Tests.Audio;
 
-[TestFixture(true)]
-[TestFixture(false)]
-[Parallelizable(ParallelScope.All)]
 [Category("Audio")]
-public partial class GenerateSpeechTests : SyncAsyncTestBase
+public partial class GenerateSpeechTests : OpenAIRecordedTestBase
 {
     public GenerateSpeechTests(bool isAsync) : base(isAsync)
     {
@@ -21,14 +19,15 @@ public GenerateSpeechTests(bool isAsync) : base(isAsync)
     [Test]
     public async Task BasicTextToSpeechWorks()
     {
-        AudioClient client = GetTestClient<AudioClient>(TestScenario.Audio_TTS);
+        using (Recording.DisableRequestBodyRecording()) // Temp while multipart support in the test proxy is being implemented
+        {
+            AudioClient client = GetProxiedOpenAIClient<AudioClient>(TestScenario.Audio_TTS);
 
-        BinaryData audio = IsAsync
-            ? await client.GenerateSpeechAsync("Hello, world! This is a test.", GeneratedSpeechVoice.Shimmer)
-            : client.GenerateSpeech("Hello, world! This is a test.", GeneratedSpeechVoice.Shimmer);
+            BinaryData audio = await client.GenerateSpeechAsync("Hello, world! This is a test.", GeneratedSpeechVoice.Shimmer);
 
-        Assert.That(audio, Is.Not.Null);
-        ValidateGeneratedAudio(audio, "hello");
+            Assert.That(audio, Is.Not.Null);
+            await ValidateGeneratedAudio(audio, "hello");
+        }
     }
 
     [Test]
@@ -41,7 +40,7 @@ public async Task BasicTextToSpeechWorks()
     [TestCase("pcm")]
     public async Task OutputFormatWorks(string responseFormat)
     {
-        AudioClient client = GetTestClient<AudioClient>(TestScenario.Audio_TTS);
+        AudioClient client = GetProxiedOpenAIClient<AudioClient>(TestScenario.Audio_TTS);
 
         SpeechGenerationOptions options = new();
 
@@ -59,9 +58,7 @@ public async Task OutputFormatWorks(string responseFormat)
             };
         }
 
-        BinaryData audio = IsAsync
-            ? await client.GenerateSpeechAsync("Hello, world!", GeneratedSpeechVoice.Alloy, options)
-            : client.GenerateSpeech("Hello, world!", GeneratedSpeechVoice.Alloy, options);
+        BinaryData audio = await client.GenerateSpeechAsync("Hello, world!", GeneratedSpeechVoice.Alloy, options);
 
         Assert.That(audio, Is.Not.Null);
 
@@ -82,10 +79,10 @@ public async Task OutputFormatWorks(string responseFormat)
         }
     }
 
-    private void ValidateGeneratedAudio(BinaryData audio, string expectedSubstring)
+    private async Task ValidateGeneratedAudio(BinaryData audio, string expectedSubstring)
     {
-        AudioClient client = GetTestClient<AudioClient>(TestScenario.Audio_Whisper);
-        AudioTranscription transcription = client.TranscribeAudio(audio.ToStream(), "hello_world.wav");
+        AudioClient client = GetProxiedOpenAIClient<AudioClient>(TestScenario.Audio_Whisper);
+        AudioTranscription transcription = await client.TranscribeAudioAsync(audio.ToStream(), "hello_world.wav");
 
         Assert.That(transcription.Text.ToLowerInvariant(), Contains.Substring(expectedSubstring));
     }

tests/Audio/TranscriptionMockTests.cs

@@ -4,18 +4,17 @@
 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;
 
 namespace OpenAI.Tests.Audio;
 
-[TestFixture(true)]
-[TestFixture(false)]
 [Parallelizable(ParallelScope.All)]
 [Category("Audio")]
 [Category("Smoke")]
-public partial class TranscriptionMockTests : SyncAsyncTestBase
+public partial class TranscriptionMockTests : ClientTestBase
 {
     private static readonly ApiKeyCredential s_fakeCredential = new ApiKeyCredential("key");
 
@@ -141,53 +140,43 @@ public async Task TranscribeAudioDeserializesSegment(AudioSourceKind audioSource
     [Test]
     public void TranscribeAudioFromStreamRespectsTheCancellationToken()
     {
-        AudioClient client = new AudioClient("model", s_fakeCredential);
+        AudioClient client = CreateProxyFromClient(new AudioClient("model", s_fakeCredential));
         using Stream stream = new MemoryStream();
         using CancellationTokenSource cancellationSource = new();
         cancellationSource.Cancel();
 
-        if (IsAsync)
-        {
-            Assert.That(async () => await client.TranscribeAudioAsync(stream, "filename", cancellationToken: cancellationSource.Token),
+        Assert.That(async () => await client.TranscribeAudioAsync(stream, "filename", cancellationToken: cancellationSource.Token),
                 Throws.InstanceOf<OperationCanceledException>());
-        }
-        else
-        {
-            Assert.That(() => client.TranscribeAudio(stream, "filename", cancellationToken: cancellationSource.Token),
-                Throws.InstanceOf<OperationCanceledException>());
-        }
     }
 
     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)
+            {
+                ExpectSyncPipeline = !IsAsync
+            }
         };
     }
 
     private async ValueTask<AudioTranscription> InvokeTranscribeAudioSyncOrAsync(OpenAIClientOptions clientOptions, AudioSourceKind audioSourceKind)
     {
-        AudioClient client = new AudioClient("model", s_fakeCredential, clientOptions);
+        AudioClient client = CreateProxyFromClient(new AudioClient("model", s_fakeCredential, clientOptions));
         string filename = "audio_french.wav";
         string path = Path.Combine("Assets", filename);
 
         if (audioSourceKind == AudioSourceKind.UsingStream)
         {
             using FileStream audio = File.OpenRead(path);
 
-            return IsAsync
-                ? await client.TranscribeAudioAsync(audio, filename)
-                : client.TranscribeAudio(audio, filename);
+            return await client.TranscribeAudioAsync(audio, filename);
         }
         else if (audioSourceKind == AudioSourceKind.UsingFilePath)
         {
-            return IsAsync
-                ? await client.TranscribeAudioAsync(path)
-                : client.TranscribeAudio(path);
+            return await client.TranscribeAudioAsync(path);
         }
 
         Assert.Fail("Invalid source kind.");