Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/pubnub/unity-chat into ci…
Browse files Browse the repository at this point in the history 
…-paths-fix
  • Loading branch information
@jakub-grzesiowski
jakub-grzesiowski committed Feb 5, 2025
2 parents 18c5ff1 + 78d3144 commit da07bc3
Show file tree
Hide file tree
Showing 28 changed files with 825 additions and 708 deletions.
76 changes: 38 additions & 38 deletions c-sharp-chat/PubnubChatApi/PubNubChatApi.Tests/ChannelTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ public class ChannelTests
private User talkUser;
[SetUp]
public void Setup()
public async Task Setup()
{
chat = new Chat(new PubnubChatConfig(
chat = await Chat.CreateInstance(new PubnubChatConfig(
PubnubTestsParameters.PublishKey,
PubnubTestsParameters.SubscribeKey,
"ctuuuuuuuuuuuuuuuuuuuuuuuuuuuuu")
Expand All @@ -23,11 +23,11 @@ public void Setup()
{
Assert.Fail();
}
user.Update(new ChatUserData()
await user.Update(new ChatUserData()
{
Username = "Testificate"
});
talkUser = chat.GetOrCreateUser("talk_user");
talkUser = await chat.GetOrCreateUser("talk_user");
}
[TearDown]
Expand All @@ -40,29 +40,29 @@ public async Task CleanUp()
[Test]
public async Task TestGetUserSuggestions()
{
var channel = chat.CreatePublicConversation("user_suggestions_test_channel");
channel.Join();
var channel = await chat.CreatePublicConversation("user_suggestions_test_channel");
await channel.Join();
await Task.Delay(5000);
var suggestions = channel.GetUserSuggestions("@Test");
var suggestions = await channel.GetUserSuggestions("@Test");
Assert.True(suggestions.Any(x => x.UserId == user.Id));
}
[Test]
public void TestGetMemberships()
public async Task TestGetMemberships()
{
var channel = chat.CreatePublicConversation("get_members_test_channel");
channel.Join();
var memberships = channel.GetMemberships();
var channel = await chat.CreatePublicConversation("get_members_test_channel");
await channel.Join();
var memberships = await channel.GetMemberships();
Assert.That(memberships.Memberships.Count, Is.GreaterThanOrEqualTo(1));
}
[Test]
public async Task TestStartTyping()
{
var channel = chat.CreateDirectConversation(talkUser, "sttc").CreatedChannel;
channel.Join();
var channel = (await chat.CreateDirectConversation(talkUser, "sttc")).CreatedChannel;
await channel.Join();
var typingManualEvent = new ManualResetEvent(false);
Expand All @@ -71,7 +71,7 @@ public async Task TestStartTyping()
Assert.That(typingUsers, Does.Contain(user.Id));
typingManualEvent.Set();
};
channel.StartTyping();
await channel.StartTyping();
var receivedTyping = typingManualEvent.WaitOne(5000);
Assert.IsTrue(receivedTyping);
Expand All @@ -80,10 +80,10 @@ public async Task TestStartTyping()
[Test]
public async Task TestStopTyping()
{
var channel = chat.CreateDirectConversation(talkUser, "stop_typing_test_channel").CreatedChannel;
channel.Join();
var channel = (await chat.CreateDirectConversation(talkUser, "stop_typing_test_channel")).CreatedChannel;
await channel.Join();
channel.StartTyping();
await channel.StartTyping();
await Task.Delay(2500);
Expand All @@ -93,7 +93,7 @@ public async Task TestStopTyping()
Assert.That(typingUsers, Is.Empty);
typingManualEvent.Set();
};
channel.StopTyping();
await channel.StopTyping();
var typingEvent = typingManualEvent.WaitOne(6000);
Assert.IsTrue(typingEvent);
Expand All @@ -102,10 +102,10 @@ public async Task TestStopTyping()
[Test]
public async Task TestStopTypingFromTimer()
{
var channel = chat.CreateDirectConversation(talkUser, "stop_typing_timeout_test_channel").CreatedChannel;
channel.Join();
var channel = (await chat.CreateDirectConversation(talkUser, "stop_typing_timeout_test_channel")).CreatedChannel;
await channel.Join();
channel.StartTyping();
await channel.StartTyping();
await Task.Delay(3000);
Expand All @@ -121,57 +121,57 @@ public async Task TestStopTypingFromTimer()
}
[Test]
public void TestPinMessage()
public async Task TestPinMessage()
{
var channel = chat.CreatePublicConversation("pin_message_test_channel_37");
channel.Join();
var channel = await chat.CreatePublicConversation("pin_message_test_channel_37");
await channel.Join();
var receivedManualEvent = new ManualResetEvent(false);
channel.OnMessageReceived += async message =>
{
channel.PinMessage(message);
await channel.PinMessage(message);
await Task.Delay(2000);
Assert.True(channel.TryGetPinnedMessage(out var pinnedMessage) && pinnedMessage.MessageText == "message to pin");
receivedManualEvent.Set();
};
channel.SendText("message to pin");
await channel.SendText("message to pin");
var received = receivedManualEvent.WaitOne(9000);
Assert.IsTrue(received);
}
[Test]
public void TestUnPinMessage()
public async Task TestUnPinMessage()
{
var channel = chat.CreatePublicConversation("unpin_message_test_channel");
channel.Join();
var channel = await chat.CreatePublicConversation("unpin_message_test_channel");
await channel.Join();
var receivedManualEvent = new ManualResetEvent(false);
channel.OnMessageReceived += async message =>
{
channel.PinMessage(message);
await channel.PinMessage(message);
await Task.Delay(2000);
Assert.True(channel.TryGetPinnedMessage(out var pinnedMessage) && pinnedMessage.MessageText == "message to pin");
channel.UnpinMessage();
await channel.UnpinMessage();
await Task.Delay(2000);
Assert.False(channel.TryGetPinnedMessage(out _));
receivedManualEvent.Set();
};
channel.SendText("message to pin");
await channel.SendText("message to pin");
var received = receivedManualEvent.WaitOne(12000);
Assert.IsTrue(received);
}
[Test]
public void TestCreateMessageDraft()
public async Task TestCreateMessageDraft()
{
var channel = chat.CreatePublicConversation("message_draft_test_channel");
var channel = await chat.CreatePublicConversation("message_draft_test_channel");
try
{
var draft = channel.CreateMessageDraft();
Expand All @@ -184,18 +184,18 @@ public void TestCreateMessageDraft()
}
[Test]
public void TestEmitUserMention()
public async Task TestEmitUserMention()
{
var channel = chat.CreatePublicConversation("user_mention_test_channel");
channel.Join();
var channel = await chat.CreatePublicConversation("user_mention_test_channel");
await channel.Join();
var receivedManualEvent = new ManualResetEvent(false);
chat.StartListeningForMentionEvents(user.Id);
chat.OnMentionEvent += mentionEvent =>
{
Assert.True(mentionEvent.Payload.Contains("heyyy"));
receivedManualEvent.Set();
};
channel.EmitUserMention(user.Id, "99999999999999999", "heyyy");
await channel.EmitUserMention(user.Id, "99999999999999999", "heyyy");
var received = receivedManualEvent.WaitOne(7000);
Assert.True(received);
}
Expand Down
12 changes: 6 additions & 6 deletions c-sharp-chat/PubnubChatApi/PubNubChatApi.Tests/ChatEventTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ public class ChatEventTests
private User user;
[SetUp]
public void Setup()
public async Task Setup()
{
chat = new Chat(new PubnubChatConfig(
chat = await Chat.CreateInstance(new PubnubChatConfig(
PubnubTestsParameters.PublishKey,
PubnubTestsParameters.SubscribeKey,
"event_tests_user")
);
channel = chat.CreatePublicConversation("event_tests_channel");
channel = await chat.CreatePublicConversation("event_tests_channel");
if (!chat.TryGetCurrentUser(out user))
{
Assert.Fail();
}
channel.Join();
await channel.Join();
}
[TearDown]
Expand All @@ -37,7 +37,7 @@ public async Task CleanUp()
}
[Test]
public void TestModerationEvents()
public async Task TestModerationEvents()
{
var manualModerationEvent = new ManualResetEvent(false);
chat.OnModerationEvent += moderationEvent =>
Expand All @@ -46,7 +46,7 @@ public void TestModerationEvents()
manualModerationEvent.Set();
};
chat.StartListeningForModerationEvents(user.Id);
user.SetRestriction(channel.Id, new Restriction()
await user.SetRestriction(channel.Id, new Restriction()
{
Ban = true,
Mute = true,
Expand Down
Loading

0 comments on commit da07bc3

Please sign in to comment.