fix subscription test to work arround graphql-dotnet/server#199

Author: rose-a

root.props

@@ -17,7 +17,7 @@
 		<RepositoryType>git</RepositoryType>
 		<RepositoryUrl>https://github.com/graphql-dotnet/graphql-client.git</RepositoryUrl>
 		<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-		<Version>2.0.0-alpha.4.subscription-api.5</Version>
+		<Version>2.0.0-alpha.4.subscription-api.6</Version>
 		<WarningLevel>4</WarningLevel>
 	</PropertyGroup>
 

tests/GraphQL.Integration.Tests/GraphQLClientExtensions.cs

@@ -29,5 +29,23 @@ public static async Task<GraphQLResponse> AddMessageAsync(this GraphQLHttpClient
 			};
 			return await client.SendMutationAsync(graphQLRequest).ConfigureAwait(false);
 		}
+
+		public static async Task<GraphQLResponse> JoinDeveloperUser(this GraphQLHttpClient client)
+		{
+			var graphQLRequest = new GraphQLRequest(@"
+				mutation($userId: String){
+				  join(userId: $userId){
+				    displayName
+				    id
+				  }
+				}")
+			{
+				Variables = new
+				{
+					userId = "1"
+				}
+			};
+			return await client.SendMutationAsync(graphQLRequest).ConfigureAwait(false);
+		}
 	}
 }

tests/GraphQL.Integration.Tests/SubscriptionsTest.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Net.WebSockets;
 using System.Threading;
+using System.Threading.Tasks;
 using GraphQL.Client.Http;
 using GraphQL.Common.Request;
 using GraphQL.Common.Response;
@@ -163,11 +164,9 @@ public async void CanReconnectWithSameObservable()
 
 		private const string SubscriptionQuery2 = @"
 			subscription {
-			  contentAdded{
-			    content
-				from {
-				  displayName
-				}
+			  userJoined{
+				displayName
+				id
 			  }
 			}";
 
@@ -185,9 +184,11 @@ public async void CanConnectTwoSubscriptionsSimultaneously()
 
 				Debug.WriteLine("creating subscription stream");
 				IObservable<GraphQLResponse> observable1 = client.CreateSubscriptionStream(SubscriptionRequest, callbackTester.Callback);
+				IObservable<GraphQLResponse> observable2 = client.CreateSubscriptionStream(SubscriptionRequest2, callbackTester2.Callback);
 
 				Debug.WriteLine("subscribing...");
 				var tester = observable1.SubscribeTester();
+				var tester2 = observable2.SubscribeTester();
 
 				const string message1 = "Hello World";
 				var response = await client.AddMessageAsync(message1).ConfigureAwait(false);
@@ -197,42 +198,31 @@ public async void CanConnectTwoSubscriptionsSimultaneously()
 					Assert.Equal(message1, (string)gqlResponse.Data.messageAdded.content.Value);
 				});
 
-				IObservable<GraphQLResponse> observable2 = client.CreateSubscriptionStream(SubscriptionRequest2, callbackTester2.Callback);
-				var tester2 = observable2.SubscribeTester();
-				tester2.ShouldHaveReceivedUpdate(gqlResponse =>
-				{
-					Assert.Equal(message1, (string)gqlResponse.Data.contentAdded.content.Value);
-					Assert.Equal("tester", (string)gqlResponse.Data.contentAdded.from.displayName.Value);
-				});
+				await Task.Delay(500); // ToDo: can be removed after https://github.com/graphql-dotnet/server/pull/199 was merged and released
+
+				response = await client.JoinDeveloperUser().ConfigureAwait(false);
+				Assert.Equal("developer", (string)response.Data.join.displayName.Value);
 
-				const string message2 = "How are you?";
-				response = await client.AddMessageAsync(message2).ConfigureAwait(false);
-				Assert.Equal(message2, (string)response.Data.addMessage.content);
-				tester.ShouldHaveReceivedUpdate(gqlResponse =>
-				{
-					Assert.Equal(message2, (string)gqlResponse.Data.messageAdded.content.Value);
-				});
 				tester2.ShouldHaveReceivedUpdate(gqlResponse =>
 				{
-					Assert.Equal(message2, (string)gqlResponse.Data.contentAdded.content.Value);
-					Assert.Equal("tester", (string)gqlResponse.Data.contentAdded.from.displayName.Value);
+					Assert.Equal("1", (string)gqlResponse.Data.userJoined.id.Value);
+					Assert.Equal("developer", (string)gqlResponse.Data.userJoined.displayName.Value);
 				});
-
+				
 				Debug.WriteLine("disposing subscription...");
-				tester.Dispose();
+				tester2.Dispose();
 
 				const string message3 = "lorem ipsum dolor si amet";
 				response = await client.AddMessageAsync(message3).ConfigureAwait(false);
 				Assert.Equal(message3, (string)response.Data.addMessage.content);
