agent/agent-framework
2
0
Fork 0
mirror of https://github.com/microsoft/agent-framework.git synced 2026-06-16 21:04:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

.NET: Fixes for agent abstractions to improve MEAI static analysis compliance (#498)

Browse Source 
* Fixes for agent abstractions to improve MEAI static analysis compliance

* Fix build error
This commit is contained in:
westey
2025-08-28 10:59:23 +00:00
committed by GitHub
parent 802c8e6238
commit 6b22b6bbc7
13 changed files with 120 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentTests.cs → dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AIAgentTests.cs
+26 -19
View File
@@ -13,24 +13,24 @@ namespace Microsoft.Extensions.AI.Agents.Abstractions.UnitTests;
/// <summary>
/// Unit tests for the <see cref="AIAgent"/> class.
/// </summary>
public class AgentTests
public class AIAgentTests
{
private readonly Mock<AIAgent> _agentMock;
private readonly Mock<AgentThread> _agentThreadMock;
private readonly AgentRunResponse _invokeResponse = new();
private readonly AgentRunResponse _invokeResponse;
private readonly List<AgentRunResponseUpdate> _invokeStreamingResponses = [];
/// <summary>
/// Initializes a new instance of the <see cref="AgentTests"/> class.
/// Initializes a new instance of the <see cref="AIAgentTests"/> class.
/// </summary>
public AgentTests()
public AIAgentTests()
{
this._agentThreadMock = new Mock<AgentThread>(MockBehavior.Strict);
this._invokeResponse = new AgentRunResponse(new ChatMessage(ChatRole.Assistant, "Hi"));
this._invokeStreamingResponses.Add(new AgentRunResponseUpdate(ChatRole.Assistant, "Hi"));
this._agentMock = new Mock<AIAgent>() { CallBase = true };
this._agentMock = new Mock<AIAgent> { CallBase = true };
this._agentMock
.Setup(x => x.RunAsync(
It.IsAny<IReadOnlyCollection<ChatMessage>>(),
@@ -56,7 +56,7 @@ public class AgentTests
{
// Arrange
var options = new AgentRunOptions();
var cancellationToken = new CancellationToken();
var cancellationToken = default(CancellationToken);
// Act
var response = await this._agentMock.Object.RunAsync(this._agentThreadMock.Object, options, cancellationToken);
@@ -82,7 +82,7 @@ public class AgentTests
// Arrange
var message = "Hello, Agent!";
var options = new AgentRunOptions();
var cancellationToken = new CancellationToken();
var cancellationToken = default(CancellationToken);
// Act
var response = await this._agentMock.Object.RunAsync(message, this._agentThreadMock.Object, options, cancellationToken);
@@ -108,7 +108,7 @@ public class AgentTests
// Arrange
var message = new ChatMessage(ChatRole.User, "Hello, Agent!");
var options = new AgentRunOptions();
var cancellationToken = new CancellationToken();
var cancellationToken = default(CancellationToken);
// Act
var response = await this._agentMock.Object.RunAsync(message, this._agentThreadMock.Object, options, cancellationToken);
@@ -133,7 +133,7 @@ public class AgentTests
{
// Arrange
var options = new AgentRunOptions();
var cancellationToken = new CancellationToken();
var cancellationToken = default(CancellationToken);
// Act
await foreach (var response in this._agentMock.Object.RunStreamingAsync(this._agentThreadMock.Object, options, cancellationToken))
@@ -162,7 +162,7 @@ public class AgentTests
// Arrange
var message = "Hello, Agent!";
var options = new AgentRunOptions();
var cancellationToken = new CancellationToken();
var cancellationToken = default(CancellationToken);
// Act
await foreach (var response in this._agentMock.Object.RunStreamingAsync(message, this._agentThreadMock.Object, options, cancellationToken))
@@ -191,7 +191,7 @@ public class AgentTests
// Arrange
var message = new ChatMessage(ChatRole.User, "Hello, Agent!");
var options = new AgentRunOptions();
var cancellationToken = new CancellationToken();
var cancellationToken = default(CancellationToken);
// Act
await foreach (var response in this._agentMock.Object.RunStreamingAsync(message, this._agentThreadMock.Object, options, cancellationToken))
@@ -223,16 +223,15 @@ public class AgentTests
[Fact]
public async Task NotifyThreadOfNewMessagesNotifiesThreadAsync()
{
var cancellationToken = new CancellationToken();
var cancellationToken = default(CancellationToken);
var messages = new[] { new ChatMessage(ChatRole.User, "msg1"), new ChatMessage(ChatRole.User, "msg2") };
var threadMock = new Mock<TestAgentThread>() { CallBase = true };
var threadMock = new Mock<TestAgentThread> { CallBase = true };
threadMock.SetupAllProperties();
threadMock.Object.ConversationId = "test-thread-id";
var agent = new MockAgent();
await agent.NotifyThreadOfNewMessagesAsync(threadMock.Object, messages, cancellationToken);
await MockAgent.NotifyThreadOfNewMessagesAsync(threadMock.Object, messages, cancellationToken);
threadMock.Protected().Verify("OnNewMessagesAsync", Times.Once(), messages, cancellationToken);
}
@@ -360,17 +359,25 @@ public class AgentTests
private sealed class MockAgent : AIAgent
{
public new Task NotifyThreadOfNewMessagesAsync(AgentThread thread, IReadOnlyCollection<ChatMessage> messages, CancellationToken cancellationToken)
public static new Task NotifyThreadOfNewMessagesAsync(AgentThread thread, IReadOnlyCollection<ChatMessage> messages, CancellationToken cancellationToken)
{
return base.NotifyThreadOfNewMessagesAsync(thread, messages, cancellationToken);
return AIAgent.NotifyThreadOfNewMessagesAsync(thread, messages, cancellationToken);
}
public override Task<AgentRunResponse> RunAsync(IReadOnlyCollection<ChatMessage> messages, AgentThread? thread = null, AgentRunOptions? options = null, CancellationToken cancellationToken = default)
public override Task<AgentRunResponse> RunAsync(
IReadOnlyCollection<ChatMessage> messages,
AgentThread? thread = null,
AgentRunOptions? options = null,
CancellationToken cancellationToken = default)
{
throw new System.NotImplementedException();
}
public override IAsyncEnumerable<AgentRunResponseUpdate> RunStreamingAsync(IReadOnlyCollection<ChatMessage> messages, AgentThread? thread = null, AgentRunOptions? options = null, CancellationToken cancellationToken = default)
public override IAsyncEnumerable<AgentRunResponseUpdate> RunStreamingAsync(
IReadOnlyCollection<ChatMessage> messages,
AgentThread? thread = null,
AgentRunOptions? options = null,
CancellationToken cancellationToken = default)
{
throw new System.NotImplementedException();
}
dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentRunOptionsTests.cs
+1
View File
@@ -17,6 +17,7 @@ public class AgentRunOptionsTests
// Act
var clone = new AgentRunOptions(options);
Assert.NotNull(clone);
}
[Fact]
dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentRunResponseUpdatesTests.cs → dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentRunResponseUpdateTests.cs
View File
dotnet/tests/Microsoft.Extensions.AI.Agents.Abstractions.UnitTests/AgentThreadTests.cs
+10 -4
View File
@@ -59,8 +59,10 @@ public class AgentThreadTests
public void SetConversationIdThrowsWhenMessageStoreIsSet()
{
// Arrange
var thread = new AgentThread();
thread.MessageStore = new InMemoryChatMessageStore();
var thread = new AgentThread
{
MessageStore = new InMemoryChatMessageStore()
};
// Act & Assert
var exception = Assert.Throws<InvalidOperationException>(() => thread.ConversationId = "new-thread-id");
@@ -72,8 +74,10 @@ public class AgentThreadTests
public void SetChatMessageStoreThrowsWhenConversationIdIsSet()
{
// Arrange
var thread = new AgentThread();
thread.ConversationId = "existing-thread-id";
var thread = new AgentThread
{
ConversationId = "existing-thread-id"
};
var store = new InMemoryChatMessageStore();
// Act & Assert
@@ -149,6 +153,8 @@ public class AgentThreadTests
// Act
await thread.OnNewMessagesAsync(messages, CancellationToken.None);
Assert.Equal("thread-123", thread.ConversationId);
Assert.Null(thread.MessageStore);
}
[Fact]