fixed the problem in peekdefinition tests

This commit is contained in:
Leila Lali
2017-01-25 17:09:10 -08:00
parent dcff5dd915
commit 41d38b2107

View File

@@ -6,16 +6,15 @@ using System;
using System.IO; using System.IO;
using System.Threading; using System.Threading;
using Microsoft.SqlServer.Management.Common; using Microsoft.SqlServer.Management.Common;
using Microsoft.SqlServer.Management.SqlParser.Intellisense;
using Microsoft.SqlTools.ServiceLayer.Connection; using Microsoft.SqlTools.ServiceLayer.Connection;
using Microsoft.SqlTools.ServiceLayer.LanguageServices; using Microsoft.SqlTools.ServiceLayer.LanguageServices;
using Microsoft.SqlTools.ServiceLayer.Test.Common;
using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts;
using Microsoft.SqlTools.Test.Utility; using Microsoft.SqlTools.Test.Utility;
using Moq; using Moq;
using Xunit; using Xunit;
using Location = Microsoft.SqlTools.ServiceLayer.Workspace.Contracts.Location; using Location = Microsoft.SqlTools.ServiceLayer.Workspace.Contracts.Location;
using Microsoft.SqlServer.Management.SqlParser.Intellisense;
using Microsoft.SqlTools.ServiceLayer.Test.Common;
using static Microsoft.SqlTools.ServiceLayer.LanguageServices.PeekDefinition;
namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.LanguageServices namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.LanguageServices
{ {
@@ -384,49 +383,49 @@ GO";
PeekDefinition peekDefinition = new PeekDefinition(serverConnection, connInfo); PeekDefinition peekDefinition = new PeekDefinition(serverConnection, connInfo);
ScriptGetter sqlScriptGetter = null; PeekDefinition.ScriptGetter sqlScriptGetter = null;
switch (objectType) switch (objectType)
{ {
case SynonymTypeName: case SynonymTypeName:
sqlScriptGetter = peekDefinition.GetSynonymScripts; sqlScriptGetter = peekDefinition.GetSynonymScripts;
return; break;
case ScalarValuedFunctionTypeName: case ScalarValuedFunctionTypeName:
sqlScriptGetter = peekDefinition.GetScalarValuedFunctionScripts; sqlScriptGetter = peekDefinition.GetScalarValuedFunctionScripts;
objectType = "Function"; objectType = "Function";
return; break;
case TableValuedFunctionTypeName: case TableValuedFunctionTypeName:
sqlScriptGetter = peekDefinition.GetTableValuedFunctionScripts; sqlScriptGetter = peekDefinition.GetTableValuedFunctionScripts;
objectType = "Function"; objectType = "Function";
return; break;
case TableTypeName: case TableTypeName:
sqlScriptGetter = peekDefinition.GetTableScripts; sqlScriptGetter = peekDefinition.GetTableScripts;
return; break;
case ViewTypeName: case ViewTypeName:
sqlScriptGetter = peekDefinition.GetViewScripts; sqlScriptGetter = peekDefinition.GetViewScripts;
return; break;
case StoredProcedureTypeName: case StoredProcedureTypeName:
sqlScriptGetter = peekDefinition.GetStoredProcedureScripts; sqlScriptGetter = peekDefinition.GetStoredProcedureScripts;
return; break;
case UserDefinedDataTypeTypeName: case UserDefinedDataTypeTypeName:
sqlScriptGetter = peekDefinition.GetUserDefinedDataTypeScripts; sqlScriptGetter = peekDefinition.GetUserDefinedDataTypeScripts;
objectType = "Type"; objectType = "Type";
return; break;
case UserDefinedTableTypeTypeName: case UserDefinedTableTypeTypeName:
sqlScriptGetter = peekDefinition.GetUserDefinedTableTypeScripts; sqlScriptGetter = peekDefinition.GetUserDefinedTableTypeScripts;
objectType = "Type"; objectType = "Type";
return; break;
} }
Location[] locations = peekDefinition.GetSqlObjectDefinition(sqlScriptGetter, objectName, schemaName, objectType); Location[] locations = peekDefinition.GetSqlObjectDefinition(sqlScriptGetter, objectName, schemaName, objectType);
if (shouldReturnValidResult) if (shouldReturnValidResult)
{ {
Assert.NotNull(locations); Assert.NotNull(locations);
Cleanup(locations);
} }
else else
{ {
Assert.Null(locations); Assert.Null(locations);
} }
Cleanup(locations);
} }
/// <summary> /// <summary>