mirror of
https://github.com/ckaczor/sqltoolsservice.git
synced 2026-01-14 09:35:43 -05:00
db1e4ae351
This is another large code review. I want to make a few more changes, but since these changes will stand on their own, I'll hold back on making this change set any larger than it already is. Changes in this request: To address Microsoft/vscode-mssql#326, instead of doing taskkill on the service layer when WaitForExit is executed, we now make an educated guess at which service layer was spawned when the test starts and do a Process.Kill on it when we shut down the test. All the perf tests have been moved into a new project. This was done to keep them easily separated from code coverage test runs. At the same time the perf tests were separated into separate classes for logical categorization. This process will likely be repeated on the stress tests. The tests can still easily be ran from Visual Studio Test Explorer To address Microsoft/vscode-mssql#349, a new SelfCleaningFile class was created to allow for easy cleanup of temporary files generated for integration tests via using blocks. Due to some of the refactoring done while moving the perf tests to a new project, the TestBase class had to be switched to more of a helper class style. As such, all tests that use inherit from TestBase now create a TestBase object on start via a using block. This also simplifies the cleanup at the end of the test. * Solution for hanging code coverage runs Code coverage runs would hang in certain scenarios if a test failed before the service process could be spawned. The taskkill command would fail to find the service process. The test would then wait for opencover to exit, but it would not since the service process it had spawned would still be running, causing the test run to hang indefinitely. Solution was to capture the service process after it launched and explicitly kill it when shutting down the test driver. * Setting the test name in the propery in the class and removign the parameter from each method * New project for perf tests * Reworking integration tests to cleanup temp files * Changes as per @llali review comments * Adding copyright notices * Renaming TestBase => TestHelper * Renaming SelfCleaningFile => SelfCleaningTempFile * Removing code that sets TestName property * Fixing compilation error due to removed code
38 lines
1.2 KiB
C#
38 lines
1.2 KiB
C#
//
|
|
// Copyright (c) Microsoft. All rights reserved.
|
|
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
|
//
|
|
|
|
using System;
|
|
using System.IO;
|
|
using System.Reflection;
|
|
|
|
namespace Microsoft.SqlTools.ServiceLayer.TestDriver.Scripts
|
|
{
|
|
public class Scripts
|
|
{
|
|
|
|
public const string SimpleQuery = "SELECT * FROM sys.all_columns";
|
|
|
|
public const string DelayQuery = "WAITFOR DELAY '00:01:00'";
|
|
|
|
private static readonly Lazy<string> ComplexQueryInstance = new Lazy<string>(() =>
|
|
{
|
|
try
|
|
{
|
|
string assemblyLocation = typeof(Scripts).GetTypeInfo().Assembly.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 string.Empty;
|
|
}
|
|
});
|
|
|
|
public static string ComplexQuery { get { return ComplexQueryInstance.Value; } }
|
|
}
|
|
}
|