fix unit tests

LGouellec · Jul 31, 2024 · c8356d7 · c8356d7
1 parent 2128fc6
commit c8356d7
Show file tree

Hide file tree

Showing 7 changed files with 120 additions and 124 deletions.
diff --git a/core/KafkaStream.cs b/core/KafkaStream.cs
@@ -432,16 +432,12 @@ public void Start(CancellationToken? token = null)
         public async Task StartAsync(CancellationToken? token = null)
         {
             if (token.HasValue)
-<<<<<<< HEAD
-                token.Value.Register(Dispose);
-=======
             {
                 token.Value.Register(() => {
                     _cancelSource.Cancel();
                     Dispose();
                 });
             }
->>>>>>> develop
 
             await Task.Factory.StartNew(() =>
             {

diff --git a/core/Processors/GlobalStreamThread.cs b/core/Processors/GlobalStreamThread.cs
@@ -270,7 +270,13 @@ protected virtual void Dispose(bool waitForThread)
 
                 if (waitForThread)
                 {
-                    thread.Join();
+                    try
+                    {
+                        thread.Join();
+                    }
+                    catch (ThreadStateException)
+                    {
+                    }
                 }
 
                 SetState(GlobalThreadState.DEAD);

diff --git a/metrics/Streamiz.Kafka.Net.Metrics.OpenTelemetry/OpenTelemetryMetricsExporter.cs b/metrics/Streamiz.Kafka.Net.Metrics.OpenTelemetry/OpenTelemetryMetricsExporter.cs
@@ -1,10 +1,6 @@
-using System;
 using System.Collections.Generic;
 using System.Diagnostics.Metrics;
-using System.Globalization;
 using System.Linq;
-using System.Runtime.CompilerServices;
-using Streamiz.Kafka.Net.Mock;
 
 namespace Streamiz.Kafka.Net.Metrics.OpenTelemetry
 {

diff --git a/samples/sample-stream/Reproducer328.cs b/samples/sample-stream/Reproducer328.cs
diff --git a/samples/sample-stream/sample-stream.csproj b/samples/sample-stream/sample-stream.csproj
@@ -15,12 +15,6 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="log4net" Version="2.0.12" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="5.0.3" />
-    <PackageReference Include="OpenTelemetry.Api" Version="1.3.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\core\Streamiz.Kafka.Net.csproj" />
     <ProjectReference Include="..\..\metrics\Streamiz.Kafka.Net.Metrics.Prometheus\Streamiz.Kafka.Net.Metrics.Prometheus.csproj" />

diff --git a/test/Streamiz.Kafka.Net.Tests/Private/GlobalStateManagerTests.cs b/test/Streamiz.Kafka.Net.Tests/Private/GlobalStateManagerTests.cs
@@ -87,6 +87,12 @@ public void SetUp()
             stateManager.SetGlobalProcessorContext(context);
         }
 
+        [TearDown]
+        public void Dispose()
+        {
+
+        }
+
         [Test]
         public void ShouldInitializeStateStores()
         {