Add test for custom EventHandler delegate type

microsoft · Jun 20, 2019 · 9ab5de3 · 9ab5de3
1 parent 6b2bcb9
commit 9ab5de3
Showing 1 changed file with 28 additions and 0 deletions.
diff --git a/src/StreamJsonRpc.Tests/TargetObjectEventsTests.cs b/src/StreamJsonRpc.Tests/TargetObjectEventsTests.cs
@@ -93,6 +93,17 @@ public async Task GenericServerEventRaisesCallback()
         Assert.Equal(expectedArgs.Seeds, actualArgs.Seeds);
     }
 
+    [Fact]
+    public async Task CustomDelegateServerEventRaisesCallback()
+    {
+        var tcs = new TaskCompletionSource<MessageEventArgs<string>>();
+        var expectedArgs = new MessageEventArgs<string> { Message = "a" };
+        this.client.ServerEventWithCustomGenericDelegateAndArgsRaised = args => tcs.SetResult(args);
+        this.server.TriggerServerEventWithCustomGenericDelegateAndArgs(expectedArgs);
+        var actualArgs = await tcs.Task.WithCancellation(this.TimeoutToken);
+        Assert.Equal<string>(expectedArgs.Message, actualArgs.Message);
+    }
+
     /// <summary>
     /// Verifies that events on target objects are subscribed to, and unsubscribed after the JsonRpc instance is disposed of.
     /// </summary>
@@ -201,21 +212,29 @@ private class Client
 
         internal Action<CustomEventArgs> GenericServerEventRaised { get; set; }
 
+        internal Action<MessageEventArgs<string>> ServerEventWithCustomGenericDelegateAndArgsRaised { get; set; }
+
         public void ServerEvent(EventArgs args) => this.ServerEventRaised?.Invoke(args);
 
         public void PublicStaticServerEvent(EventArgs args) => this.PublicStaticServerEventRaised?.Invoke(args);
 
         public void ServerEventWithCustomArgs(CustomEventArgs args) => this.GenericServerEventRaised?.Invoke(args);
+
+        public void ServerEventWithCustomGenericDelegateAndArgs(MessageEventArgs<string> args) => this.ServerEventWithCustomGenericDelegateAndArgsRaised?.Invoke(args);
     }
 
     private class Server
     {
+        public delegate void MessageReceivedEventHandler<T>(object sender, MessageEventArgs<T> args);
+
         public static event EventHandler PublicStaticServerEvent;
 
         public event EventHandler ServerEvent;
 
         public event EventHandler<CustomEventArgs> ServerEventWithCustomArgs;
 
+        public event MessageReceivedEventHandler<string> ServerEventWithCustomGenericDelegateAndArgs;
+
         private static event EventHandler PrivateStaticServerEvent;
 
         private event EventHandler PrivateServerEvent;
@@ -236,13 +255,17 @@ public void TriggerGenericEvent(CustomEventArgs args)
             this.OnServerEventWithCustomArgs(args);
         }
 
+        public void TriggerServerEventWithCustomGenericDelegateAndArgs(MessageEventArgs<string> args) => this.OnServerEventWithCustomGenericDelegateAndArgs(args);
+
         protected static void OnPrivateStaticServerEvent(EventArgs args) => PrivateStaticServerEvent?.Invoke(null, args);
 
         protected virtual void OnServerEvent(EventArgs args) => this.ServerEvent?.Invoke(this, args);
 
         protected virtual void OnServerEventWithCustomArgs(CustomEventArgs args) => this.ServerEventWithCustomArgs?.Invoke(this, args);
 
         protected virtual void OnPrivateServerEvent(EventArgs args) => this.PrivateServerEvent?.Invoke(this, args);
+
+        protected virtual void OnServerEventWithCustomGenericDelegateAndArgs(MessageEventArgs<string> args) => this.ServerEventWithCustomGenericDelegateAndArgs?.Invoke(this, args);
     }
 
     private class ServerWithIncompatibleEvents
@@ -258,4 +281,9 @@ private class CustomEventArgs : EventArgs
     {
         public int Seeds { get; set; }
     }
+
+    private class MessageEventArgs<T> : EventArgs
+    {
+        public T Message { get; set; }
+    }
 }