diff --git a/XUnitTestRocketMQ/Cloud/AliyunIssuesTests.cs b/XUnitTestRocketMQ/Cloud/AliyunIssuesTests.cs
index bcfedca..036d5df 100644
--- a/XUnitTestRocketMQ/Cloud/AliyunIssuesTests.cs
+++ b/XUnitTestRocketMQ/Cloud/AliyunIssuesTests.cs
@@ -7,7 +7,7 @@ using NewLife.RocketMQ;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Cloud;
+namespace XUnitTest.Cloud;
/// <summary>
/// 修复Issues调用阿里云版RocketMQ相关问题
diff --git a/XUnitTestRocketMQ/Cloud/AliyunTests.cs b/XUnitTestRocketMQ/Cloud/AliyunTests.cs
index d31a6f3..d378867 100644
--- a/XUnitTestRocketMQ/Cloud/AliyunTests.cs
+++ b/XUnitTestRocketMQ/Cloud/AliyunTests.cs
@@ -9,7 +9,7 @@ using System.Threading;
using System.Threading.Tasks;
using Xunit;
-namespace XUnitTestRocketMQ.Cloud;
+namespace XUnitTest.Cloud;
public class AliyunTests
{
diff --git a/XUnitTestRocketMQ/Cloud/CloudProviderTests.cs b/XUnitTestRocketMQ/Cloud/CloudProviderTests.cs
index e2c699e..5c77136 100644
--- a/XUnitTestRocketMQ/Cloud/CloudProviderTests.cs
+++ b/XUnitTestRocketMQ/Cloud/CloudProviderTests.cs
@@ -3,7 +3,7 @@ using System.ComponentModel;
using NewLife.RocketMQ;
using Xunit;
-namespace XUnitTestRocketMQ.Cloud;
+namespace XUnitTest.Cloud;
/// <summary>云厂商适配器接口测试</summary>
public class CloudProviderTests
diff --git a/XUnitTestRocketMQ/Cloud/SupportApacheAclTest.cs b/XUnitTestRocketMQ/Cloud/SupportApacheAclTest.cs
index e270a33..dd62d3c 100644
--- a/XUnitTestRocketMQ/Cloud/SupportApacheAclTest.cs
+++ b/XUnitTestRocketMQ/Cloud/SupportApacheAclTest.cs
@@ -7,7 +7,7 @@ using NewLife.RocketMQ;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Cloud
+namespace XUnitTest.Cloud
{
public class SupportApacheAclTest
{
diff --git a/XUnitTestRocketMQ/Cluster/BrokerFailoverTests.cs b/XUnitTestRocketMQ/Cluster/BrokerFailoverTests.cs
index d1c4c15..6e33161 100644
--- a/XUnitTestRocketMQ/Cluster/BrokerFailoverTests.cs
+++ b/XUnitTestRocketMQ/Cluster/BrokerFailoverTests.cs
@@ -4,7 +4,7 @@ using System.Linq;
using NewLife.RocketMQ;
using Xunit;
-namespace XUnitTestRocketMQ.Cluster;
+namespace XUnitTest.Cluster;
/// <summary>Broker主从切换测试</summary>
public class BrokerFailoverTests
diff --git a/XUnitTestRocketMQ/Cluster/ManagementTests.cs b/XUnitTestRocketMQ/Cluster/ManagementTests.cs
index 48786db..3604294 100644
--- a/XUnitTestRocketMQ/Cluster/ManagementTests.cs
+++ b/XUnitTestRocketMQ/Cluster/ManagementTests.cs
@@ -1,14 +1,12 @@
using System;
-using System.Collections.Generic;
using System.ComponentModel;
using System.Threading.Tasks;
using NewLife.Log;
using NewLife.RocketMQ;
-using NewLife.RocketMQ.Protocol;
-using XUnitTestRocketMQ.Integration;
using Xunit;
+using XUnitTest.Integration;
-namespace XUnitTestRocketMQ.Cluster;
+namespace XUnitTest.Cluster;
/// <summary>管理功能测试</summary>
public class ManagementTests
diff --git a/XUnitTestRocketMQ/Cluster/NameClientTests.cs b/XUnitTestRocketMQ/Cluster/NameClientTests.cs
index 0c83a7e..b064b7e 100644
--- a/XUnitTestRocketMQ/Cluster/NameClientTests.cs
+++ b/XUnitTestRocketMQ/Cluster/NameClientTests.cs
@@ -7,7 +7,7 @@ using NewLife.RocketMQ;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Cluster;
+namespace XUnitTest.Cluster;
public class NameClientTests
{
diff --git a/XUnitTestRocketMQ/Cluster/QueryMessageTests.cs b/XUnitTestRocketMQ/Cluster/QueryMessageTests.cs
index f48abc8..978f298 100644
--- a/XUnitTestRocketMQ/Cluster/QueryMessageTests.cs
+++ b/XUnitTestRocketMQ/Cluster/QueryMessageTests.cs
@@ -1,10 +1,10 @@
using System;
using System.ComponentModel;
using NewLife.RocketMQ;
-using XUnitTestRocketMQ.Integration;
using Xunit;
+using XUnitTest.Integration;
-namespace XUnitTestRocketMQ.Cluster;
+namespace XUnitTest.Cluster;
/// <summary>按Key查询消息测试</summary>
public class QueryMessageTests
diff --git a/XUnitTestRocketMQ/Cluster/VipChannelTests.cs b/XUnitTestRocketMQ/Cluster/VipChannelTests.cs
index c5ac913..eda957e 100644
--- a/XUnitTestRocketMQ/Cluster/VipChannelTests.cs
+++ b/XUnitTestRocketMQ/Cluster/VipChannelTests.cs
@@ -4,7 +4,7 @@ using NewLife.RocketMQ;
using NewLife.RocketMQ.Client;
using Xunit;
-namespace XUnitTestRocketMQ.Cluster;
+namespace XUnitTest.Cluster;
/// <summary>VIP通道测试</summary>
public class VipChannelTests
diff --git a/XUnitTestRocketMQ/Cluster/WeightRoundRobinTests.cs b/XUnitTestRocketMQ/Cluster/WeightRoundRobinTests.cs
index 25cfcc8..3ebf6eb 100644
--- a/XUnitTestRocketMQ/Cluster/WeightRoundRobinTests.cs
+++ b/XUnitTestRocketMQ/Cluster/WeightRoundRobinTests.cs
@@ -3,7 +3,7 @@ using System.ComponentModel;
using NewLife.RocketMQ.Common;
using Xunit;
-namespace XUnitTestRocketMQ.Cluster;
+namespace XUnitTest.Cluster;
/// <summary>带权重负载均衡算法测试</summary>
public class WeightRoundRobinTests
diff --git a/XUnitTestRocketMQ/Consumers/BatchAckTests.cs b/XUnitTestRocketMQ/Consumers/BatchAckTests.cs
index 6f6c97f..392b7d5 100644
--- a/XUnitTestRocketMQ/Consumers/BatchAckTests.cs
+++ b/XUnitTestRocketMQ/Consumers/BatchAckTests.cs
@@ -6,7 +6,7 @@ using NewLife.RocketMQ;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Consumers;
+namespace XUnitTest.Consumers;
/// <summary>批量确认Pop消息测试</summary>
public class BatchAckTests
diff --git a/XUnitTestRocketMQ/Consumers/BroadcastOffsetTests.cs b/XUnitTestRocketMQ/Consumers/BroadcastOffsetTests.cs
index aa15c0b..30b789e 100644
--- a/XUnitTestRocketMQ/Consumers/BroadcastOffsetTests.cs
+++ b/XUnitTestRocketMQ/Consumers/BroadcastOffsetTests.cs
@@ -5,7 +5,7 @@ using NewLife.RocketMQ;
using NewLife.RocketMQ.Models;
using Xunit;
-namespace XUnitTestRocketMQ.Consumers;
+namespace XUnitTest.Consumers;
/// <summary>广播模式本地偏移持久化测试</summary>
public class BroadcastOffsetTests
diff --git a/XUnitTestRocketMQ/Consumers/ConcurrentConsumeTests.cs b/XUnitTestRocketMQ/Consumers/ConcurrentConsumeTests.cs
index 6b9415c..6390bd5 100644
--- a/XUnitTestRocketMQ/Consumers/ConcurrentConsumeTests.cs
+++ b/XUnitTestRocketMQ/Consumers/ConcurrentConsumeTests.cs
@@ -3,7 +3,7 @@ using System.ComponentModel;
using NewLife.RocketMQ;
using Xunit;
-namespace XUnitTestRocketMQ.Consumers;
+namespace XUnitTest.Consumers;
/// <summary>消费限流测试</summary>
public class ConcurrentConsumeTests
diff --git a/XUnitTestRocketMQ/Consumers/ConsumeMessageHookTests.cs b/XUnitTestRocketMQ/Consumers/ConsumeMessageHookTests.cs
index eddcd88..0b6fa29 100644
--- a/XUnitTestRocketMQ/Consumers/ConsumeMessageHookTests.cs
+++ b/XUnitTestRocketMQ/Consumers/ConsumeMessageHookTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Generic;
using System.ComponentModel;
using Moq;
@@ -7,7 +7,7 @@ using NewLife.RocketMQ.MessageTrace;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Consumers;
+namespace XUnitTest.Consumers;
/// <summary>IConsumeMessageHook 钩子机制单元测试</summary>
public class ConsumeMessageHookTests
diff --git a/XUnitTestRocketMQ/Consumers/ConsumerTests.cs b/XUnitTestRocketMQ/Consumers/ConsumerTests.cs
index ffb4d09..1de0331 100644
--- a/XUnitTestRocketMQ/Consumers/ConsumerTests.cs
+++ b/XUnitTestRocketMQ/Consumers/ConsumerTests.cs
@@ -1,14 +1,14 @@
-using NewLife;
+using System;
+using System.Linq;
+using System.Threading;
+using NewLife;
using NewLife.Log;
using NewLife.RocketMQ;
using NewLife.RocketMQ.Protocol;
-using System;
-using System.Linq;
-using System.Threading;
-using XUnitTestRocketMQ.Integration;
using Xunit;
+using XUnitTest.Integration;
-namespace XUnitTestRocketMQ.Consumers;
+namespace XUnitTest.Consumers;
public class ConsumerTests
{
diff --git a/XUnitTestRocketMQ/Consumers/ConsumeStatsTests.cs b/XUnitTestRocketMQ/Consumers/ConsumeStatsTests.cs
index 272fde1..a946e95 100644
--- a/XUnitTestRocketMQ/Consumers/ConsumeStatsTests.cs
+++ b/XUnitTestRocketMQ/Consumers/ConsumeStatsTests.cs
@@ -3,10 +3,10 @@ using System.ComponentModel;
using NewLife.Log;
using NewLife.RocketMQ;
using NewLife.RocketMQ.Protocol;
-using XUnitTestRocketMQ.Integration;
using Xunit;
+using XUnitTest.Integration;
-namespace XUnitTestRocketMQ.Consumers;
+namespace XUnitTest.Consumers;
/// <summary>消费统计和过滤服务器测试</summary>
public class ConsumeStatsTests
diff --git a/XUnitTestRocketMQ/Consumers/OrderConsumeTests.cs b/XUnitTestRocketMQ/Consumers/OrderConsumeTests.cs
index 6fa95e4..4e531a2 100644
--- a/XUnitTestRocketMQ/Consumers/OrderConsumeTests.cs
+++ b/XUnitTestRocketMQ/Consumers/OrderConsumeTests.cs
@@ -3,7 +3,7 @@ using System.ComponentModel;
using NewLife.RocketMQ;
using Xunit;
-namespace XUnitTestRocketMQ.Consumers;
+namespace XUnitTest.Consumers;
/// <summary>顺序消费锁定测试</summary>
public class OrderConsumeTests
diff --git a/XUnitTestRocketMQ/Consumers/PopConsumeTests.cs b/XUnitTestRocketMQ/Consumers/PopConsumeTests.cs
index a6478c8..deb1514 100644
--- a/XUnitTestRocketMQ/Consumers/PopConsumeTests.cs
+++ b/XUnitTestRocketMQ/Consumers/PopConsumeTests.cs
@@ -4,7 +4,7 @@ using NewLife.RocketMQ;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Consumers;
+namespace XUnitTest.Consumers;
/// <summary>Pop消费模式测试</summary>
public class PopConsumeTests
diff --git a/XUnitTestRocketMQ/Consumers/RetryTests.cs b/XUnitTestRocketMQ/Consumers/RetryTests.cs
index 0f93f70..57137ec 100644
--- a/XUnitTestRocketMQ/Consumers/RetryTests.cs
+++ b/XUnitTestRocketMQ/Consumers/RetryTests.cs
@@ -5,7 +5,7 @@ using NewLife.RocketMQ;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Consumers;
+namespace XUnitTest.Consumers;
/// <summary>消费重试功能测试</summary>
public class RetryTests
diff --git a/XUnitTestRocketMQ/Consumers/SQL92FilterTests.cs b/XUnitTestRocketMQ/Consumers/SQL92FilterTests.cs
index 5790cde..a6b2d7f 100644
--- a/XUnitTestRocketMQ/Consumers/SQL92FilterTests.cs
+++ b/XUnitTestRocketMQ/Consumers/SQL92FilterTests.cs
@@ -4,7 +4,7 @@ using NewLife.RocketMQ;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Consumers;
+namespace XUnitTest.Consumers;
/// <summary>SQL92过滤功能测试</summary>
public class SQL92FilterTests
diff --git a/XUnitTestRocketMQ/Integration/BasicTest.cs b/XUnitTestRocketMQ/Integration/BasicTest.cs
index 75abcca..89b6d35 100644
--- a/XUnitTestRocketMQ/Integration/BasicTest.cs
+++ b/XUnitTestRocketMQ/Integration/BasicTest.cs
@@ -5,7 +5,7 @@ using Xunit;
// 所有测试用例放入一个汇编级集合，除非单独指定Collection特性
[assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly)]
-namespace XUnitTestRocketMQ.Integration;
+namespace XUnitTest.Integration;
[Collection("Basic")]
public class BasicTest
diff --git a/XUnitTestRocketMQ/Integration/RocketMqCollection.cs b/XUnitTestRocketMQ/Integration/RocketMqCollection.cs
index 6cc2ea5..5102a45 100644
--- a/XUnitTestRocketMQ/Integration/RocketMqCollection.cs
+++ b/XUnitTestRocketMQ/Integration/RocketMqCollection.cs
@@ -1,6 +1,6 @@
-using Xunit;
+using Xunit;
-namespace XUnitTestRocketMQ.Integration;
+namespace XUnitTest.Integration;
/// <summary>将所有集成测试放在同一 Collection 中，共享同一个 RocketMqFixture 实例，避免重复建连</summary>
[CollectionDefinition("RocketMQ")]
diff --git a/XUnitTestRocketMQ/Integration/RocketMqFixture.cs b/XUnitTestRocketMQ/Integration/RocketMqFixture.cs
index 0f073b8..b662034 100644
--- a/XUnitTestRocketMQ/Integration/RocketMqFixture.cs
+++ b/XUnitTestRocketMQ/Integration/RocketMqFixture.cs
@@ -1,11 +1,11 @@
-using System;
+using System;
using System.Net.Sockets;
using System.Threading.Tasks;
using Xunit;
#nullable enable
-namespace XUnitTestRocketMQ.Integration;
+namespace XUnitTest.Integration;
/// <summary>RocketMQ 集成测试 Fixture</summary>
/// <remarks>
diff --git a/XUnitTestRocketMQ/Integration/RocketMqIntegrationTests.cs b/XUnitTestRocketMQ/Integration/RocketMqIntegrationTests.cs
index 5a2aca9..d1d9eb1 100644
--- a/XUnitTestRocketMQ/Integration/RocketMqIntegrationTests.cs
+++ b/XUnitTestRocketMQ/Integration/RocketMqIntegrationTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Threading;
@@ -7,32 +7,28 @@ using NewLife.RocketMQ;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Integration;
+namespace XUnitTest.Integration;
/// <summary>Producer 集成测试</summary>
/// <remarks>
/// 需要本机启动 RocketMQ 并设置环境变量 ROCKETMQ_NAMESERVER=127.0.0.1:9876。
/// 启动命令：dotnet run --file scripts/RocketMqSetup.cs
/// </remarks>
+/// <remarks>初始化</remarks>
+/// <param name="fixture">RocketMQ Fixture</param>
[Collection("RocketMQ")]
-public class ProducerIntegrationTests : IClassFixture<RocketMqFixture>
+public class ProducerIntegrationTests(RocketMqFixture fixture) : IClassFixture<RocketMqFixture>
{
- private readonly RocketMqFixture _fixture;
-
- /// <summary>初始化</summary>
- /// <param name="fixture">RocketMQ Fixture</param>
- public ProducerIntegrationTests(RocketMqFixture fixture) => _fixture = fixture;
-
[SkippableFact]
[DisplayName("发送普通消息_返回SendOK")]
public async Task PublishMessage_ReturnsSuccess()
{
- _fixture.SkipIfUnavailable();
+ fixture.SkipIfUnavailable();
using var producer = new Producer
{
Topic = "integration-test-topic",
- NameServerAddress = _fixture.NameServerAddress,
+ NameServerAddress = fixture.NameServerAddress,
};
producer.Start();
@@ -45,12 +41,12 @@ public class ProducerIntegrationTests : IClassFixture<RocketMqFixture>
[DisplayName("发送带属性的消息_属性正常保存")]
public async Task PublishMessageWithProperties_PropertiesPreserved()
{
- _fixture.SkipIfUnavailable();
+ fixture.SkipIfUnavailable();
using var producer = new Producer
{
Topic = "integration-test-topic",
- NameServerAddress = _fixture.NameServerAddress,
+ NameServerAddress = fixture.NameServerAddress,
};
producer.Start();
@@ -70,12 +66,12 @@ public class ProducerIntegrationTests : IClassFixture<RocketMqFixture>
[DisplayName("并发发送多条消息_全部成功")]
public async Task PublishMessagesParallel_AllSucceed()
{
- _fixture.SkipIfUnavailable();
+ fixture.SkipIfUnavailable();
using var producer = new Producer
{
Topic = "integration-test-topic",
- NameServerAddress = _fixture.NameServerAddress,
+ NameServerAddress = fixture.NameServerAddress,
};
producer.Start();
@@ -94,20 +90,16 @@ public class ProducerIntegrationTests : IClassFixture<RocketMqFixture>
}
/// <summary>Consumer 集成测试</summary>
+/// <remarks>初始化</remarks>
+/// <param name="fixture">RocketMQ Fixture</param>
[Collection("RocketMQ")]
-public class ConsumerIntegrationTests : IClassFixture<RocketMqFixture>
+public class ConsumerIntegrationTests(RocketMqFixture fixture) : IClassFixture<RocketMqFixture>
{
- private readonly RocketMqFixture _fixture;
-
- /// <summary>初始化</summary>
- /// <param name="fixture">RocketMQ Fixture</param>
- public ConsumerIntegrationTests(RocketMqFixture fixture) => _fixture = fixture;
-
[SkippableFact]
[DisplayName("先发再消费_能收到消息")]
public async Task ProduceThenConsume_MessageReceived()
{
- _fixture.SkipIfUnavailable();
+ fixture.SkipIfUnavailable();
const String topic = "integration-consume-topic";
const String content = "Hello Consumer";
@@ -115,7 +107,7 @@ public class ConsumerIntegrationTests : IClassFixture<RocketMqFixture>
using var producer = new Producer
{
Topic = topic,
- NameServerAddress = _fixture.NameServerAddress,
+ NameServerAddress = fixture.NameServerAddress,
};
producer.Start();
await producer.PublishAsync(content);
@@ -125,7 +117,7 @@ public class ConsumerIntegrationTests : IClassFixture<RocketMqFixture>
{
Topic = topic,
Group = "integration-consumer-group",
- NameServerAddress = _fixture.NameServerAddress,
+ NameServerAddress = fixture.NameServerAddress,
};
consumer.OnConsume = (queue, msgs) =>
diff --git a/XUnitTestRocketMQ/Models/BrokerInfoTests.cs b/XUnitTestRocketMQ/Models/BrokerInfoTests.cs
index 271655a..584ed66 100644
--- a/XUnitTestRocketMQ/Models/BrokerInfoTests.cs
+++ b/XUnitTestRocketMQ/Models/BrokerInfoTests.cs
@@ -3,7 +3,7 @@ using System.ComponentModel;
using NewLife.RocketMQ;
using Xunit;
-namespace XUnitTestRocketMQ.Models;
+namespace XUnitTest.Models;
/// <summary>BrokerInfo代理信息测试</summary>
public class BrokerInfoTests
diff --git a/XUnitTestRocketMQ/Models/ConsumerStatesModelTests.cs b/XUnitTestRocketMQ/Models/ConsumerStatesModelTests.cs
index a2f2b39..6782edd 100644
--- a/XUnitTestRocketMQ/Models/ConsumerStatesModelTests.cs
+++ b/XUnitTestRocketMQ/Models/ConsumerStatesModelTests.cs
@@ -4,7 +4,7 @@ using System.ComponentModel;
using NewLife.RocketMQ.Protocol.ConsumerStates;
using Xunit;
-namespace XUnitTestRocketMQ.Models;
+namespace XUnitTest.Models;
/// <summary>消费者状态模型测试</summary>
public class ConsumerStatesModelTests
diff --git a/XUnitTestRocketMQ/Models/MessageExtendedTests.cs b/XUnitTestRocketMQ/Models/MessageExtendedTests.cs
index 77c884d..51b3e9d 100644
--- a/XUnitTestRocketMQ/Models/MessageExtendedTests.cs
+++ b/XUnitTestRocketMQ/Models/MessageExtendedTests.cs
@@ -3,7 +3,7 @@ using System.ComponentModel;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Models;
+namespace XUnitTest.Models;
/// <summary>Message扩展属性测试（补充覆盖）</summary>
public class MessageExtendedTests
diff --git a/XUnitTestRocketMQ/Models/MessageId5xTests.cs b/XUnitTestRocketMQ/Models/MessageId5xTests.cs
index 516c882..2131e10 100644
--- a/XUnitTestRocketMQ/Models/MessageId5xTests.cs
+++ b/XUnitTestRocketMQ/Models/MessageId5xTests.cs
@@ -3,7 +3,7 @@ using System.ComponentModel;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Models;
+namespace XUnitTest.Models;
/// <summary>5.x MessageId格式测试</summary>
public class MessageId5xTests
diff --git a/XUnitTestRocketMQ/Models/MessageQueueTests.cs b/XUnitTestRocketMQ/Models/MessageQueueTests.cs
index 202df54..4ca2caf 100644
--- a/XUnitTestRocketMQ/Models/MessageQueueTests.cs
+++ b/XUnitTestRocketMQ/Models/MessageQueueTests.cs
@@ -4,7 +4,7 @@ using System.ComponentModel;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Models;
+namespace XUnitTest.Models;
/// <summary>MessageQueue消息队列标识测试</summary>
public class MessageQueueTests
diff --git a/XUnitTestRocketMQ/Models/MessageTests.cs b/XUnitTestRocketMQ/Models/MessageTests.cs
index 54869c8..e8b2e1b 100644
--- a/XUnitTestRocketMQ/Models/MessageTests.cs
+++ b/XUnitTestRocketMQ/Models/MessageTests.cs
@@ -5,7 +5,7 @@ using NewLife.RocketMQ.Protocol;
using NewLife.Serialization;
using Xunit;
-namespace XUnitTestRocketMQ.Models;
+namespace XUnitTest.Models;
public class MessageTests
{
diff --git a/XUnitTestRocketMQ/Models/ModelTests.cs b/XUnitTestRocketMQ/Models/ModelTests.cs
index 172bd6e..117dead 100644
--- a/XUnitTestRocketMQ/Models/ModelTests.cs
+++ b/XUnitTestRocketMQ/Models/ModelTests.cs
@@ -4,7 +4,7 @@ using NewLife.RocketMQ.Models;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Models;
+namespace XUnitTest.Models;
/// <summary>模型和枚举测试</summary>
public class ModelTests
diff --git a/XUnitTestRocketMQ/Models/MqBasePropertyTests.cs b/XUnitTestRocketMQ/Models/MqBasePropertyTests.cs
index 1ee9203..f091945 100644
--- a/XUnitTestRocketMQ/Models/MqBasePropertyTests.cs
+++ b/XUnitTestRocketMQ/Models/MqBasePropertyTests.cs
@@ -5,7 +5,7 @@ using NewLife.RocketMQ.Client;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Models;
+namespace XUnitTest.Models;
/// <summary>MqBase基类属性测试</summary>
public class MqBasePropertyTests
diff --git a/XUnitTestRocketMQ/Models/MqSettingTests.cs b/XUnitTestRocketMQ/Models/MqSettingTests.cs
index 35a1e3e..1574730 100644
--- a/XUnitTestRocketMQ/Models/MqSettingTests.cs
+++ b/XUnitTestRocketMQ/Models/MqSettingTests.cs
@@ -3,7 +3,7 @@ using System.ComponentModel;
using NewLife.RocketMQ;
using Xunit;
-namespace XUnitTestRocketMQ.Models;
+namespace XUnitTest.Models;
/// <summary>MqSetting配置测试</summary>
public class MqSettingTests
diff --git a/XUnitTestRocketMQ/Models/MQVersionTests.cs b/XUnitTestRocketMQ/Models/MQVersionTests.cs
index b07d15c..5d7e883 100644
--- a/XUnitTestRocketMQ/Models/MQVersionTests.cs
+++ b/XUnitTestRocketMQ/Models/MQVersionTests.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Models;
+namespace XUnitTest.Models;
public class MQVersionTests
{
diff --git a/XUnitTestRocketMQ/Models/MQVersionUpdateTests.cs b/XUnitTestRocketMQ/Models/MQVersionUpdateTests.cs
index 6ae9592..8426817 100644
--- a/XUnitTestRocketMQ/Models/MQVersionUpdateTests.cs
+++ b/XUnitTestRocketMQ/Models/MQVersionUpdateTests.cs
@@ -4,7 +4,7 @@ using NewLife.RocketMQ;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Models;
+namespace XUnitTest.Models;
/// <summary>MQVersion相关测试</summary>
public class MQVersionUpdateTests
diff --git a/XUnitTestRocketMQ/Models/PullResultTests.cs b/XUnitTestRocketMQ/Models/PullResultTests.cs
index db95420..0ccfd19 100644
--- a/XUnitTestRocketMQ/Models/PullResultTests.cs
+++ b/XUnitTestRocketMQ/Models/PullResultTests.cs
@@ -4,7 +4,7 @@ using System.ComponentModel;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Models;
+namespace XUnitTest.Models;
/// <summary>PullResult拉取结果测试</summary>
public class PullResultTests
diff --git a/XUnitTestRocketMQ/Models/SendResultTests.cs b/XUnitTestRocketMQ/Models/SendResultTests.cs
index 91de3fb..c8483a3 100644
--- a/XUnitTestRocketMQ/Models/SendResultTests.cs
+++ b/XUnitTestRocketMQ/Models/SendResultTests.cs
@@ -4,7 +4,7 @@ using System.ComponentModel;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Models;
+namespace XUnitTest.Models;
/// <summary>SendResult发送结果测试</summary>
public class SendResultTests
diff --git a/XUnitTestRocketMQ/Producers/BatchMessageTests.cs b/XUnitTestRocketMQ/Producers/BatchMessageTests.cs
index 005ba15..930ccf9 100644
--- a/XUnitTestRocketMQ/Producers/BatchMessageTests.cs
+++ b/XUnitTestRocketMQ/Producers/BatchMessageTests.cs
@@ -7,10 +7,10 @@ using NewLife;
using NewLife.Data;
using NewLife.RocketMQ;
using NewLife.RocketMQ.Protocol;
-using XUnitTestRocketMQ.Integration;
using Xunit;
+using XUnitTest.Integration;
-namespace XUnitTestRocketMQ.Producers;
+namespace XUnitTest.Producers;
/// <summary>批量消息发送测试</summary>
[Collection("Basic")]
diff --git a/XUnitTestRocketMQ/Producers/CompressionTests.cs b/XUnitTestRocketMQ/Producers/CompressionTests.cs
index 3b300ab..af76760 100644
--- a/XUnitTestRocketMQ/Producers/CompressionTests.cs
+++ b/XUnitTestRocketMQ/Producers/CompressionTests.cs
@@ -4,7 +4,7 @@ using NewLife.RocketMQ;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Producers;
+namespace XUnitTest.Producers;
/// <summary>消息压缩功能测试</summary>
public class CompressionTests
diff --git a/XUnitTestRocketMQ/Producers/MultiTopicTests.cs b/XUnitTestRocketMQ/Producers/MultiTopicTests.cs
index a4f6834..229cfa6 100644
--- a/XUnitTestRocketMQ/Producers/MultiTopicTests.cs
+++ b/XUnitTestRocketMQ/Producers/MultiTopicTests.cs
@@ -5,7 +5,7 @@ using NewLife.RocketMQ;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Producers;
+namespace XUnitTest.Producers;
/// <summary>多Topic订阅测试</summary>
public class MultiTopicTests
diff --git a/XUnitTestRocketMQ/Producers/ProducerTests.cs b/XUnitTestRocketMQ/Producers/ProducerTests.cs
index f5d5f57..d4d7da8 100644
--- a/XUnitTestRocketMQ/Producers/ProducerTests.cs
+++ b/XUnitTestRocketMQ/Producers/ProducerTests.cs
@@ -1,12 +1,9 @@
-using Moq;
-using NewLife;
-using NewLife.Data;
-using NewLife.Log;
+using NewLife.Log;
using NewLife.RocketMQ;
-using XUnitTestRocketMQ.Integration;
using Xunit;
+using XUnitTest.Integration;
-namespace XUnitTestRocketMQ.Producers;
+namespace XUnitTest.Producers;
public class ProducerTests
{
diff --git a/XUnitTestRocketMQ/Producers/ProducerTracerTests.cs b/XUnitTestRocketMQ/Producers/ProducerTracerTests.cs
index 8f05077..af78eae 100644
--- a/XUnitTestRocketMQ/Producers/ProducerTracerTests.cs
+++ b/XUnitTestRocketMQ/Producers/ProducerTracerTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Threading;
using NewLife;
using NewLife.Log;
@@ -6,7 +6,7 @@ using NewLife.RocketMQ;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Producers
+namespace XUnitTest.Producers
{
public class ProducerTracerTests
{
diff --git a/XUnitTestRocketMQ/Producers/RequestReplyTests.cs b/XUnitTestRocketMQ/Producers/RequestReplyTests.cs
index b3923a3..3930be0 100644
--- a/XUnitTestRocketMQ/Producers/RequestReplyTests.cs
+++ b/XUnitTestRocketMQ/Producers/RequestReplyTests.cs
@@ -1,13 +1,12 @@
-using System;
+using System;
using System.Threading.Tasks;
-using NewLife;
using NewLife.Log;
using NewLife.RocketMQ;
using NewLife.RocketMQ.Protocol;
-using XUnitTestRocketMQ.Integration;
using Xunit;
+using XUnitTest.Integration;
-namespace XUnitTestRocketMQ.Producers;
+namespace XUnitTest.Producers;
/// <summary>Request-Reply 特性测试</summary>
public class RequestReplyTests
diff --git a/XUnitTestRocketMQ/Producers/SendMessageHookTests.cs b/XUnitTestRocketMQ/Producers/SendMessageHookTests.cs
index 0e2cdec..8736710 100644
--- a/XUnitTestRocketMQ/Producers/SendMessageHookTests.cs
+++ b/XUnitTestRocketMQ/Producers/SendMessageHookTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Generic;
using System.ComponentModel;
using Moq;
@@ -7,7 +7,7 @@ using NewLife.RocketMQ.MessageTrace;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Producers;
+namespace XUnitTest.Producers;
/// <summary>ISendMessageHook 钩子机制单元测试</summary>
public class SendMessageHookTests
diff --git a/XUnitTestRocketMQ/Producers/SendReplyMessageTests.cs b/XUnitTestRocketMQ/Producers/SendReplyMessageTests.cs
index c627a10..c05e629 100644
--- a/XUnitTestRocketMQ/Producers/SendReplyMessageTests.cs
+++ b/XUnitTestRocketMQ/Producers/SendReplyMessageTests.cs
@@ -1,11 +1,11 @@
-using System;
+using System;
using System.ComponentModel;
using System.Threading.Tasks;
using NewLife.RocketMQ;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Producers;
+namespace XUnitTest.Producers;
/// <summary>Consumer.SendReply / SendReplyAsync 消息构建与参数校验测试</summary>
public class SendReplyMessageTests
diff --git a/XUnitTestRocketMQ/Producers/TransactionCheckTests.cs b/XUnitTestRocketMQ/Producers/TransactionCheckTests.cs
index 420695e..bd0c1e1 100644
--- a/XUnitTestRocketMQ/Producers/TransactionCheckTests.cs
+++ b/XUnitTestRocketMQ/Producers/TransactionCheckTests.cs
@@ -5,7 +5,7 @@ using NewLife.RocketMQ;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Producers;
+namespace XUnitTest.Producers;
/// <summary>事务回查功能测试</summary>
public class TransactionCheckTests
diff --git a/XUnitTestRocketMQ/Protocol/CommandTests.cs b/XUnitTestRocketMQ/Protocol/CommandTests.cs
index cdcfe6d..c0c7bcf 100644
--- a/XUnitTestRocketMQ/Protocol/CommandTests.cs
+++ b/XUnitTestRocketMQ/Protocol/CommandTests.cs
@@ -8,7 +8,7 @@ using NewLife.RocketMQ.Protocol;
using NewLife.Serialization;
using Xunit;
-namespace XUnitTestRocketMQ.Protocol;
+namespace XUnitTest.Protocol;
public class CommandTests
{
diff --git a/XUnitTestRocketMQ/Protocol/HeaderTests.cs b/XUnitTestRocketMQ/Protocol/HeaderTests.cs
index 415bda6..87ec3cb 100644
--- a/XUnitTestRocketMQ/Protocol/HeaderTests.cs
+++ b/XUnitTestRocketMQ/Protocol/HeaderTests.cs
@@ -4,7 +4,7 @@ using System.ComponentModel;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Protocol;
+namespace XUnitTest.Protocol;
/// <summary>Header协议头测试</summary>
public class HeaderTests
diff --git a/XUnitTestRocketMQ/Protocol/IPv6Tests.cs b/XUnitTestRocketMQ/Protocol/IPv6Tests.cs
index c5b2b7d..ddf7987 100644
--- a/XUnitTestRocketMQ/Protocol/IPv6Tests.cs
+++ b/XUnitTestRocketMQ/Protocol/IPv6Tests.cs
@@ -6,7 +6,7 @@ using NewLife.Data;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Protocol;
+namespace XUnitTest.Protocol;
/// <summary>IPv6消息解码测试</summary>
public class IPv6Tests
diff --git a/XUnitTestRocketMQ/Protocol/ProtocolDataTests.cs b/XUnitTestRocketMQ/Protocol/ProtocolDataTests.cs
index defccc7..d0905f0 100644
--- a/XUnitTestRocketMQ/Protocol/ProtocolDataTests.cs
+++ b/XUnitTestRocketMQ/Protocol/ProtocolDataTests.cs
@@ -3,7 +3,7 @@ using System.ComponentModel;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Protocol;
+namespace XUnitTest.Protocol;
/// <summary>协议数据结构测试</summary>
public class ProtocolDataTests
diff --git a/XUnitTestRocketMQ/Protocol/ProtoTests.cs b/XUnitTestRocketMQ/Protocol/ProtoTests.cs
index f033c2c..4fa7828 100644
--- a/XUnitTestRocketMQ/Protocol/ProtoTests.cs
+++ b/XUnitTestRocketMQ/Protocol/ProtoTests.cs
@@ -5,7 +5,7 @@ using NewLife.Buffers;
using NewLife.RocketMQ.Grpc;
using Xunit;
-namespace XUnitTestRocketMQ.Protocol;
+namespace XUnitTest.Protocol;
/// <summary>Protobuf编解码器测试</summary>
public class ProtoTests
diff --git a/XUnitTestRocketMQ/Protocol/RequestHeaderTests.cs b/XUnitTestRocketMQ/Protocol/RequestHeaderTests.cs
index 7081ffe..2719ca0 100644
--- a/XUnitTestRocketMQ/Protocol/RequestHeaderTests.cs
+++ b/XUnitTestRocketMQ/Protocol/RequestHeaderTests.cs
@@ -4,7 +4,7 @@ using System.Linq;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Protocol;
+namespace XUnitTest.Protocol;
/// <summary>请求头GetProperties方法测试</summary>
public class RequestHeaderTests
diff --git a/XUnitTestRocketMQ/Protocol/ResponseExceptionTests.cs b/XUnitTestRocketMQ/Protocol/ResponseExceptionTests.cs
index 2fa0961..6dbea5c 100644
--- a/XUnitTestRocketMQ/Protocol/ResponseExceptionTests.cs
+++ b/XUnitTestRocketMQ/Protocol/ResponseExceptionTests.cs
@@ -3,7 +3,7 @@ using System.ComponentModel;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Protocol;
+namespace XUnitTest.Protocol;
/// <summary>ResponseException响应异常测试</summary>
public class ResponseExceptionTests
diff --git a/XUnitTestRocketMQ/Protocol/SpanRefactorTests.cs b/XUnitTestRocketMQ/Protocol/SpanRefactorTests.cs
index e4c44d9..7a160ba 100644
--- a/XUnitTestRocketMQ/Protocol/SpanRefactorTests.cs
+++ b/XUnitTestRocketMQ/Protocol/SpanRefactorTests.cs
@@ -11,7 +11,7 @@ using NewLife.RocketMQ.Grpc;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Protocol;
+namespace XUnitTest.Protocol;
/// <summary>SpanReader/SpanWriter重构验证测试</summary>
/// <remarks>
diff --git a/XUnitTestRocketMQ/Trace/MessageTraceTests.cs b/XUnitTestRocketMQ/Trace/MessageTraceTests.cs
index 29b0211..101b941 100644
--- a/XUnitTestRocketMQ/Trace/MessageTraceTests.cs
+++ b/XUnitTestRocketMQ/Trace/MessageTraceTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Threading;
using NewLife;
using NewLife.Log;
@@ -6,7 +6,7 @@ using NewLife.RocketMQ;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Trace
+namespace XUnitTest.Trace
{
public class MessageTraceTests
{
diff --git a/XUnitTestRocketMQ/Trace/TraceModelTests.cs b/XUnitTestRocketMQ/Trace/TraceModelTests.cs
index 7d2c84f..a13241a 100644
--- a/XUnitTestRocketMQ/Trace/TraceModelTests.cs
+++ b/XUnitTestRocketMQ/Trace/TraceModelTests.cs
@@ -5,7 +5,7 @@ using NewLife.RocketMQ.MessageTrace;
using NewLife.RocketMQ.Protocol;
using Xunit;
-namespace XUnitTestRocketMQ.Trace;
+namespace XUnitTest.Trace;
/// <summary>消息轨迹数据模型测试</summary>
public class TraceModelTests
diff --git a/XUnitTestRocketMQ/XUnitTest.csproj b/XUnitTestRocketMQ/XUnitTest.csproj
index 35e0604..5a2e579 100644
--- a/XUnitTestRocketMQ/XUnitTest.csproj
+++ b/XUnitTestRocketMQ/XUnitTest.csproj
@@ -9,6 +9,10 @@
</PropertyGroup>
<ItemGroup>
+ <None Remove="Cloud\AliyunIssuesTests.cs~RF3444505.TMP" />
+ </ItemGroup>
+
+ <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.3" />