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

Fix/performancetests (#144)

Browse Source 
* some bug fixes and improvements for perf tests. If the test name file cannot be found just use the settings.json
This commit is contained in:
Leila Lali
2016-11-14 10:10:23 -08:00
committed by GitHub
parent ee9e3d75bf 80a847ff4f
commit 0d111d9316
8 changed files with 152 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/Microsoft.SqlTools.ServiceLayer.TestDriver/Program.cs
View File

@@ -87,7 +87,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver
using (var typeInstance = (IDisposable)Activator.CreateInstance(type)) using (var typeInstance = (IDisposable)Activator.CreateInstance(type))
{ {
Console.WriteLine("Running test " + testName); Console.WriteLine("Running test " + testName);
await (Task)methodInfo.Invoke(typeInstance, null); await (Task)methodInfo.Invoke(typeInstance, new object[] { testName });
Console.WriteLine("Test ran successfully: " + testName); Console.WriteLine("Test ran successfully: " + testName);
} }
} }

101
test/Microsoft.SqlTools.ServiceLayer.TestDriver/Tests/PerformanceTests.cs
View File

@@ -6,6 +6,7 @@
using System; using System;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts; using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts;
@@ -13,16 +14,34 @@ using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
using Microsoft.SqlTools.ServiceLayer.TestDriver.Utility; using Microsoft.SqlTools.ServiceLayer.TestDriver.Utility;
using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts;
using Xunit; using Xunit;
using Xunit.Sdk;
namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
{ {
public class PerformanceTests : TestBase public class PerformanceTests : TestBase
{ {
private static string ComplexQuery = File.ReadAllText("./Scripts/AdventureWorks.sql");
private static string ComplexQuery = LoadComplexScript();
private static string SimpleQuery = "SELECT * FROM sys.all_columns"; private static string SimpleQuery = "SELECT * FROM sys.all_columns";
private static string LoadComplexScript()
{
try
{
string assemblyLocation = Assembly.GetEntryAssembly().Location;
string folderName = Path.GetDirectoryName(assemblyLocation);
string filePath = Path.Combine(folderName, "Scripts/AdventureWorks.sql");
return File.ReadAllText(filePath);
}
catch(Exception ex)
{
Console.WriteLine("Failed to load the sql script. error: " + ex.Message);
return "";
}
}
[Fact] [Fact]
public async Task HoverTestOnPrem() public async Task HoverTestOnPrem(string scenarioName = "Hover")
{ {
try try
{ {
@@ -30,7 +49,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
string query = SimpleQuery; string query = SimpleQuery;
await ConnectAsync(TestServerType.OnPrem, query, ownerUri); await ConnectAsync(TestServerType.OnPrem, query, ownerUri);
Hover hover = await CalculateRunTime("Hover", async () => Hover hover = await CalculateRunTime(scenarioName, async () =>
{ {
return await RequestHover(ownerUri, query, 0, 15); ; return await RequestHover(ownerUri, query, 0, 15); ;
}); });
@@ -45,7 +64,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
} }
[Fact] [Fact]
public async Task SuggestionsTest() public async Task SuggestionsTest(string scenarioName = "Suggestions")
{ {
try try
{ {
@@ -58,7 +77,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
await ConnectAsync(serverType, query, ownerUri); await ConnectAsync(serverType, query, ownerUri);
await ValidateCompletionResponse(ownerUri, query, null); await ValidateCompletionResponse(ownerUri, query, null);
await ValidateCompletionResponse(ownerUri, query, "Suggestions"); await ValidateCompletionResponse(ownerUri, query, scenarioName);
await Disconnect(ownerUri); await Disconnect(ownerUri);
} }
@@ -69,7 +88,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
} }
[Fact] [Fact]
public async Task DiagnosticsTests() public async Task DiagnosticsTests(string scenarioName = "Diagnostics")
{ {
try try
{ {
@@ -116,7 +135,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
var completeEvent = await Driver.WaitForEvent(PublishDiagnosticsNotification.Type, 15000); var completeEvent = await Driver.WaitForEvent(PublishDiagnosticsNotification.Type, 15000);
if (completeEvent != null && completeEvent.Diagnostics != null && completeEvent.Diagnostics.Length > 0) if (completeEvent != null && completeEvent.Diagnostics != null && completeEvent.Diagnostics.Length > 0)
{ {
timer.EndAndPrint("Diagnostics"); timer.EndAndPrint(scenarioName);
break; break;
} }
if (timer.TotalMilliSecondsUntilNow >= 500000) if (timer.TotalMilliSecondsUntilNow >= 500000)
@@ -174,13 +193,13 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
} }
[Fact] [Fact]
public async Task BindingCacheColdAzureSimpleQuery() public async Task BindingCacheColdAzureSimpleQuery(string scenarioName = "[Simple query][Cold][SQL DB] Binding cache")
{ {
try try
{ {
string query = SimpleQuery; string query = SimpleQuery;
Thread.Sleep(5000); Thread.Sleep(5000);
await VerifyBindingLoadScenario(TestServerType.Azure, query, "[Simple query][Cold][SQL DB] Binding cache"); await VerifyBindingLoadScenario(TestServerType.Azure, query, scenarioName);
} }
finally finally
{ {
@@ -189,12 +208,12 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
} }
[Fact] [Fact]
public async Task BindingCacheColdOnPremSimpleQuery() public async Task BindingCacheColdOnPremSimpleQuery(string scenarioName = "[Simple query][Cold][On-Prem] Binding cache")
{ {
try try
{ {
string query = SimpleQuery; string query = SimpleQuery;
await VerifyBindingLoadScenario(TestServerType.OnPrem, query, "[Simple query][Cold][On-Prem] Binding cache"); await VerifyBindingLoadScenario(TestServerType.OnPrem, query, scenarioName);
} }
finally finally
{ {
@@ -203,7 +222,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
} }
[Fact] [Fact]
public async Task BindingCacheWarmAzureSimpleQuery() public async Task BindingCacheWarmAzureSimpleQuery(string scenarioName = "[Simple query][Warm][SQL DB] Binding cache")
{ {
try try
{ {
@@ -212,7 +231,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
TestServerType serverType = TestServerType.Azure; TestServerType serverType = TestServerType.Azure;
await ConnectAsync(serverType, query, ownerUri); await ConnectAsync(serverType, query, ownerUri);
Thread.Sleep(10000); Thread.Sleep(10000);
await VerifyBindingLoadScenario(serverType, query, "[Simple query][Warm][SQL DB] Binding cache"); await VerifyBindingLoadScenario(serverType, query, scenarioName);
} }
finally finally
{ {
@@ -221,7 +240,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
} }
[Fact] [Fact]
public async Task BindingCacheWarmOnPremSimpleQuery() public async Task BindingCacheWarmOnPremSimpleQuery(string scenarioName = "[Simple query][Warm][On-Prem] Binding cache")
{ {
try try
{ {
@@ -230,7 +249,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
TestServerType serverType = TestServerType.OnPrem; TestServerType serverType = TestServerType.OnPrem;
await ConnectAsync(serverType, query, ownerUri); await ConnectAsync(serverType, query, ownerUri);
Thread.Sleep(10000); Thread.Sleep(10000);
await VerifyBindingLoadScenario(serverType, query, "[Simple query][Warm][On-Prem] Binding cache"); await VerifyBindingLoadScenario(serverType, query, scenarioName);
} }
finally finally
{ {
@@ -239,12 +258,12 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
} }
[Fact] [Fact]
public async Task BindingCacheColdAzureComplexQuery() public async Task BindingCacheColdAzureComplexQuery(string scenarioName = "[Complex query][Cold][SQL DB] Binding cache")
{ {
try try
{ {
string query = ComplexQuery; string query = ComplexQuery;
await VerifyBindingLoadScenario(TestServerType.Azure, query, "[Complex query][Cold][SQL DB] Binding cache"); await VerifyBindingLoadScenario(TestServerType.Azure, query, scenarioName);
} }
finally finally
{ {
@@ -253,12 +272,12 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
} }
[Fact] [Fact]
public async Task BindingCacheColdOnPremComplexQuery() public async Task BindingCacheColdOnPremComplexQuery(string scenarioName = "[Complex query][Cold][On-Prem] Binding cache")
{ {
try try
{ {
string query = ComplexQuery; string query = ComplexQuery;
await VerifyBindingLoadScenario(TestServerType.OnPrem, query, "[Complex query][Cold][On-Prem] Binding cache"); await VerifyBindingLoadScenario(TestServerType.OnPrem, query, scenarioName);
} }
finally finally
{ {
@@ -267,7 +286,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
} }
[Fact] [Fact]
public async Task BindingCacheWarmAzureComplexQuery() public async Task BindingCacheWarmAzureComplexQuery(string scenarioName = "[Complex query][Warm][SQL DB] Binding cache")
{ {
try try
{ {
@@ -276,7 +295,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
TestServerType serverType = TestServerType.Azure; TestServerType serverType = TestServerType.Azure;
await ConnectAsync(serverType, query, ownerUri); await ConnectAsync(serverType, query, ownerUri);
Thread.Sleep(100000); Thread.Sleep(100000);
await VerifyBindingLoadScenario(serverType, query, "[Complex query][Warm][SQL DB] Binding cache"); await VerifyBindingLoadScenario(serverType, query, scenarioName);
} }
finally finally
{ {
@@ -285,7 +304,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
} }
[Fact] [Fact]
public async Task BindingCacheWarmOnPremComplexQuery() public async Task BindingCacheWarmOnPremComplexQuery(string scenarioName = "[Complex query][Warm][On-Prem] Binding cache")
{ {
try try
{ {
@@ -294,7 +313,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
TestServerType serverType = TestServerType.OnPrem; TestServerType serverType = TestServerType.OnPrem;
await ConnectAsync(serverType, query, ownerUri); await ConnectAsync(serverType, query, ownerUri);
Thread.Sleep(10000); Thread.Sleep(10000);
await VerifyBindingLoadScenario(serverType, query, "[Complex query][Warm][On-Prem] Binding cache"); await VerifyBindingLoadScenario(serverType, query, scenarioName);
} }
finally finally
{ {
@@ -303,7 +322,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
} }
[Fact] [Fact]
public async Task ConnectAzureTest() public async Task ConnectAzureTest(string scenarioName = "Connect SQL DB")
{ {
try try
{ {
@@ -326,7 +345,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
await RequestOpenDocumentNotification(openParams); await RequestOpenDocumentNotification(openParams);
Thread.Sleep(500); Thread.Sleep(500);
var connected = await CalculateRunTime("Connect SQL DB", async () => var connected = await CalculateRunTime(scenarioName, async () =>
{ {
var connectParams = await GetDatabaseConnectionAsync(serverType); var connectParams = await GetDatabaseConnectionAsync(serverType);
return await Connect(ownerUri, connectParams); return await Connect(ownerUri, connectParams);
@@ -340,7 +359,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
} }
[Fact] [Fact]
public async Task ConnectOnPremTest() public async Task ConnectOnPremTest(string scenarioName = "Connect On-Prem")
{ {
try try
{ {
@@ -363,7 +382,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
await RequestOpenDocumentNotification(openParams); await RequestOpenDocumentNotification(openParams);
Thread.Sleep(500); Thread.Sleep(500);
var connected = await CalculateRunTime("Connect On-Prem", async () => var connected = await CalculateRunTime(scenarioName, async () =>
{ {
var connectParams = await GetDatabaseConnectionAsync(serverType); var connectParams = await GetDatabaseConnectionAsync(serverType);
return await Connect(ownerUri, connectParams); return await Connect(ownerUri, connectParams);
@@ -377,7 +396,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
} }
[Fact] [Fact]
public async Task Disconnect() public async Task DisconnectTest(string scenarioName = "Disconnect On-Prem")
{ {
try try
{ {
@@ -386,9 +405,9 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
TestServerType serverType = TestServerType.OnPrem; TestServerType serverType = TestServerType.OnPrem;
await ConnectAsync(serverType, query, ownerUri); await ConnectAsync(serverType, query, ownerUri);
Thread.Sleep(1000); Thread.Sleep(1000);
var connected = await CalculateRunTime("Disconnect On-Prem", async () => var connected = await CalculateRunTime(scenarioName, async () =>
{ {
return await Disconnect(ownerUri); return await base.Disconnect(ownerUri);
}); });
Assert.True(connected); Assert.True(connected);
} }
@@ -399,7 +418,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
} }
[Fact] [Fact]
public async Task QueryResultSummaryOnPremTest() public async Task QueryResultSummaryOnPremTest(string scenarioName = "Basic Query Result On-Prem")
{ {
string ownerUri = Path.GetTempFileName(); string ownerUri = Path.GetTempFileName();
TestServerType serverType = TestServerType.OnPrem; TestServerType serverType = TestServerType.OnPrem;
@@ -407,7 +426,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
await ConnectAsync(serverType, query, ownerUri); await ConnectAsync(serverType, query, ownerUri);
var queryTask = await CalculateRunTime("Basic Query Result On-Prem", async () => var queryTask = await CalculateRunTime(scenarioName, async () =>
{ {
return await RunQuery(ownerUri, query); return await RunQuery(ownerUri, query);
}); });
@@ -419,7 +438,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
} }
[Fact] [Fact]
public async Task QueryResultFirstOnPremTest() public async Task QueryResultFirstOnPremTest(string scenarioName = "Basic Query Result First Rows On-Prem")
{ {
string ownerUri = Path.GetTempFileName(); string ownerUri = Path.GetTempFileName();
TestServerType serverType = TestServerType.OnPrem; TestServerType serverType = TestServerType.OnPrem;
@@ -427,7 +446,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
await ConnectAsync(serverType, query, ownerUri); await ConnectAsync(serverType, query, ownerUri);
var queryResult = await CalculateRunTime("Basic Query Result First Rows On-Prem", async () => var queryResult = await CalculateRunTime(scenarioName, async () =>
{ {
var queryTask = await RunQuery(ownerUri, query); var queryTask = await RunQuery(ownerUri, query);
return await ExecuteSubset(ownerUri, 0, 0, 0, 100); return await ExecuteSubset(ownerUri, 0, 0, 0, 100);
@@ -442,7 +461,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
[Fact] [Fact]
public async Task CancelQueryOnPremTest() public async Task CancelQueryOnPremTest(string scenarioName = "Cancel Query On-Prem")
{ {
string ownerUri = Path.GetTempFileName(); string ownerUri = Path.GetTempFileName();
TestServerType serverType = TestServerType.OnPrem; TestServerType serverType = TestServerType.OnPrem;
@@ -463,7 +482,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
var queryTask = await CancelQuery(ownerUri); var queryTask = await CancelQuery(ownerUri);
if (queryTask != null) if (queryTask != null)
{ {
timer.EndAndPrint("Cancel Query On-Prem"); timer.EndAndPrint(scenarioName);
break; break;
} }
if (timer.TotalMilliSecondsUntilNow >= 100000) if (timer.TotalMilliSecondsUntilNow >= 100000)
@@ -484,7 +503,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
} }
[Fact] [Fact]
public async Task TestSaveResultsToCsvTest() public async Task TestSaveResultsToCsvTest(string scenarioName = "Basic Query Save To CSV")
{ {
string ownerUri = Path.GetTempFileName(); string ownerUri = Path.GetTempFileName();
string query = SimpleQuery; string query = SimpleQuery;
@@ -495,7 +514,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
// Execute a query // Execute a query
await RunQuery(ownerUri, query); await RunQuery(ownerUri, query);
var saveTask = await CalculateRunTime("Basic Query Save To CSV", async () => var saveTask = await CalculateRunTime(scenarioName, async () =>
{ {
return await SaveAsCsv(ownerUri, output, 0, 0); return await SaveAsCsv(ownerUri, output, 0, 0);
}); });
@@ -504,7 +523,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
} }
[Fact] [Fact]
public async Task TestSaveResultsToJsonTest() public async Task TestSaveResultsToJsonTest(string scenarioName = "Basic Query Save To Json")
{ {
string ownerUri = Path.GetTempFileName(); string ownerUri = Path.GetTempFileName();
string query = SimpleQuery; string query = SimpleQuery;
@@ -514,7 +533,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
// Execute a query // Execute a query
await RunQuery(ownerUri, query); await RunQuery(ownerUri, query);
var saveTask = await CalculateRunTime("Basic Query Save To Json", async () => var saveTask = await CalculateRunTime(scenarioName, async () =>
{ {
return await SaveAsJson(ownerUri, output, 0, 0); return await SaveAsJson(ownerUri, output, 0, 0);
}); });
@@ -556,6 +575,8 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
TestTimer timer = new TestTimer(); TestTimer timer = new TestTimer();
T result = await testToRun(); T result = await testToRun();
timer.EndAndPrint(testName); timer.EndAndPrint(testName);
return result; return result;
} }
} }

30
test/Microsoft.SqlTools.ServiceLayer.TestDriver/Tests/TestBase.cs
View File

@@ -183,12 +183,32 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Tests
/// </summary> /// </summary>
protected async Task<ConnectParams> GetDatabaseConnectionAsync(TestServerType serverType) protected async Task<ConnectParams> GetDatabaseConnectionAsync(TestServerType serverType)
{ {
ConnectionProfile connectionProfile = null;
TestServerIdentity serverIdentiry = ConnectionTestUtils.TestServers.FirstOrDefault(x => x.ServerType == serverType); TestServerIdentity serverIdentiry = ConnectionTestUtils.TestServers.FirstOrDefault(x => x.ServerType == serverType);
var connectionProfile = ConnectionTestUtils.Setting.GetConnentProfile(serverIdentiry.ProfileName, serverIdentiry.ServerName); if (serverIdentiry == null)
Credential credential = await ReadCredential(connectionProfile.formatCredentialId()); {
ConnectParams conenctParam = ConnectionTestUtils.CreateConnectParams(connectionProfile.ServerName, connectionProfile.Database, connectionProfile = ConnectionTestUtils.Setting.Connections.FirstOrDefault(x => x.ServerType == serverType);
connectionProfile.User, credential.Password); }
return conenctParam; else
{
connectionProfile = ConnectionTestUtils.Setting.GetConnentProfile(serverIdentiry.ProfileName, serverIdentiry.ServerName);
}
if (connectionProfile != null)
{
string password = connectionProfile.Password;
if (string.IsNullOrEmpty(password))
{
Credential credential = await ReadCredential(connectionProfile.formatCredentialId());
password = credential.Password;
}
ConnectParams conenctParam = ConnectionTestUtils.CreateConnectParams(connectionProfile.ServerName, connectionProfile.Database,
connectionProfile.User, password);
return conenctParam;
}
return null;
} }
/// <summary> /// <summary>

35
test/Microsoft.SqlTools.ServiceLayer.TestDriver/Utility/ConnectionTestUtils.cs
View File

@@ -29,8 +29,15 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Utility
try try
{ {
string testServerNamesFilePath = Environment.GetEnvironmentVariable("TestServerNamesFile"); string testServerNamesFilePath = Environment.GetEnvironmentVariable("TestServerNamesFile");
string jsonFileContent = File.ReadAllText(testServerNamesFilePath); if (!string.IsNullOrEmpty(testServerNamesFilePath))
return Newtonsoft.Json.JsonConvert.DeserializeObject<IList<TestServerIdentity>>(jsonFileContent); {
string jsonFileContent = File.ReadAllText(testServerNamesFilePath);
return Newtonsoft.Json.JsonConvert.DeserializeObject<IList<TestServerIdentity>>(jsonFileContent);
}
else
{
return Enumerable.Empty<TestServerIdentity>();
}
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -106,17 +113,21 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Utility
private static string GetSettingFileContent() private static string GetSettingFileContent()
{ {
string settingsFilename; string settingsFilename;
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) settingsFilename = Environment.GetEnvironmentVariable("SettingsFileName");
if (string.IsNullOrEmpty(settingsFilename))
{ {
settingsFilename = Environment.GetEnvironmentVariable("APPDATA") + @"\Code\User\settings.json"; if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
} {
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) settingsFilename = Environment.GetEnvironmentVariable("APPDATA") + @"\Code\User\settings.json";
{ }
settingsFilename = Environment.GetEnvironmentVariable("HOME") + @"/Library/Application Support/Code/User/settings.json"; else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
} {
else settingsFilename = Environment.GetEnvironmentVariable("HOME") + @"/Library/Application Support/Code/User/settings.json";
{ }
settingsFilename = Environment.GetEnvironmentVariable("HOME") + @"/.config/Code/User/settings.json"; else
{
settingsFilename = Environment.GetEnvironmentVariable("HOME") + @"/.config/Code/User/settings.json";
}
} }
string settingsFileContents = File.ReadAllText(settingsFilename); string settingsFileContents = File.ReadAllText(settingsFilename);

2
test/Microsoft.SqlTools.ServiceLayer.TestDriver/Utility/Setting.cs
View File

@@ -54,6 +54,8 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Utility
public string ProfileName { get; set; } public string ProfileName { get; set; }
public TestServerType ServerType { get; set; }
public string formatCredentialId(string itemType = "Profile") public string formatCredentialId(string itemType = "Profile")
{ {

12
test/Microsoft.SqlTools.ServiceLayer.TestDriver/Utility/TestResult.cs Normal file
View File

@@ -0,0 +1,12 @@
//
// Copyright (c) Microsoft. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
//
namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Utility
{
public class TestResult
{
public double ElapsedTime { get; set; }
}
}

20
test/Microsoft.SqlTools.ServiceLayer.TestDriver/Utility/TestTimer.cs
View File

@@ -5,6 +5,7 @@
using System; using System;
using System.Globalization; using System.Globalization;
using System.IO;
namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Utility namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Utility
{ {
@@ -13,6 +14,20 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Utility
/// </summary> /// </summary>
public class TestTimer public class TestTimer
{ {
private static string resultFolder = InitResultFolder();
private static string InitResultFolder()
{
string resultFodler = Environment.GetEnvironmentVariable("ResultFolder");
if (string.IsNullOrEmpty(resultFodler))
{
string assemblyLocation = System.Reflection.Assembly.GetEntryAssembly().Location;
resultFodler = Path.GetDirectoryName(assemblyLocation);
}
return resultFodler;
}
public TestTimer() public TestTimer()
{ {
Start(); Start();
@@ -35,6 +50,11 @@ namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Utility
Console.ForegroundColor = ConsoleColor.Green; Console.ForegroundColor = ConsoleColor.Green;
Console.WriteLine(string.Format(CultureInfo.InvariantCulture, "Test Name: {0} Run time in milliSeconds: {1}", testName, TotalMilliSeconds)); Console.WriteLine(string.Format(CultureInfo.InvariantCulture, "Test Name: {0} Run time in milliSeconds: {1}", testName, TotalMilliSeconds));
Console.ForegroundColor = currentColor; Console.ForegroundColor = currentColor;
string resultContent = Newtonsoft.Json.JsonConvert.SerializeObject(new TestResult { ElapsedTime = TotalMilliSeconds });
string fileName = testName + ".json";
string resultFilePath = string.IsNullOrEmpty(resultFolder) ? fileName : Path.Combine(resultFolder, fileName);
File.WriteAllText(resultFilePath, resultContent);
Console.WriteLine("Result file: " + resultFilePath);
} }
public double TotalMilliSeconds public double TotalMilliSeconds

11
test/Microsoft.SqlTools.ServiceLayer.TestDriver/project.json
View File

@@ -5,10 +5,15 @@
"debugType": "portable", "debugType": "portable",
"emitEntryPoint": true, "emitEntryPoint": true,
"copyToOutput": { "copyToOutput": {
"includeFiles": [ "includeFiles": [
"Scripts/AdventureWorks.sql" "Scripts/AdventureWorks.sql"
] ]
} },
"publishOptions": {
"include": [
"Scripts/AdventureWorks.sql"
]
}
}, },
"dependencies": { "dependencies": {
"xunit": "2.1.0", "xunit": "2.1.0",