-				tester2.ShouldHaveReceivedUpdate(gqlResponse =>
+				tester.ShouldHaveReceivedUpdate(gqlResponse =>
 				{
-					Assert.Equal(message3, (string)gqlResponse.Data.contentAdded.content.Value);
-					Assert.Equal("tester", (string)gqlResponse.Data.contentAdded.from.displayName.Value);
+					Assert.Equal(message3, (string)gqlResponse.Data.messageAdded.content.Value);
 				});
 
 				// disposing the client should complete the subscription
 				client.Dispose();
-				tester2.ShouldHaveCompleted();
+				tester.ShouldHaveCompleted();
 			}
 		}
 

tests/IntegrationTestServer/ChatSchema/ChatMutation.cs

@@ -16,7 +16,18 @@ public ChatMutation(IChat chat)
                     var message = chat.AddMessage(receivedMessage);
                     return message;
                 });
-        }
+
+			Field<MessageFromType>("join",
+				arguments: new QueryArguments(
+					new QueryArgument<StringGraphType> { Name = "userId" }
+				),
+				resolve: context =>
+				{
+					var userId = context.GetArgument<string>("userId");
+					var userJoined = chat.Join(userId);
+					return userJoined;
+				});
+		}
     }
 
     public class MessageInputType : InputObjectGraphType

tests/IntegrationTestServer/ChatSchema/ChatSubscriptions.cs

@@ -43,7 +43,15 @@ public ChatSubscriptions(IChat chat)
                 Resolver = new FuncFieldResolver<Message>(ResolveMessage),
                 Subscriber = new EventStreamResolver<Message>(SubscribeById)
             });
-        }
+
+			AddField(new EventStreamFieldType
+			{
+				Name = "userJoined",
+				Type = typeof(MessageFromType),
+				Resolver = new FuncFieldResolver<MessageFrom>(context => context.Source as MessageFrom),
+				Subscriber = new EventStreamResolver<MessageFrom>(context => _chat.UserJoined())
+			});
+		}
 
         private IObservable<Message> SubscribeById(ResolveEventStreamContext context)
         {

tests/IntegrationTestServer/ChatSchema/IChat.cs

@@ -11,16 +11,20 @@ public interface IChat
 
         Message AddMessage(Message message);
 
-        IObservable<Message> Messages(string user);
+		MessageFrom Join(string userId);
 
-        Message AddMessage(ReceivedMessage message);
+		IObservable<Message> Messages(string user);
+		IObservable<MessageFrom> UserJoined();
+
+		Message AddMessage(ReceivedMessage message);
     }
 
     public class Chat : IChat
     {
         private readonly ISubject<Message> _messageStream = new ReplaySubject<Message>(1);
+		private readonly ISubject<MessageFrom> _userJoined = new Subject<MessageFrom>();
 
-        public Chat()
+		public Chat()
         {
             AllMessages = new ConcurrentStack<Message>();
             Users = new ConcurrentDictionary<string, string>
@@ -58,9 +62,25 @@ public Message AddMessage(Message message)
             AllMessages.Push(message);
             _messageStream.OnNext(message);
             return message;
-        }
+		}
+
+		public MessageFrom Join(string userId)
+		{
+			if (!Users.TryGetValue(userId, out var displayName))
+			{
+				displayName = "(unknown)";
+			}
+
+			var joinedUser = new MessageFrom {
+				Id = userId,
+				DisplayName = displayName
+			};
 
-        public IObservable<Message> Messages(string user)
+			_userJoined.OnNext(joinedUser);
+			return joinedUser;
+		}
+
+		public IObservable<Message> Messages(string user)
         {
             return _messageStream
                 .Select(message =>
@@ -75,5 +95,16 @@ public void AddError(Exception exception)
         {
             _messageStream.OnError(exception);
         }
-    }
+
+		public IObservable<MessageFrom> UserJoined()
+		{
+			return _userJoined.AsObservable();
+		}
+	}
+
+	public class User
+	{
+		public string Id { get; set; }
+		public string Name { get; set; }
+	}
 }

tests/IntegrationTestServer/IntegrationTestServer.csproj

@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="GraphQL.Server.Transports.AspNetCore" Version="3.4.0" />
     <PackageReference Include="GraphQL.Server.Transports.Subscriptions.Abstractions" Version="3.4.0" />
-    <PackageReference Include="GraphQL.Server.Transports.WebSockets" Version="3.4.1-1.multiple-subscriptions.2" />
+    <PackageReference Include="GraphQL.Server.Transports.WebSockets" Version="3.4.0" />
     <PackageReference Include="GraphQL.Server.Ui.GraphiQL" Version="3.4.0" />
     <PackageReference Include="GraphQL.Server.Ui.Playground" Version="3.4.0" />
     <PackageReference Include="GraphQL.Server.Ui.Voyager" Version="3.4.0" />