refactor project setup

Insire · Insire · commit f6e4a608b019 · 2025-10-25T13:05:44.000+02:00
diff --git a/tests/MvvmScarletToolkit.Mediator.Tests/MediatorTests.cs b/tests/MvvmScarletToolkit.Mediator.Tests/MediatorTests.cs
@@ -1,6 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
-using System.Threading;
-using System.Threading.Tasks;
+using MvvmScarletToolkit.Test.Tracing.Otel.Attributes;
 
 namespace MvvmScarletToolkit.Mediator.Tests;
 
diff --git a/tests/MvvmScarletToolkit.Mediator.Tests/MvvmScarletToolkit.Mediator.Tests.csproj b/tests/MvvmScarletToolkit.Mediator.Tests/MvvmScarletToolkit.Mediator.Tests.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Using Include="MvvmScarletToolkit.Mediator.Tests.Otel" />
+    <Using Include="MvvmScarletToolkit.Test.Tracing.Otel.Attributes" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/MvvmScarletToolkit.Mediator.Tests/Properties/AssemblyInfo.cs b/tests/MvvmScarletToolkit.Mediator.Tests/Properties/AssemblyInfo.cs
@@ -1 +1,3 @@
+using MvvmScarletToolkit.Test.Tracing.Otel.Fixtures;
+
 [assembly: AssemblyFixture(typeof(OpenTelemetryMonitoredFixture))]
diff --git a/tests/MvvmScarletToolkit.Observables.Tests/MvvmScarletToolkit.Observables.Tests.csproj b/tests/MvvmScarletToolkit.Observables.Tests/MvvmScarletToolkit.Observables.Tests.csproj
@@ -10,6 +10,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Using Include="MvvmScarletToolkit.Mediator.Tests.Otel" />
+    <Using Include="MvvmScarletToolkit.Test.Tracing.Otel.Attributes" />
   </ItemGroup>
 </Project>
