mirror of
https://github.com/ckaczor/sqltoolsservice.git
synced 2026-02-16 18:47:57 -05:00
fixed failing integration tests (#512)
* fixed failing integration tests * close connection after test * undo close connection
This commit is contained in:
committed by
Karl Burtram
parent
e9bc97e290
commit
97fa99a713
@@ -1345,10 +1345,6 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
|
|||||||
internal SignatureHelp GetSignatureHelp(TextDocumentPosition textDocumentPosition, ScriptFile scriptFile)
|
internal SignatureHelp GetSignatureHelp(TextDocumentPosition textDocumentPosition, ScriptFile scriptFile)
|
||||||
{
|
{
|
||||||
int startLine = textDocumentPosition.Position.Line;
|
int startLine = textDocumentPosition.Position.Line;
|
||||||
int startColumn = TextUtilities.PositionOfPrevDelimeter(
|
|
||||||
scriptFile.Contents,
|
|
||||||
textDocumentPosition.Position.Line,
|
|
||||||
textDocumentPosition.Position.Character);
|
|
||||||
int endColumn = textDocumentPosition.Position.Character;
|
int endColumn = textDocumentPosition.Position.Character;
|
||||||
|
|
||||||
ScriptParseInfo scriptParseInfo = GetScriptParseInfo(textDocumentPosition.TextDocument.Uri);
|
ScriptParseInfo scriptParseInfo = GetScriptParseInfo(textDocumentPosition.TextDocument.Uri);
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
// Copyright (c) Microsoft. All rights reserved.
|
// Copyright (c) Microsoft. All rights reserved.
|
||||||
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||||
//
|
//
|
||||||
|
using System.Data;
|
||||||
using System.Data.Common;
|
using System.Data.Common;
|
||||||
using Microsoft.SqlTools.ServiceLayer.Connection;
|
using Microsoft.SqlTools.ServiceLayer.Connection;
|
||||||
using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
|
using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
|
||||||
@@ -69,8 +69,8 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.Connection
|
|||||||
var result = LiveConnectionHelper.InitLiveConnectionInfo();
|
var result = LiveConnectionHelper.InitLiveConnectionInfo();
|
||||||
ConnectionInfo connectionInfo = result.ConnectionInfo;
|
ConnectionInfo connectionInfo = result.ConnectionInfo;
|
||||||
ConnectionDetails details = connectionInfo.ConnectionDetails;
|
ConnectionDetails details = connectionInfo.ConnectionDetails;
|
||||||
string uri = connectionInfo.OwnerUri;
|
|
||||||
string initialDatabaseName = details.DatabaseName;
|
string initialDatabaseName = details.DatabaseName;
|
||||||
|
string uri = connectionInfo.OwnerUri;
|
||||||
string newDatabaseName = "tempdb";
|
string newDatabaseName = "tempdb";
|
||||||
string changeDatabaseQuery = "use " + newDatabaseName;
|
string changeDatabaseQuery = "use " + newDatabaseName;
|
||||||
|
|
||||||
@@ -82,9 +82,12 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.Connection
|
|||||||
|
|
||||||
// All open DbConnections (Query and Default) should have initialDatabaseName as their database
|
// All open DbConnections (Query and Default) should have initialDatabaseName as their database
|
||||||
foreach (DbConnection connection in connectionInfo.AllConnections)
|
foreach (DbConnection connection in connectionInfo.AllConnections)
|
||||||
|
{
|
||||||
|
if (connection != null && connection.State == ConnectionState.Open)
|
||||||
{
|
{
|
||||||
Assert.Equal(connection.Database, initialDatabaseName);
|
Assert.Equal(connection.Database, initialDatabaseName);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// If we run a query to change the database
|
// If we run a query to change the database
|
||||||
query = new Query(changeDatabaseQuery, connectionInfo, new QueryExecutionSettings(), fileStreamFactory);
|
query = new Query(changeDatabaseQuery, connectionInfo, new QueryExecutionSettings(), fileStreamFactory);
|
||||||
@@ -93,9 +96,12 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.Connection
|
|||||||
|
|
||||||
// All open DbConnections (Query and Default) should have newDatabaseName as their database
|
// All open DbConnections (Query and Default) should have newDatabaseName as their database
|
||||||
foreach (DbConnection connection in connectionInfo.AllConnections)
|
foreach (DbConnection connection in connectionInfo.AllConnections)
|
||||||
|
{
|
||||||
|
if (connection != null && connection.State == ConnectionState.Open)
|
||||||
{
|
{
|
||||||
Assert.Equal(connection.Database, newDatabaseName);
|
Assert.Equal(connection.Database, newDatabaseName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -734,6 +734,7 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.Connection
|
|||||||
var retryPolicy = connection.CommandRetryPolicy;
|
var retryPolicy = connection.CommandRetryPolicy;
|
||||||
connection.CommandRetryPolicy = retryPolicy;
|
connection.CommandRetryPolicy = retryPolicy;
|
||||||
Assert.True(connection.CommandRetryPolicy == retryPolicy);
|
Assert.True(connection.CommandRetryPolicy == retryPolicy);
|
||||||
|
connection.Open();
|
||||||
connection.ChangeDatabase("master");
|
connection.ChangeDatabase("master");
|
||||||
Assert.True(connection.ConnectionTimeout > 0);
|
Assert.True(connection.ConnectionTimeout > 0);
|
||||||
connection.ClearPool();
|
connection.ClearPool();
|
||||||
|
|||||||
@@ -87,15 +87,15 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.QueryExecution
|
|||||||
|
|
||||||
// If I use master, the current database should be master
|
// If I use master, the current database should be master
|
||||||
CreateAndExecuteQuery(string.Format(useQuery, master), connInfo, fileStreamFactory);
|
CreateAndExecuteQuery(string.Format(useQuery, master), connInfo, fileStreamFactory);
|
||||||
Assert.Equal(master, connection.Database);
|
Assert.Equal(master, connInfo.ConnectionDetails.DatabaseName);
|
||||||
|
|
||||||
// If I use tempdb, the current database should be tempdb
|
// If I use tempdb, the current database should be tempdb
|
||||||
CreateAndExecuteQuery(string.Format(useQuery, tempdb), connInfo, fileStreamFactory);
|
CreateAndExecuteQuery(string.Format(useQuery, tempdb), connInfo, fileStreamFactory);
|
||||||
Assert.Equal(tempdb, connection.Database);
|
Assert.Equal(tempdb, connInfo.ConnectionDetails.DatabaseName);
|
||||||
|
|
||||||
// If I switch back to master, the current database should be master
|
// If I switch back to master, the current database should be master
|
||||||
CreateAndExecuteQuery(string.Format(useQuery, master), connInfo, fileStreamFactory);
|
CreateAndExecuteQuery(string.Format(useQuery, master), connInfo, fileStreamFactory);
|
||||||
Assert.Equal(master, connection.Database);
|
Assert.Equal(master, connInfo.ConnectionDetails.DatabaseName);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Query CreateAndExecuteQuery(string queryText, ConnectionInfo connectionInfo, IFileStreamFactory fileStreamFactory)
|
public Query CreateAndExecuteQuery(string queryText, ConnectionInfo connectionInfo, IFileStreamFactory fileStreamFactory)
|
||||||
|
|||||||
Reference in New Issue
Block a user