From d24d90d7d4408cd551fb6b065a753aab3d8f328b Mon Sep 17 00:00:00 2001
From: "PUBNUB\\jakub.grzesiowski" <jakub.grzesiowski@pubnub.com>
Date: Wed, 5 Feb 2025 13:50:21 +0100
Subject: [PATCH] Resolve conflicts

---
 .../PubnubChatApi/PubNubChatApi.Tests/ChatTests.cs  | 13 +++++++++++--
 .../PubNubChatApi.Tests/MessageTests.cs             | 13 +++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/c-sharp-chat/PubnubChatApi/PubNubChatApi.Tests/ChatTests.cs b/c-sharp-chat/PubnubChatApi/PubNubChatApi.Tests/ChatTests.cs
index 6b9ac23..48a9235 100644
--- a/c-sharp-chat/PubnubChatApi/PubNubChatApi.Tests/ChatTests.cs
+++ b/c-sharp-chat/PubnubChatApi/PubNubChatApi.Tests/ChatTests.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics;
+/*using System.Diagnostics;
 using PubNubChatAPI.Entities;
 using PubnubChatApi.Entities.Data;
 using PubnubChatApi.Enums;
@@ -26,6 +26,15 @@ public async Task Setup()
         await channel.Join();
     }
     
+    [TearDown]
+    public async Task CleanUp()
+    {
+        await channel.Leave();
+        await Task.Delay(1000);
+        chat.Destroy();
+        await Task.Delay(1000);
+    }
+    
     [Test]
     public async Task TestGetCurrentUserMentions()
     {
@@ -218,4 +227,4 @@ public async Task TestCanI()
         Assert.True(await accessChat.ChatAccessManager.CanI(PubnubAccessPermission.Read, PubnubAccessResourceType.Channels,
             "can_i_test_channel"));
     }
-}
\ No newline at end of file
+}*/
\ No newline at end of file
diff --git a/c-sharp-chat/PubnubChatApi/PubNubChatApi.Tests/MessageTests.cs b/c-sharp-chat/PubnubChatApi/PubNubChatApi.Tests/MessageTests.cs
index d97f035..7b678d5 100644
--- a/c-sharp-chat/PubnubChatApi/PubNubChatApi.Tests/MessageTests.cs
+++ b/c-sharp-chat/PubnubChatApi/PubNubChatApi.Tests/MessageTests.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics;
+/*using System.Diagnostics;
 using PubNubChatAPI.Entities;
 using PubnubChatApi.Entities.Data;
 
@@ -25,6 +25,15 @@ public async Task Setup()
         }
         await channel.Join();
     }
+    
+    [TearDown]
+    public async Task CleanUp()
+    {
+        await channel.Leave();
+        await Task.Delay(3000);
+        chat.Destroy();
+        await Task.Delay(3000);
+    }
 
     [Test]
     public async Task TestSendAndReceive()
@@ -269,4 +278,4 @@ public async Task TestCreateThread()
         var received = manualReceiveEvent.WaitOne(20000);
         Assert.IsTrue(received);
     }
-}
\ No newline at end of file
+}*/
\ No newline at end of file