diff --git a/tests/MvvmScarletToolkit.Observables.Tests/NotifyProperyChangedTrackerTests.cs b/tests/MvvmScarletToolkit.Observables.Tests/NotifyProperyChangedTrackerTests.cs
@@ -1,4 +1,4 @@
-using System;
+using MvvmScarletToolkit.Test.Tracing.Otel.Attributes;
 
 namespace MvvmScarletToolkit.Observables.Tests
 {
diff --git a/tests/MvvmScarletToolkit.Observables.Tests/Properties/AssemblyInfo.cs b/tests/MvvmScarletToolkit.Observables.Tests/Properties/AssemblyInfo.cs
@@ -1 +1,3 @@
+using MvvmScarletToolkit.Test.Tracing.Otel.Fixtures;
+
 [assembly: AssemblyFixture(typeof(OpenTelemetryMonitoredFixture))]
diff --git a/tests/MvvmScarletToolkit.Observables.Tests/PropertyChangedMessageTrackerTests.cs b/tests/MvvmScarletToolkit.Observables.Tests/PropertyChangedMessageTrackerTests.cs
@@ -1,6 +1,4 @@
 using CommunityToolkit.Mvvm.Messaging;
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using Xunit.Sdk;
 
diff --git a/tests/MvvmScarletToolkit.Wpf.Tests/CommandBuilderContextTests.cs b/tests/MvvmScarletToolkit.Wpf.Tests/CommandBuilderContextTests.cs
@@ -1,6 +1,4 @@
 using MvvmScarletToolkit.Commands;
-using System;
-using System.Threading.Tasks;
 
 namespace MvvmScarletToolkit.Tests
 {
diff --git a/tests/MvvmScarletToolkit.Wpf.Tests/MvvmScarletToolkit.Wpf.Tests.csproj b/tests/MvvmScarletToolkit.Wpf.Tests/MvvmScarletToolkit.Wpf.Tests.csproj
@@ -14,6 +14,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Using Include="MvvmScarletToolkit.Mediator.Tests.Otel" />
+    <Using Include="MvvmScarletToolkit.Test.Tracing.Otel.Attributes" />
   </ItemGroup>
 </Project>
diff --git a/tests/MvvmScarletToolkit.Wpf.Tests/Properties/AssemblyInfo.cs b/tests/MvvmScarletToolkit.Wpf.Tests/Properties/AssemblyInfo.cs
@@ -1,2 +1,4 @@
+using MvvmScarletToolkit.Test.Tracing.Otel.Fixtures;
+
 [assembly: System.Runtime.Versioning.SupportedOSPlatform("windows7.0")]
 [assembly: AssemblyFixture(typeof(OpenTelemetryMonitoredFixture))]
diff --git a/tests/shared/MvvmScarletToolkit.Test.Tracing/Otel/Attributes/TracePerTestRunAttribute.cs b/tests/shared/MvvmScarletToolkit.Test.Tracing/Otel/Attributes/TracePerTestRunAttribute.cs
@@ -1,7 +1,8 @@
+using MvvmScarletToolkit.Test.Tracing.Otel.Fixtures;
 using System.Diagnostics;
 using System.Reflection;
 
-namespace MvvmScarletToolkit.Mediator.Tests.Otel
+namespace MvvmScarletToolkit.Test.Tracing.Otel.Attributes
 {
     public sealed class TracePerTestRunAttribute : BeforeAfterTestAttribute
     {
diff --git a/tests/shared/MvvmScarletToolkit.Test.Tracing/Otel/Attributes/TraceTestAttribute.cs b/tests/shared/MvvmScarletToolkit.Test.Tracing/Otel/Attributes/TraceTestAttribute.cs
@@ -1,7 +1,9 @@
+using MvvmScarletToolkit.Mediator.Tests.Otel;
+using MvvmScarletToolkit.Test.Tracing.Otel.Fixtures;
 using System.Diagnostics;
 using System.Reflection;
 
-namespace MvvmScarletToolkit.Mediator.Tests.Otel
+namespace MvvmScarletToolkit.Test.Tracing.Otel.Attributes
 {
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
     public sealed class TraceTestAttribute : BaseTraceTestAttribute
diff --git a/tests/shared/MvvmScarletToolkit.Test.Tracing/Otel/BaseTraceTestAttribute.cs b/tests/shared/MvvmScarletToolkit.Test.Tracing/Otel/BaseTraceTestAttribute.cs
@@ -1,3 +1,4 @@
+using MvvmScarletToolkit.Test.Tracing.Otel.Fixtures;
 using System.Diagnostics;
 
 namespace MvvmScarletToolkit.Mediator.Tests.Otel
diff --git a/tests/shared/MvvmScarletToolkit.Test.Tracing/Otel/Fixtures/OpenTelemetryFixture.cs b/tests/shared/MvvmScarletToolkit.Test.Tracing/Otel/Fixtures/OpenTelemetryFixture.cs
@@ -0,0 +1,40 @@
+using OpenTelemetry;
+using OpenTelemetry.Resources;
+using OpenTelemetry.Trace;
+
+namespace MvvmScarletToolkit.Test.Tracing.Otel.Fixtures
+{
+    public sealed class OpenTelemetryFixture : OpenTelemetryFixtureBase, IDisposable
+    {
+        private const string TracerName = "unit-test-with-otel";
+        private readonly TracerProvider _tracerProvider;
+
+        public OpenTelemetryFixture()
+        {
+            _tracerProvider = CreateTracerProvider(ResourceBuilder.CreateDefault().AddService(TracerName), TracerName);
+        }
+
+        public void Dispose()
+        {
+            _tracerProvider?.Dispose();
+        }
+    }
+
+    public abstract class OpenTelemetryFixtureBase()
+    {
+        protected static TracerProvider CreateTracerProvider(ResourceBuilder builder, string tracerName)
+        {
+            return Sdk.CreateTracerProviderBuilder()
+                 .SetResourceBuilder(builder)
+                 .AddSource(tracerName)
+                 .AddHttpClientInstrumentation()
+                 .AddConsoleExporter()
+                     .AddOtlpExporter(o =>
+                     {
+                         o.Endpoint = new Uri("http://localhost:4317");
+                         o.Protocol = OpenTelemetry.Exporter.OtlpExportProtocol.Grpc;
+                     })
+                 .Build();
+        }
+    }
+}
diff --git a/tests/shared/MvvmScarletToolkit.Test.Tracing/Otel/Fixtures/OpenTelemetryMonitoredFixture.cs b/tests/shared/MvvmScarletToolkit.Test.Tracing/Otel/Fixtures/OpenTelemetryMonitoredFixture.cs
@@ -0,0 +1,27 @@
+using MvvmScarletToolkit.Mediator.Tests.Otel;
+using OpenTelemetry.Resources;
+using OpenTelemetry.Trace;
+using System.Diagnostics;
+
+namespace MvvmScarletToolkit.Test.Tracing.Otel.Fixtures
+{
+    public sealed class OpenTelemetryMonitoredFixture : OpenTelemetryFixtureBase, IDisposable
+    {
+        public static ActivitySource ActivitySource { get; } = new ActivitySource(TracerName);
+
+        private const string TracerName = "unittest-with-otel";
+        private readonly TracerProvider _tracerProvider;
+
+        public OpenTelemetryMonitoredFixture()
+        {
+            _tracerProvider = CreateTracerProvider(ResourceBuilder.CreateDefault().AddService("MvvmScarletToolkit"), TracerName);
+        }
+
+        public void Dispose()
+        {
+            BaseTraceTestAttribute.ActivityForTestRun?.Stop();
+            _tracerProvider?.ForceFlush();
+            _tracerProvider?.Dispose();
+        }
+    }
+}
diff --git a/tests/shared/MvvmScarletToolkit.Test.Tracing/Otel/OpenTelemetryFixture.cs b/tests/shared/MvvmScarletToolkit.Test.Tracing/Otel/OpenTelemetryFixture.cs
diff --git a/tests/shared/MvvmScarletToolkit.Test.Tracing/Otel/OpenTelemetryMonitoredFixture.cs b/tests/shared/MvvmScarletToolkit.Test.Tracing/Otel/OpenTelemetryMonitoredFixture.cs

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
	`1`	`+using MvvmScarletToolkit.Test.Tracing.Otel.Fixtures;`
	`2`	`+`
`1`	`3`	`[assembly: AssemblyFixture(typeof(OpenTelemetryMonitoredFixture))]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using MvvmScarletToolkit.Test.Tracing.Otel.Attributes;`
`2`	`2`
`3`	`3`	`namespace MvvmScarletToolkit.Observables.Tests`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`	`1`	`using MvvmScarletToolkit.Commands;`
`2`		`-using System;`
`3`		`-using System.Threading.Tasks;`
`4`	`2`
`5`	`3`	`namespace MvvmScarletToolkit.Tests`
`6`	`4`	`{`