fix: dotnet test CI and standardize test categories (#5286)

Co-authored-by: Ryan Sweet <[email protected]>
microsoft · Feb 3, 2025 · 9af6883 · 9af6883
1 parent 877796d
commit 9af6883
Show file tree

Hide file tree

Showing 57 changed files with 82 additions and 6 deletions.
diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.yml
@@ -102,8 +102,10 @@ jobs:
       run: |
         echo "Build AutoGen"
         dotnet build --no-restore --configuration Release -bl /p:SignAssembly=true
-    - name: Unit Test
-      run: dotnet test --no-build -bl --configuration Release --filter type=!integration
+    - name: Unit Test V1
+      run: dotnet test --no-build -bl --configuration Release --filter "Category=UnitV1"
+    - name: Unit Test V2
+      run: dotnet test --no-build -bl --configuration Release --filter "Category=UnitV2"
 
   integration-test:
     strategy:
@@ -155,7 +157,7 @@ jobs:
         echo "Build AutoGen"
         dotnet build --no-restore --configuration Release -bl /p:SignAssembly=true
     - name: Integration Test
-      run: dotnet --version && dotnet test --no-build -bl --configuration Release --filter type=integration
+      run: dotnet --version && dotnet test --no-build -bl --configuration Release --filter "Category=Integration"
     - name: Restore the global.json
       run: rm global.json && git checkout -- global.json
 

diff --git a/dotnet/test/AutoGen.Anthropic.Tests/AnthropicClientAgentTest.cs b/dotnet/test/AutoGen.Anthropic.Tests/AnthropicClientAgentTest.cs
@@ -7,9 +7,11 @@
 using AutoGen.Core;
 using AutoGen.Tests;
 using FluentAssertions;
+using Xunit;
 
 namespace AutoGen.Anthropic.Tests;
 
+[Trait("Category", "UnitV1")]
 public class AnthropicClientAgentTest
 {
     [ApiKeyFact("ANTHROPIC_API_KEY")]

diff --git a/dotnet/test/AutoGen.Anthropic.Tests/AnthropicClientTest.cs b/dotnet/test/AutoGen.Anthropic.Tests/AnthropicClientTest.cs
@@ -13,6 +13,7 @@
 
 namespace AutoGen.Anthropic.Tests;
 
+[Trait("Category", "UnitV1")]
 public class AnthropicClientTests
 {
     [ApiKeyFact("ANTHROPIC_API_KEY")]

diff --git a/dotnet/test/AutoGen.AzureAIInference.Tests/ChatCompletionClientAgentTests.cs b/dotnet/test/AutoGen.AzureAIInference.Tests/ChatCompletionClientAgentTests.cs
@@ -15,6 +15,7 @@
 
 namespace AutoGen.AzureAIInference.Tests;
 
+[Trait("Category", "UnitV1")]
 public partial class ChatCompletionClientAgentTests
 {
     /// <summary>

diff --git a/dotnet/test/AutoGen.AzureAIInference.Tests/ChatRequestMessageTests.cs b/dotnet/test/AutoGen.AzureAIInference.Tests/ChatRequestMessageTests.cs
@@ -14,6 +14,7 @@
 
 namespace AutoGen.AzureAIInference.Tests;
 
+[Trait("Category", "UnitV1")]
 public class ChatRequestMessageTests
 {
     [Fact]

diff --git a/dotnet/test/AutoGen.DotnetInteractive.Tests/DotnetInteractiveServiceTest.cs b/dotnet/test/AutoGen.DotnetInteractive.Tests/DotnetInteractiveServiceTest.cs
@@ -8,6 +8,7 @@
 namespace AutoGen.DotnetInteractive.Tests;
 
 [Collection("Sequential")]
+[Trait("Category", "UnitV1")]
 public class DotnetInteractiveServiceTest : IDisposable
 {
     private ITestOutputHelper _output;

diff --git a/dotnet/test/AutoGen.DotnetInteractive.Tests/DotnetInteractiveStdioKernelConnectorTests.cs b/dotnet/test/AutoGen.DotnetInteractive.Tests/DotnetInteractiveStdioKernelConnectorTests.cs
@@ -10,6 +10,7 @@
 namespace AutoGen.DotnetInteractive.Tests;
 
 [Collection("Sequential")]
+[Trait("Category", "UnitV1Kernel")]
 public class DotnetInteractiveStdioKernelConnectorTests : IDisposable
 {
     private string _workingDir;

diff --git a/dotnet/test/AutoGen.DotnetInteractive.Tests/InProcessDotnetInteractiveKernelBuilderTest.cs b/dotnet/test/AutoGen.DotnetInteractive.Tests/InProcessDotnetInteractiveKernelBuilderTest.cs
@@ -8,6 +8,7 @@
 namespace AutoGen.DotnetInteractive.Tests;
 
 [Collection("Sequential")]
+[Trait("Category", "UnitV1Kernel")]
 public class InProcessDotnetInteractiveKernelBuilderTest
 {
     [Fact]

diff --git a/dotnet/test/AutoGen.DotnetInteractive.Tests/MessageExtensionTests.cs b/dotnet/test/AutoGen.DotnetInteractive.Tests/MessageExtensionTests.cs
@@ -8,6 +8,7 @@
 
 namespace AutoGen.DotnetInteractive.Tests;
 
+[Trait("Category", "UnitV1")]
 public class MessageExtensionTests
 {
     [Fact]

diff --git a/dotnet/test/AutoGen.Gemini.Tests/FunctionContractExtensionTests.cs b/dotnet/test/AutoGen.Gemini.Tests/FunctionContractExtensionTests.cs
@@ -10,6 +10,7 @@
 
 namespace AutoGen.Gemini.Tests;
 
+[Trait("Category", "UnitV1")]
 public class FunctionContractExtensionTests
 {
     private readonly Functions functions = new Functions();

diff --git a/dotnet/test/AutoGen.Gemini.Tests/GeminiAgentTests.cs b/dotnet/test/AutoGen.Gemini.Tests/GeminiAgentTests.cs
@@ -6,10 +6,12 @@
 using AutoGen.Tests;
 using FluentAssertions;
 using Google.Cloud.AIPlatform.V1;
+using Xunit;
 using Xunit.Abstractions;
 using static Google.Cloud.AIPlatform.V1.Part;
 namespace AutoGen.Gemini.Tests;
 
+[Trait("Category", "UnitV1")]
 public class GeminiAgentTests
 {
     private readonly Functions functions = new Functions();

diff --git a/dotnet/test/AutoGen.Gemini.Tests/GeminiMessageTests.cs b/dotnet/test/AutoGen.Gemini.Tests/GeminiMessageTests.cs
@@ -9,6 +9,7 @@
 
 namespace AutoGen.Gemini.Tests;
 
+[Trait("Category", "UnitV1")]
 public class GeminiMessageTests
 {
     [Fact]

diff --git a/dotnet/test/AutoGen.Gemini.Tests/GoogleGeminiClientTests.cs b/dotnet/test/AutoGen.Gemini.Tests/GoogleGeminiClientTests.cs
@@ -5,10 +5,12 @@
 using FluentAssertions;
 using Google.Cloud.AIPlatform.V1;
 using Google.Protobuf;
+using Xunit;
 using static Google.Cloud.AIPlatform.V1.Candidate.Types;
 
 namespace AutoGen.Gemini.Tests;
 
+[Trait("Category", "UnitV1")]
 public class GoogleGeminiClientTests
 {
     [ApiKeyFact("GOOGLE_GEMINI_API_KEY")]

diff --git a/dotnet/test/AutoGen.Gemini.Tests/SampleTests.cs b/dotnet/test/AutoGen.Gemini.Tests/SampleTests.cs
@@ -3,9 +3,11 @@
 
 using AutoGen.Gemini.Sample;
 using AutoGen.Tests;
+using Xunit;
 
 namespace AutoGen.Gemini.Tests;
 
+[Trait("Category", "UnitV1")]
 public class SampleTests
 {
     [ApiKeyFact("GCP_VERTEX_PROJECT_ID")]

diff --git a/dotnet/test/AutoGen.Gemini.Tests/VertexGeminiClientTests.cs b/dotnet/test/AutoGen.Gemini.Tests/VertexGeminiClientTests.cs
@@ -5,9 +5,11 @@
 using FluentAssertions;
 using Google.Cloud.AIPlatform.V1;
 using Google.Protobuf;
+using Xunit;
 using static Google.Cloud.AIPlatform.V1.Candidate.Types;
 namespace AutoGen.Gemini.Tests;
 
+[Trait("Category", "UnitV1")]
 public class VertexGeminiClientTests
 {
     [ApiKeyFact("GCP_VERTEX_PROJECT_ID")]

diff --git a/dotnet/test/AutoGen.Mistral.Tests/MistralClientAgentTests.cs b/dotnet/test/AutoGen.Mistral.Tests/MistralClientAgentTests.cs
@@ -6,10 +6,12 @@
 using AutoGen.Mistral.Extension;
 using AutoGen.Tests;
 using FluentAssertions;
+using Xunit;
 using Xunit.Abstractions;
 
 namespace AutoGen.Mistral.Tests;
 
+[Trait("Category", "UnitV1")]
 public partial class MistralClientAgentTests
 {
     private ITestOutputHelper _output;

diff --git a/dotnet/test/AutoGen.Mistral.Tests/MistralClientTests.cs b/dotnet/test/AutoGen.Mistral.Tests/MistralClientTests.cs
@@ -7,9 +7,11 @@
 using AutoGen.Mistral.Extension;
 using AutoGen.Tests;
 using FluentAssertions;
+using Xunit;
 
 namespace AutoGen.Mistral.Tests;
 
+[Trait("Category", "UnitV1")]
 public partial class MistralClientTests
 {
     [Function]

diff --git a/dotnet/test/AutoGen.Ollama.Tests/OllamaAgentTests.cs b/dotnet/test/AutoGen.Ollama.Tests/OllamaAgentTests.cs
@@ -6,9 +6,11 @@
 using AutoGen.Ollama.Extension;
 using AutoGen.Tests;
 using FluentAssertions;
+using Xunit;
 
 namespace AutoGen.Ollama.Tests;
 
+[Trait("Category", "UnitV1")]
 public class OllamaAgentTests
 {
     [ApiKeyFact("OLLAMA_HOST", "OLLAMA_MODEL_NAME")]

diff --git a/dotnet/test/AutoGen.Ollama.Tests/OllamaMessageTests.cs b/dotnet/test/AutoGen.Ollama.Tests/OllamaMessageTests.cs
@@ -7,6 +7,7 @@
 using Xunit;
 namespace AutoGen.Ollama.Tests;
 
+[Trait("Category", "UnitV1")]
 public class OllamaMessageTests
 {
     [Fact]

diff --git a/dotnet/test/AutoGen.Ollama.Tests/OllamaTextEmbeddingServiceTests.cs b/dotnet/test/AutoGen.Ollama.Tests/OllamaTextEmbeddingServiceTests.cs
@@ -3,9 +3,11 @@
 
 using AutoGen.Tests;
 using FluentAssertions;
+using Xunit;
 
 namespace AutoGen.Ollama.Tests;
 
+[Trait("Category", "UnitV1")]
 public class OllamaTextEmbeddingServiceTests
 {
     [ApiKeyFact("OLLAMA_HOST", "OLLAMA_EMBEDDING_MODEL_NAME")]

diff --git a/dotnet/test/AutoGen.OpenAI.Tests/MathClassTest.cs b/dotnet/test/AutoGen.OpenAI.Tests/MathClassTest.cs
@@ -12,10 +12,12 @@
 using Azure.AI.OpenAI;
 using FluentAssertions;
 using OpenAI;
+using Xunit;
 using Xunit.Abstractions;
 
 namespace AutoGen.OpenAI.Tests;
 
+[Trait("Category", "UnitV1")]
 public partial class MathClassTest
 {
     private readonly ITestOutputHelper _output;

diff --git a/dotnet/test/AutoGen.OpenAI.Tests/OpenAIChatAgentTest.cs b/dotnet/test/AutoGen.OpenAI.Tests/OpenAIChatAgentTest.cs
@@ -12,9 +12,11 @@
 using FluentAssertions;
 using OpenAI;
 using OpenAI.Chat;
+using Xunit;
 
 namespace AutoGen.OpenAI.Tests;
 
+[Trait("Category", "UnitV1")]
 public partial class OpenAIChatAgentTest
 {
     /// <summary>

diff --git a/dotnet/test/AutoGen.OpenAI.Tests/OpenAIMessageTests.cs b/dotnet/test/AutoGen.OpenAI.Tests/OpenAIMessageTests.cs
@@ -17,6 +17,7 @@
 
 namespace AutoGen.OpenAI.Tests;
 
+[Trait("Category", "UnitV1")]
 public class OpenAIMessageTests
 {
     private readonly JsonSerializerOptions jsonSerializerOptions = new JsonSerializerOptions

diff --git a/dotnet/test/AutoGen.OpenAI.Tests/OpenAISampleTest.cs b/dotnet/test/AutoGen.OpenAI.Tests/OpenAISampleTest.cs
@@ -6,10 +6,12 @@
 using System.Threading.Tasks;
 using AutoGen.OpenAI.Sample;
 using AutoGen.Tests;
+using Xunit;
 using Xunit.Abstractions;
 
 namespace AutoGen.OpenAI.Tests;
 
+[Trait("Category", "UnitV1")]
 public class OpenAISampleTest
 {
     private readonly ITestOutputHelper _output;

diff --git a/dotnet/test/AutoGen.OpenAI.Tests/RolePlayToolCallOrchestratorTests.cs b/dotnet/test/AutoGen.OpenAI.Tests/RolePlayToolCallOrchestratorTests.cs
@@ -15,6 +15,7 @@
 
 namespace AutoGen.OpenAI.Tests;
 
+[Trait("Category", "UnitV1")]
 public class RolePlayToolCallOrchestratorTests
 {
     [Fact]

diff --git a/dotnet/test/AutoGen.OpenAI.V1.Tests/GPTAgentTest.cs b/dotnet/test/AutoGen.OpenAI.V1.Tests/GPTAgentTest.cs
@@ -10,10 +10,12 @@
 using AutoGen.Tests;
 using Azure.AI.OpenAI;
 using FluentAssertions;
+using Xunit;
 using Xunit.Abstractions;
 
 namespace AutoGen.OpenAI.V1.Tests;
 
+[Trait("Category", "UnitV1")]
 public partial class GPTAgentTest
 {
     private ITestOutputHelper _output;

diff --git a/dotnet/test/AutoGen.OpenAI.V1.Tests/MathClassTest.cs b/dotnet/test/AutoGen.OpenAI.V1.Tests/MathClassTest.cs
@@ -11,10 +11,12 @@
 using AutoGen.Tests;
 using Azure.AI.OpenAI;
 using FluentAssertions;
+using Xunit;
 using Xunit.Abstractions;
 
 namespace AutoGen.OpenAI.V1.Tests;
 
+[Trait("Category", "UnitV1")]
 public partial class MathClassTest
 {
     private readonly ITestOutputHelper _output;

diff --git a/dotnet/test/AutoGen.OpenAI.V1.Tests/OpenAIChatAgentTest.cs b/dotnet/test/AutoGen.OpenAI.V1.Tests/OpenAIChatAgentTest.cs
@@ -9,9 +9,11 @@
 using AutoGen.Tests;
 using Azure.AI.OpenAI;
 using FluentAssertions;
+using Xunit;
 
 namespace AutoGen.OpenAI.V1.Tests;
 
+[Trait("Category", "UnitV1")]
 public partial class OpenAIChatAgentTest
 {
     /// <summary>

diff --git a/dotnet/test/AutoGen.OpenAI.V1.Tests/OpenAIMessageTests.cs b/dotnet/test/AutoGen.OpenAI.V1.Tests/OpenAIMessageTests.cs
@@ -17,6 +17,7 @@
 
 namespace AutoGen.OpenAI.V1.Tests;
 
+[Trait("Category", "UnitV1")]
 public class OpenAIMessageTests
 {
     private readonly JsonSerializerOptions jsonSerializerOptions = new JsonSerializerOptions

diff --git a/dotnet/test/AutoGen.SemanticKernel.Tests/KernelFunctionExtensionTests.cs b/dotnet/test/AutoGen.SemanticKernel.Tests/KernelFunctionExtensionTests.cs
@@ -13,6 +13,7 @@
 
 namespace AutoGen.SemanticKernel.Tests;
 
+[Trait("Category", "UnitV1")]
 public class TestPlugin
 {
     public bool IsOn { get; set; }

diff --git a/dotnet/test/AutoGen.SemanticKernel.Tests/KernelFunctionMiddlewareTests.cs b/dotnet/test/AutoGen.SemanticKernel.Tests/KernelFunctionMiddlewareTests.cs
@@ -9,9 +9,11 @@
 using Azure.AI.OpenAI;
 using FluentAssertions;
 using Microsoft.SemanticKernel;
+using Xunit;
 
 namespace AutoGen.SemanticKernel.Tests;
 
+[Trait("Category", "UnitV1")]
 public class KernelFunctionMiddlewareTests
 {
     [ApiKeyFact("AZURE_OPENAI_API_KEY", "AZURE_OPENAI_ENDPOINT", "AZURE_OPENAI_DEPLOY_NAME")]

diff --git a/dotnet/test/AutoGen.SemanticKernel.Tests/SemanticKernelAgentTest.cs b/dotnet/test/AutoGen.SemanticKernel.Tests/SemanticKernelAgentTest.cs
@@ -9,9 +9,11 @@
 using Microsoft.SemanticKernel.Agents;
 using Microsoft.SemanticKernel.ChatCompletion;
 using Microsoft.SemanticKernel.Connectors.OpenAI;
+using Xunit;
 
 namespace AutoGen.SemanticKernel.Tests;
 
+[Trait("Category", "UnitV1")]
 public partial class SemanticKernelAgentTest
 {
     /// <summary>

diff --git a/dotnet/test/AutoGen.SourceGenerator.Tests/FunctionCallTemplateEncodingTests.cs b/dotnet/test/AutoGen.SourceGenerator.Tests/FunctionCallTemplateEncodingTests.cs
@@ -6,6 +6,7 @@
 
 namespace AutoGen.SourceGenerator.Tests;
 
+[Trait("Category", "UnitV1")]
 public class FunctionCallTemplateEncodingTests
 {
     [Fact]

diff --git a/dotnet/test/AutoGen.SourceGenerator.Tests/FunctionCallTemplateTests.cs b/dotnet/test/AutoGen.SourceGenerator.Tests/FunctionCallTemplateTests.cs
@@ -9,6 +9,7 @@
 
 namespace AutoGen.SourceGenerator.Tests;
 
+[Trait("Category", "UnitV1")]
 public class FunctionCallTemplateTests
 {
     [Fact]

diff --git a/dotnet/test/AutoGen.SourceGenerator.Tests/FunctionExample.test.cs b/dotnet/test/AutoGen.SourceGenerator.Tests/FunctionExample.test.cs
@@ -12,6 +12,7 @@
 
 namespace AutoGen.SourceGenerator.Tests;
 
+[Trait("Category", "UnitV1")]
 public class FunctionExample
 {
     private readonly FunctionExamples functionExamples = new FunctionExamples();

diff --git a/dotnet/test/AutoGen.Tests/BasicSampleTest.cs b/dotnet/test/AutoGen.Tests/BasicSampleTest.cs
@@ -5,10 +5,12 @@
 using System.IO;
 using System.Threading.Tasks;
 using AutoGen.Basic.Sample;
+using Xunit;
 using Xunit.Abstractions;
 
 namespace AutoGen.Tests;
 
+[Trait("Category", "UnitV1")]
 public class BasicSampleTest
 {
     private readonly ITestOutputHelper _output;

diff --git a/dotnet/test/AutoGen.Tests/Function/FunctionTests.cs b/dotnet/test/AutoGen.Tests/Function/FunctionTests.cs
@@ -16,6 +16,8 @@
 using Xunit;
 
 namespace AutoGen.Tests.Function;
+
+[Trait("Category", "UnitV1")]
 public class FunctionTests
 {
     private readonly JsonSerializerOptions _jsonSerializerOptions = new() { WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull };

diff --git a/dotnet/test/AutoGen.Tests/GroupChat/GraphTests.cs b/dotnet/test/AutoGen.Tests/GroupChat/GraphTests.cs
@@ -5,6 +5,7 @@
 
 namespace AutoGen.Tests;
 
+[Trait("Category", "UnitV1")]
 public class GraphTests
 {
     [Fact]
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,7 @@ @@
     namespace AutoGen.AzureAIInference.Tests;
+    [Trait("Category", "UnitV1")]
     public class ChatRequestMessageTests
     {
         [Fact]
@@ Expand Down @@