Added tests

Author: david-driscoll

src/Lsp/HandlerDescriptor.cs

@@ -10,7 +10,6 @@ namespace OmniSharp.Extensions.LanguageServer
     class HandlerDescriptor : ILspHandlerDescriptor, IDisposable
     {
         private readonly Action _disposeAction;
-        private readonly Guid _id = Guid.NewGuid();
 
         public HandlerDescriptor(string method, IJsonRpcHandler handler, Type handlerType, Type @params, Type registrationType, Type capabilityType, Action disposeAction)
         {
@@ -95,14 +94,15 @@ public override bool Equals(object obj)
         {
             if (obj is HandlerDescriptor handler)
             {
-                return handler._id == _id;
+                return handler.HandlerType == HandlerType && handler.Handler.Key == Handler.Key;
             }
             return false;
         }
 
         public override int GetHashCode()
         {
-            return _id.GetHashCode();
+            if (string.IsNullOrWhiteSpace(Handler.Key)) return HandlerType.GetHashCode();
+            return Tuple.Create(HandlerType, Handler.Key).GetHashCode();
         }
     }
 }

test/Lsp.Tests/HandlerResolverTests.cs

@@ -19,14 +19,36 @@ public class HandlerResolverTests
         [Theory]
         [InlineData(typeof(IInitializeHandler), "initialize", 1)]
         [InlineData(typeof(IInitializedHandler), "initialized", 1)]
-        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didOpen", 5)]
-        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didChange", 5)]
-        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didClose", 5)]
-        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didSave", 5)]
+        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didOpen", 4)]
+        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didChange", 4)]
+        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didClose", 4)]
+        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didSave", 4)]
         public void Should_Contain_AllDefinedMethods(Type requestHandler, string key, int count)
         {
             var handler = new HandlerCollection();
-            handler.Add((IJsonRpcHandler)Substitute.For(new Type[] { requestHandler }, new object[0]));
+            var sub = (IJsonRpcHandler)Substitute.For(new Type[] { requestHandler }, new object[0]);
+            sub.Key.Returns("abcd");
+            handler.Add(sub);
+            handler._handlers.Should().Contain(x => x.Method == key);
+            handler._handlers.Count.Should().Be(count);
+        }
+
+        [Theory]
+        [InlineData(typeof(IInitializeHandler), "initialize", 2)]
+        [InlineData(typeof(IInitializedHandler), "initialized", 2)]
+        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didOpen", 8)]
+        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didChange", 8)]
+        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didClose", 8)]
+        [InlineData(typeof(ITextDocumentSyncHandler), "textDocument/didSave", 8)]
+        public void Should_Contain_AllDefinedMethods_ForDifferentKeys(Type requestHandler, string key, int count)
+        {
+            var handler = new HandlerCollection();
+            var sub = (IJsonRpcHandler)Substitute.For(new Type[] { requestHandler }, new object[0]);
+            sub.Key.Returns("abcd");
+            var sub2 = (IJsonRpcHandler)Substitute.For(new Type[] { requestHandler }, new object[0]);
+            sub2.Key.Returns("efgh");
+            handler.Add(sub);
+            handler.Add(sub2);
             handler._handlers.Should().Contain(x => x.Method == key);
             handler._handlers.Count.Should().Be(count);
         }
@@ -36,7 +58,25 @@ public void Should_Contain_AllDefinedMethods(Type requestHandler, string key, in
         public void Should_Contain_AllDefinedMethods_OnLanguageServer(Type requestHandler, Type type2, string key, string key2, int count)
         {
             var handler = new HandlerCollection();
-            handler.Add((IJsonRpcHandler)Substitute.For(new Type[] { requestHandler, type2 }, new object[0]));
+            var sub = (IJsonRpcHandler)Substitute.For(new Type[] { requestHandler, type2 }, new object[0]);
+            sub.Key.Returns("abd3");
+            handler.Add(sub);
+            handler._handlers.Should().Contain(x => x.Method == key);
+            handler._handlers.Should().Contain(x => x.Method == key2);
+            handler._handlers.Count.Should().Be(count);
+        }
+
+        [Theory]
+        [InlineData(typeof(IInitializeHandler), typeof(IInitializedHandler), "initialize", "initialized", 4)]
+        public void Should_Contain_AllDefinedMethods_OnLanguageServer_WithDifferentKeys(Type requestHandler, Type type2, string key, string key2, int count)
+        {
+            var handler = new HandlerCollection();
+            var sub = (IJsonRpcHandler)Substitute.For(new Type[] { requestHandler, type2 }, new object[0]);
+            sub.Key.Returns("abd3");
+            var sub2 = (IJsonRpcHandler)Substitute.For(new Type[] { requestHandler, type2 }, new object[0]);
+            sub2.Key.Returns("efgh");
+            handler.Add(sub);
+            handler.Add(sub2);
             handler._handlers.Should().Contain(x => x.Method == key);
             handler._handlers.Should().Contain(x => x.Method == key2);
             handler._handlers.Count.Should().Be(count);