Skip to content

Fixed bug in composite handler managers and added unit tests #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 15, 2020
Merged

Fixed bug in composite handler managers and added unit tests #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/JsonRpc/CompositeHandlersManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public IDisposable Add(JsonRpcHandlerFactory factory, JsonRpcHandlerOptions opti

public IDisposable Add(string method, JsonRpcHandlerFactory factory, JsonRpcHandlerOptions options)
{
var result = _parent.Add(factory, options);
var result = _parent.Add(method, factory, options);
_compositeDisposable.Add(result);
return result;
}
Expand Down
101 changes: 101 additions & 0 deletions test/JsonRpc.Tests/CompositeHandlersManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
using System;
using System.Reactive.Disposables;
using FluentAssertions;
using NSubstitute;
using OmniSharp.Extensions.JsonRpc;
using Xunit;
using Xunit.Abstractions;

namespace JsonRpc.Tests
{
public class CompositeHandlersManagerTests : AutoTestBase
{
public CompositeHandlersManagerTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper)
{
}

[Fact]
public void Should_Add_Handler_Instance_To_Parent()
{
var parent = Substitute.For<IHandlersManager>();
parent.Add(Arg.Any<IJsonRpcHandler>(), Arg.Any<JsonRpcHandlerOptions>()).Returns(Disposable.Empty);

var manager = new CompositeHandlersManager(parent);
manager.Add(Substitute.For<IJsonRpcHandler>(), new JsonRpcHandlerOptions());

parent.Received(0).Add(Arg.Any<string>(), Arg.Any<IJsonRpcHandler>(), Arg.Any<JsonRpcHandlerOptions>());
parent.Received(1).Add(Arg.Any<IJsonRpcHandler>(), Arg.Any<JsonRpcHandlerOptions>());
manager.GetDisposable().Count.Should().Be(1);
}

[Fact]
public void Should_Add_Named_Handler_Instance_To_Parent()
{
var parent = Substitute.For<IHandlersManager>();
parent.Add(Arg.Any<string>(), Arg.Any<IJsonRpcHandler>(), Arg.Any<JsonRpcHandlerOptions>()).Returns(Disposable.Empty);

var manager = new CompositeHandlersManager(parent);
manager.Add("mymethod", Substitute.For<IJsonRpcHandler>(), new JsonRpcHandlerOptions());

parent.Received(0).Add(Arg.Any<IJsonRpcHandler>(), Arg.Any<JsonRpcHandlerOptions>());
parent.Received(1).Add("mymethod", Arg.Any<IJsonRpcHandler>(), Arg.Any<JsonRpcHandlerOptions>());
manager.GetDisposable().Count.Should().Be(1);
}

[Fact]
public void Should_Add_Handler_Factory_To_Parent()
{
var parent = Substitute.For<IHandlersManager>();
parent.Add(Arg.Any<JsonRpcHandlerFactory>(), Arg.Any<JsonRpcHandlerOptions>()).Returns(Disposable.Empty);

var manager = new CompositeHandlersManager(parent);
manager.Add(Substitute.For<JsonRpcHandlerFactory>(), new JsonRpcHandlerOptions());

parent.Received(0).Add(Arg.Any<string>(), Arg.Any<JsonRpcHandlerFactory>(), Arg.Any<JsonRpcHandlerOptions>());
parent.Received(1).Add(Arg.Any<JsonRpcHandlerFactory>(), Arg.Any<JsonRpcHandlerOptions>());
manager.GetDisposable().Count.Should().Be(1);
}

[Fact]
public void Should_Add_Named_Handler_Factory_To_Parent()
{
var parent = Substitute.For<IHandlersManager>();
parent.Add(Arg.Any<string>(), Arg.Any<JsonRpcHandlerFactory>(), Arg.Any<JsonRpcHandlerOptions>()).Returns(Disposable.Empty);

var manager = new CompositeHandlersManager(parent);
manager.Add("mymethod", Substitute.For<JsonRpcHandlerFactory>(), new JsonRpcHandlerOptions());

parent.Received(0).Add(Arg.Any<JsonRpcHandlerFactory>(), Arg.Any<JsonRpcHandlerOptions>());
parent.Received(1).Add("mymethod", Arg.Any<JsonRpcHandlerFactory>(), Arg.Any<JsonRpcHandlerOptions>());
manager.GetDisposable().Count.Should().Be(1);
}

[Fact]
public void Should_Add_Handler_Type_To_Parent()
{
var parent = Substitute.For<IHandlersManager>();
parent.Add(Arg.Any<Type>(), Arg.Any<JsonRpcHandlerOptions>()).Returns(Disposable.Empty);

var manager = new CompositeHandlersManager(parent);
manager.Add(Substitute.For<Type>(), new JsonRpcHandlerOptions());

parent.Received(0).Add(Arg.Any<string>(), Arg.Any<Type>(), Arg.Any<JsonRpcHandlerOptions>());
parent.Received(1).Add(Arg.Any<Type>(), Arg.Any<JsonRpcHandlerOptions>());
manager.GetDisposable().Count.Should().Be(1);
}

[Fact]
public void Should_Add_Named_Handler_Type_To_Parent()
{
var parent = Substitute.For<IHandlersManager>();
parent.Add(Arg.Any<string>(), Arg.Any<Type>(), Arg.Any<JsonRpcHandlerOptions>()).Returns(Disposable.Empty);

var manager = new CompositeHandlersManager(parent);
manager.Add("mymethod", Substitute.For<Type>(), new JsonRpcHandlerOptions());

parent.Received(0).Add(Arg.Any<Type>(), Arg.Any<JsonRpcHandlerOptions>());
parent.Received(1).Add("mymethod", Arg.Any<Type>(), Arg.Any<JsonRpcHandlerOptions>());
manager.GetDisposable().Count.Should().Be(1);
}
}
}
1 change: 1 addition & 0 deletions test/JsonRpc.Tests/TestLanguageServerRegistry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Composition;
using OmniSharp.Extensions.JsonRpc;

namespace JsonRpc.Tests
Expand Down