ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-16 18:47:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

removed race condition in peek definition test (#305)

Browse Source
This commit is contained in:
Aditya Bist
2017-04-04 17:57:37 -07:00
committed by GitHub
parent d9399d05f5
commit f9138b27df
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/LanguageServer/PeekDefinitionTests.cs
View File

@@ -717,23 +717,24 @@ GO";
LiveConnectionHelper.TestConnectionResult connectionResult = LiveConnectionHelper.InitLiveConnectionInfo(); LiveConnectionHelper.TestConnectionResult connectionResult = LiveConnectionHelper.InitLiveConnectionInfo();
ScriptFile scriptFile = connectionResult.ScriptFile; ScriptFile scriptFile = connectionResult.ScriptFile;
ConnectionInfo connInfo = connectionResult.ConnectionInfo; ConnectionInfo connInfo = connectionResult.ConnectionInfo;
var bindingQueue = new ConnectedBindingQueue(); var bindingQueue = new ConnectedBindingQueue();
bindingQueue.AddConnectionContext(connInfo); bindingQueue.AddConnectionContext(connInfo);
LanguageService.Instance.BindingQueue = bindingQueue;
scriptFile.Contents = queryString; scriptFile.Contents = queryString;
var service = LanguageService.Instance; var service = new LanguageService();
service.BindingQueue = bindingQueue;
await service.UpdateLanguageServiceOnConnection(connectionResult.ConnectionInfo); await service.UpdateLanguageServiceOnConnection(connectionResult.ConnectionInfo);
Thread.Sleep(2000); Thread.Sleep(2000);
ScriptParseInfo scriptInfo = new ScriptParseInfo { IsConnected = true }; ScriptParseInfo scriptInfo = new ScriptParseInfo { IsConnected = true };
scriptInfo.ConnectionKey = bindingQueue.AddConnectionContext(connInfo); scriptInfo.ConnectionKey = bindingQueue.AddConnectionContext(connInfo);
LanguageService.Instance.ScriptParseInfoMap.Add(OwnerUri, scriptInfo); service.ScriptParseInfoMap.Add(OwnerUri, scriptInfo);
// When I call the language service // When I call the language service
var objectResult = LanguageService.Instance.GetDefinition(objectDocument, scriptFile, connInfo); var objectResult = service.GetDefinition(objectDocument, scriptFile, connInfo);
var sysResult = LanguageService.Instance.GetDefinition(sysDocument, scriptFile, connInfo); var sysResult = service.GetDefinition(sysDocument, scriptFile, connInfo);
var masterResult = LanguageService.Instance.GetDefinition(masterDocument, scriptFile, connInfo); var masterResult = service.GetDefinition(masterDocument, scriptFile, connInfo);
// Then I expect the results to be non-null // Then I expect the results to be non-null
Assert.NotNull(objectResult); Assert.NotNull(objectResult);
@@ -747,7 +748,7 @@ GO";
Cleanup(objectResult.Locations); Cleanup(objectResult.Locations);
Cleanup(sysResult.Locations); Cleanup(sysResult.Locations);
Cleanup(masterResult.Locations); Cleanup(masterResult.Locations);
LanguageService.Instance.ScriptParseInfoMap.Remove(OwnerUri); service.ScriptParseInfoMap.Remove(OwnerUri);
} }
[Fact] [Fact]
@@ -772,21 +773,21 @@ GO";
ConnectionInfo connInfo = connectionResult.ConnectionInfo; ConnectionInfo connInfo = connectionResult.ConnectionInfo;
var bindingQueue = new ConnectedBindingQueue(); var bindingQueue = new ConnectedBindingQueue();
bindingQueue.AddConnectionContext(connInfo); bindingQueue.AddConnectionContext(connInfo);
LanguageService.Instance.BindingQueue = bindingQueue;
scriptFile.Contents = queryString; scriptFile.Contents = queryString;
var service = LanguageService.Instance; var service = new LanguageService();
service.BindingQueue = bindingQueue;
await service.UpdateLanguageServiceOnConnection(connectionResult.ConnectionInfo); await service.UpdateLanguageServiceOnConnection(connectionResult.ConnectionInfo);
Thread.Sleep(2000); Thread.Sleep(2000);
ScriptParseInfo scriptInfo = new ScriptParseInfo { IsConnected = true }; ScriptParseInfo scriptInfo = new ScriptParseInfo { IsConnected = true };
scriptInfo.ConnectionKey = bindingQueue.AddConnectionContext(connInfo); scriptInfo.ConnectionKey = bindingQueue.AddConnectionContext(connInfo);
LanguageService.Instance.ScriptParseInfoMap.Add(TestUri, scriptInfo); service.ScriptParseInfoMap.Add(TestUri, scriptInfo);
// When I call the language service // When I call the language service
var fnResult = LanguageService.Instance.GetDefinition(fnDocument, scriptFile, connInfo); var fnResult = service.GetDefinition(fnDocument, scriptFile, connInfo);
var sysResult = LanguageService.Instance.GetDefinition(dboDocument, scriptFile, connInfo); var sysResult = service.GetDefinition(dboDocument, scriptFile, connInfo);
var masterResult = LanguageService.Instance.GetDefinition(masterDocument, scriptFile, connInfo); var masterResult = service.GetDefinition(masterDocument, scriptFile, connInfo);
// Then I expect the results to be non-null // Then I expect the results to be non-null
Assert.NotNull(fnResult); Assert.NotNull(fnResult);
@@ -800,7 +801,7 @@ GO";
Cleanup(fnResult.Locations); Cleanup(fnResult.Locations);
Cleanup(sysResult.Locations); Cleanup(sysResult.Locations);
Cleanup(masterResult.Locations); Cleanup(masterResult.Locations);
LanguageService.Instance.ScriptParseInfoMap.Remove(TestUri); service.ScriptParseInfoMap.Remove(TestUri);
} }