Skip to content

Commit c9acd48

Browse files
committed
fix tests locally
1 parent b1888b4 commit c9acd48

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

src/GraphQL.Client/Websocket/GraphQLHttpWebSocket.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ private async Task<WebsocketMessageWrapper> ReceiveWebsocketMessagesAsync() {
502502
if (webSocketReceiveResult.MessageType == WebSocketMessageType.Text) {
503503
var response = await Options.JsonSerializer.DeserializeToWebsocketResponseWrapperAsync(ms);
504504
response.MessageBytes = ms.ToArray();
505-
Debug.WriteLine($"{response.MessageBytes.Length} bytes received on websocket {clientWebSocket.GetHashCode()} (thread {Thread.CurrentThread.ManagedThreadId})...");
505+
Debug.WriteLine($"{response.MessageBytes.Length} bytes received for id {response.Id} on websocket {clientWebSocket.GetHashCode()} (thread {Thread.CurrentThread.ManagedThreadId})...");
506506
return response;
507507
}
508508
else {

tests/GraphQL.Client.Tests.Common/Helpers/ObservableTester.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ public class ObservableTester<TSubscriptionPayload> : IDisposable {
1313
private readonly ManualResetEventSlim updateReceived = new ManualResetEventSlim();
1414
private readonly ManualResetEventSlim completed = new ManualResetEventSlim();
1515
private readonly ManualResetEventSlim error = new ManualResetEventSlim();
16-
private readonly EventLoopScheduler subscriptionScheduler = new EventLoopScheduler();
1716
private readonly EventLoopScheduler observeScheduler = new EventLoopScheduler();
1817

1918
/// <summary>
@@ -37,13 +36,11 @@ public class ObservableTester<TSubscriptionPayload> : IDisposable {
3736
/// </summary>
3837
/// <param name="observable">the <see cref="IObservable{T}"/> under test</param>
3938
public ObservableTester(IObservable<TSubscriptionPayload> observable) {
40-
subscriptionScheduler.Schedule(() =>
41-
Debug.WriteLine($"Subscription scheduler thread id: {Thread.CurrentThread.ManagedThreadId}"));
4239

4340
observeScheduler.Schedule(() =>
4441
Debug.WriteLine($"Observe scheduler thread id: {Thread.CurrentThread.ManagedThreadId}"));
4542

46-
subscription = observable.SubscribeOn(subscriptionScheduler).ObserveOn(observeScheduler).Subscribe(
43+
subscription = observable.ObserveOn(observeScheduler).Subscribe(
4744
obj => {
4845
Debug.WriteLine($"observable tester {GetHashCode()}: payload received");
4946
LastPayload = obj;
@@ -70,7 +67,6 @@ private void Reset() {
7067
/// <inheritdoc />
7168
public void Dispose() {
7269
subscription?.Dispose();
73-
subscriptionScheduler.Dispose();
7470
observeScheduler.Dispose();
7571
}
7672

tests/GraphQL.Integration.Tests/WebsocketTests/Base.cs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -233,36 +233,38 @@ public async void CanConnectTwoSubscriptionsSimultaneously() {
233233
var observable2 = ChatClient.CreateSubscriptionStream<UserJoinedSubscriptionResult>(SubscriptionRequest2, callbackTester2.Invoke);
234234

235235
Debug.WriteLine("subscribing...");
236-
var tester = observable1.Monitor();
237-
var tester2 = observable2.Monitor();
236+
var messagesMonitor = observable1.Monitor();
237+
var joinedMonitor = observable2.Monitor();
238238

239-
tester.Should().HaveReceivedPayload().Which.Data.MessageAdded.Content.Should().Be(InitialMessage.Content);
239+
messagesMonitor.Should().HaveReceivedPayload().Which.Data.MessageAdded.Content.Should().Be(InitialMessage.Content);
240240

241241
const string message1 = "Hello World";
242242
var response = await ChatClient.AddMessageAsync(message1);
243243
response.Data.AddMessage.Content.Should().Be(message1);
244-
tester.Should().HaveReceivedPayload()
244+
messagesMonitor.Should().HaveReceivedPayload()
245245
.Which.Data.MessageAdded.Content.Should().Be(message1);
246+
joinedMonitor.Should().NotHaveReceivedPayload();
246247

247248
var joinResponse = await ChatClient.JoinDeveloperUser();
248249
joinResponse.Data.Join.DisplayName.Should().Be("developer", "because that's the display name of user \"1\"");
249250

250-
var payload = tester2.Should().HaveReceivedPayload().Subject;
251+
var payload = joinedMonitor.Should().HaveReceivedPayload().Subject;
251252
payload.Data.UserJoined.Id.Should().Be("1", "because that's the id we sent with our mutation request");
252253
payload.Data.UserJoined.DisplayName.Should().Be("developer", "because that's the display name of user \"1\"");
254+
messagesMonitor.Should().NotHaveReceivedPayload();
253255

254256
Debug.WriteLine("disposing subscription...");
255-
tester2.Dispose();
257+
joinedMonitor.Dispose();
256258

257259
const string message3 = "lorem ipsum dolor si amet";
258260
response = await ChatClient.AddMessageAsync(message3);
259261
response.Data.AddMessage.Content.Should().Be(message3);
260-
tester.Should().HaveReceivedPayload()
262+
messagesMonitor.Should().HaveReceivedPayload()
261263
.Which.Data.MessageAdded.Content.Should().Be(message3);
262264

263265
// disposing the client should complete the subscription
264266
ChatClient.Dispose();
265-
tester.Should().HaveCompleted();
267+
messagesMonitor.Should().HaveCompleted();
266268
}
267269

268270

0 commit comments

Comments
 (0)