mirror of
https://github.com/ckaczor/sqltoolsservice.git
synced 2026-01-14 01:25:40 -05:00
Per editor Connect support v0.1
- Basic plumbing to support connections for a URI rather than global connections. Typical use case is editor requests to connect, but this isn't the only possible use - Tests pass but need updating to cover new functionality, and re-enable AutoCompleteService test once there is a ServiceDiscovery component that registers and returns services. This is necessary as .Instance won't allow for dependency injection and proper testing.
This commit is contained in:
committed by
Mitchell Sternke
parent
d191b0483c
commit
402e25f77d
@@ -3,8 +3,12 @@
|
||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.SqlTools.ServiceLayer.Connection;
|
||||
using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol;
|
||||
using Microsoft.SqlTools.Test.Utility;
|
||||
using Moq;
|
||||
using Xunit;
|
||||
|
||||
namespace Microsoft.SqlTools.ServiceLayer.Test.Connection
|
||||
@@ -14,7 +18,6 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Connection
|
||||
/// </summary>
|
||||
public class ConnectionServiceTests
|
||||
{
|
||||
#region "Connection tests"
|
||||
|
||||
/// <summary>
|
||||
/// Verify that the SQL parser correctly detects errors in text
|
||||
@@ -23,12 +26,17 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Connection
|
||||
public void ConnectToDatabaseTest()
|
||||
{
|
||||
// connect to a database instance
|
||||
var connectionResult =
|
||||
string ownerUri = "file://my/sample/file.sql";
|
||||
var connectionResult =
|
||||
TestObjects.GetTestConnectionService()
|
||||
.Connect(TestObjects.GetTestConnectionDetails());
|
||||
.Connect(new ConnectParams()
|
||||
{
|
||||
OwnerUri = ownerUri,
|
||||
Connection = TestObjects.GetTestConnectionDetails()
|
||||
});
|
||||
|
||||
// verify that a valid connection id was returned
|
||||
Assert.True(connectionResult.ConnectionId > 0);
|
||||
Assert.NotEmpty(connectionResult.ConnectionId);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -49,12 +57,49 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Connection
|
||||
);
|
||||
|
||||
// connect to a database instance
|
||||
var connectionResult = connectionService.Connect(TestObjects.GetTestConnectionDetails());
|
||||
var connectionResult = connectionService.Connect(TestObjects.GetTestConnectionParams());
|
||||
|
||||
// verify that a valid connection id was returned
|
||||
Assert.True(callbackInvoked);
|
||||
}
|
||||
|
||||
#endregion
|
||||
//[Fact]
|
||||
//public void TestConnectRequestRegistersOwner()
|
||||
//{
|
||||
// // Given a request to connect to a database
|
||||
// var service = new ConnectionService(new TestSqlConnectionFactory());
|
||||
// ConnectionDetails connectionDetails = TestObjects.GetTestConnectionDetails();
|
||||
// var connectParams = new ConnectParams()
|
||||
// {
|
||||
// OwnerUri = "file://path/to/my.sql",
|
||||
// Connection = connectionDetails
|
||||
// };
|
||||
|
||||
// var endpoint = new Mock<IProtocolEndpoint>();
|
||||
// Func<ConnectParams, RequestContext<ConnectResponse>, Task> connectRequestHandler = null;
|
||||
// endpoint.Setup(e => e.SetRequestHandler(ConnectionRequest.Type, It.IsAny<Func<ConnectParams, RequestContext<ConnectResponse>, Task>>()))
|
||||
// .Callback<Func<ConnectParams, RequestContext<ConnectResponse>, Task>>(handler => connectRequestHandler = handler);
|
||||
|
||||
// // when I initialize the service
|
||||
// service.InitializeService(endpoint.Object);
|
||||
|
||||
// // then I expect the handler to be captured
|
||||
// Assert.NotNull(connectRequestHandler);
|
||||
|
||||
// // when I call the service
|
||||
// var requestContext = new Mock<RequestContext<ConnectResponse>>();
|
||||
|
||||
// connectRequestHandler(connectParams, requestContext);
|
||||
// // then I should get a live connection
|
||||
|
||||
// // and then I should have
|
||||
// // connect to a database instance
|
||||
// var connectionResult =
|
||||
// TestObjects.GetTestConnectionService()
|
||||
// .Connect(TestObjects.GetTestConnectionDetails());
|
||||
|
||||
// // verify that a valid connection id was returned
|
||||
// Assert.True(connectionResult.ConnectionId > 0);
|
||||
//}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user