Resolve conflicts

pubnub · Feb 5, 2025 · d24d90d · d24d90d
1 parent da07bc3
commit d24d90d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git 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"));
     }
-}
+}*/
diff --git 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);
     }
-}
+}*/