From 9cc9a76ba8634e932ae3d5a1dcef4bb6141c29bd Mon Sep 17 00:00:00 2001
From: Sharon Ravindran <shravind@microsoft.com>
Date: Fri, 17 Feb 2017 17:59:27 -0800
Subject: [PATCH] Fix peek definition test (#242)

* Fix UpdateLanguageService in test

* Use separate language service instance

* Remoce commented code

* Refactor test

* Fix typo
---
 .../LanguageServer/PeekDefinitionTests.cs     | 28 +++++--------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/LanguageServer/PeekDefinitionTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/LanguageServer/PeekDefinitionTests.cs
index 65f0fa72..98a05ad8 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/LanguageServer/PeekDefinitionTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/LanguageServer/PeekDefinitionTests.cs
@@ -149,28 +149,14 @@ GO";
         [Fact]
         public async Task GetUnsupportedDefinitionErrorTest()
         {
-            TestConnectionResult connectionResult = TestObjects.InitLiveConnectionInfo();
-            connectionResult.ScriptFile.Contents = "select * from dbo.func ()";
-            string ownerUri = connectionResult.ScriptFile.ClientFilePath;
-            TextDocumentPosition textDocument = new TextDocumentPosition
-            {
-                TextDocument = new TextDocumentIdentifier { Uri = ownerUri },
-                Position = new Position
-                {
-                    Line = 0,
-                    // test for 'dbo'
-                    Character = 15
-                }
-            };
-            connectionResult.TextDocumentPosition = textDocument;
-            var languageService = LanguageService.Instance;
-            await languageService.UpdateLanguageServiceOnConnection(connectionResult.ConnectionInfo);
-            ScriptParseInfo parseInfo = languageService.GetScriptParseInfo(connectionResult.ScriptFile.ClientFilePath);
-            Assert.NotNull(parseInfo);
-
-            // When I call the language service
-            var result = languageService.GetDefinition(textDocument, connectionResult.ScriptFile, connectionResult.ConnectionInfo);
+            ConnectionInfo connInfo = TestObjects.InitLiveConnectionInfoForDefinition();
+            ServerConnection serverConnection = TestObjects.InitLiveServerConnectionForDefinition(connInfo);
 
+            PeekDefinition peekDefinition = new PeekDefinition(serverConnection, connInfo);
+            string objectName = "objects";
+            string schemaName = "sys";
+            // When I try to get definition for 'Collation'
+            DefinitionResult result = peekDefinition.GetDefinitionUsingDeclarationType(DeclarationType.Collation, "master.sys.objects", objectName, schemaName);
             // Then I expect non null result with error flag set
             Assert.NotNull(result);
             Assert.True(result.IsErrorResult);