ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-01-13 17:23:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert change to nunit and restore xunit (#2249)

Browse Source 
* Revert "Added new test framework (test) (#2247)"

This reverts commit b2120269a7.

* Added assert Fail as a test
This commit is contained in:
Alex Ma
2023-09-22 13:07:48 -07:00
committed by GitHub
parent b2120269a7
commit d3c28d358f
7 changed files with 40 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/Microsoft.SqlTools.ServiceLayer.PerfTests/Microsoft.SqlTools.ServiceLayer.PerfTests.csproj
View File

@@ -21,9 +21,7 @@
<ProjectReference Include="../Microsoft.SqlTools.ServiceLayer.Test.Common/Microsoft.SqlTools.ServiceLayer.Test.Common.csproj" /> <ProjectReference Include="../Microsoft.SqlTools.ServiceLayer.Test.Common/Microsoft.SqlTools.ServiceLayer.Test.Common.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="nunit" /> <PackageReference Include="xunit" />
<PackageReference Include="nunit3testadapter" />
<PackageReference Include="nunit.console" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" /> <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />

8
test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/ConnectionTests.cs
View File

@@ -9,14 +9,14 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.SqlTools.ServiceLayer.Test.Common; using Microsoft.SqlTools.ServiceLayer.Test.Common;
using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts;
using NUnit.Framework; using Xunit;
namespace Microsoft.SqlTools.ServiceLayer.PerfTests namespace Microsoft.SqlTools.ServiceLayer.PerfTests
{ {
public class ConnectionTests public class ConnectionTests
{ {
[Test] [Fact]
[CreateTestDb(TestServerType.Azure)] [CreateTestDb(TestServerType.Azure)]
public async Task ConnectAzureTest() public async Task ConnectAzureTest()
{ {
@@ -53,7 +53,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
}); });
} }
[Test] [Fact]
[CreateTestDb(TestServerType.OnPrem)] [CreateTestDb(TestServerType.OnPrem)]
public async Task ConnectOnPremTest() public async Task ConnectOnPremTest()
{ {
@@ -91,7 +91,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
}); });
} }
[Test] [Fact]
[CreateTestDb(TestServerType.OnPrem)] [CreateTestDb(TestServerType.OnPrem)]
public async Task DisconnectTest() public async Task DisconnectTest()
{ {

24
test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/IntellisenseTests.cs
View File

@@ -13,14 +13,14 @@ using System.Threading.Tasks;
using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts; using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts;
using Microsoft.SqlTools.ServiceLayer.Test.Common; using Microsoft.SqlTools.ServiceLayer.Test.Common;
using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts; using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts;
using NUnit.Framework; using Xunit;
using Range = Microsoft.SqlTools.ServiceLayer.Workspace.Contracts.Range; using Range = Microsoft.SqlTools.ServiceLayer.Workspace.Contracts.Range;
namespace Microsoft.SqlTools.ServiceLayer.PerfTests namespace Microsoft.SqlTools.ServiceLayer.PerfTests
{ {
public class IntellisenseTests public class IntellisenseTests
{ {
[Test] [Fact]
[CreateTestDb(TestServerType.OnPrem)] [CreateTestDb(TestServerType.OnPrem)]
public async Task HoverTestOnPrem() public async Task HoverTestOnPrem()
{ {
@@ -40,7 +40,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
}); });
} }
[Test] [Fact]
[CreateTestDb(TestServerType.OnPrem)] [CreateTestDb(TestServerType.OnPrem)]
public async Task SuggestionsTest() public async Task SuggestionsTest()
{ {
@@ -59,7 +59,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
}); });
} }
[Test] [Fact]
[CreateTestDb(TestServerType.OnPrem)] [CreateTestDb(TestServerType.OnPrem)]
public async Task DiagnosticsTests() public async Task DiagnosticsTests()
{ {
@@ -114,7 +114,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
}); });
} }
[Test] [Fact]
[CreateTestDb(TestServerType.Azure)] [CreateTestDb(TestServerType.Azure)]
public async Task BindingCacheColdAzureSimpleQuery() public async Task BindingCacheColdAzureSimpleQuery()
{ {
@@ -128,7 +128,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
}); });
} }
[Test] [Fact]
[CreateTestDb(TestServerType.OnPrem)] [CreateTestDb(TestServerType.OnPrem)]
public async Task BindingCacheColdOnPremSimpleQuery() public async Task BindingCacheColdOnPremSimpleQuery()
{ {
@@ -143,7 +143,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
} }
[Test] [Fact]
[CreateTestDb(TestServerType.Azure)] [CreateTestDb(TestServerType.Azure)]
public async Task BindingCacheWarmAzureSimpleQuery() public async Task BindingCacheWarmAzureSimpleQuery()
{ {
@@ -159,7 +159,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
}); });
} }
[Test] [Fact]
[CreateTestDb(TestServerType.OnPrem)] [CreateTestDb(TestServerType.OnPrem)]
public async Task BindingCacheWarmOnPremSimpleQuery() public async Task BindingCacheWarmOnPremSimpleQuery()
{ {
@@ -176,7 +176,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
}); });
} }
[Test] [Fact]
[CreateTestDb(TestServerType.Azure)] [CreateTestDb(TestServerType.Azure)]
public async Task BindingCacheColdAzureComplexQuery() public async Task BindingCacheColdAzureComplexQuery()
{ {
@@ -191,7 +191,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
}); });
} }
[Test] [Fact]
[CreateTestDb(TestServerType.OnPrem)] [CreateTestDb(TestServerType.OnPrem)]
public async Task BindingCacheColdOnPremComplexQuery() public async Task BindingCacheColdOnPremComplexQuery()
{ {
@@ -205,7 +205,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
}); });
} }
[Test] [Fact]
[CreateTestDb(TestServerType.Azure)] [CreateTestDb(TestServerType.Azure)]
public async Task BindingCacheWarmAzureComplexQuery() public async Task BindingCacheWarmAzureComplexQuery()
{ {
@@ -221,7 +221,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
}); });
} }
[Test] [Fact]
[CreateTestDb(TestServerType.OnPrem)] [CreateTestDb(TestServerType.OnPrem)]
public async Task BindingCacheWarmOnPremComplexQuery() public async Task BindingCacheWarmOnPremComplexQuery()
{ {

14
test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/ObjectExplorerTests.cs
View File

@@ -11,13 +11,13 @@ using System.Threading.Tasks;
using Microsoft.SqlTools.ServiceLayer.Connection.Contracts; using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Contracts; using Microsoft.SqlTools.ServiceLayer.ObjectExplorer.Contracts;
using Microsoft.SqlTools.ServiceLayer.Test.Common; using Microsoft.SqlTools.ServiceLayer.Test.Common;
using NUnit.Framework; using Xunit;
namespace Microsoft.SqlTools.ServiceLayer.PerfTests namespace Microsoft.SqlTools.ServiceLayer.PerfTests
{ {
public class ObjectExplorerTests public class ObjectExplorerTests
{ {
[Test] [Fact]
[CreateTestDb(TestServerType.Azure)] [CreateTestDb(TestServerType.Azure)]
public async Task CreateSessionAzure() public async Task CreateSessionAzure()
{ {
@@ -25,7 +25,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
await VerifyCreateSession(serverType); await VerifyCreateSession(serverType);
} }
[Test] [Fact]
[CreateTestDb(TestServerType.OnPrem)] [CreateTestDb(TestServerType.OnPrem)]
public async Task CreateSessionOnPrem() public async Task CreateSessionOnPrem()
{ {
@@ -33,7 +33,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
await VerifyCreateSession(serverType); await VerifyCreateSession(serverType);
} }
[Test] [Fact]
[CreateTestDb(TestServerType.OnPrem)] [CreateTestDb(TestServerType.OnPrem)]
public async Task ExpandDatabasesOnPrem() public async Task ExpandDatabasesOnPrem()
{ {
@@ -41,7 +41,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
await VerifyExpand(serverType, SqlTestDb.MasterDatabaseName); await VerifyExpand(serverType, SqlTestDb.MasterDatabaseName);
} }
[Test] [Fact]
[CreateTestDb(TestServerType.OnPrem)] [CreateTestDb(TestServerType.OnPrem)]
public async Task ExpandOneDatabaseOnPrem() public async Task ExpandOneDatabaseOnPrem()
{ {
@@ -49,7 +49,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
await VerifyExpand(serverType, Common.PerfTestDatabaseName); await VerifyExpand(serverType, Common.PerfTestDatabaseName);
} }
[Test] [Fact]
[CreateTestDb(TestServerType.Azure)] [CreateTestDb(TestServerType.Azure)]
public async Task ExpandDatabasesAzure() public async Task ExpandDatabasesAzure()
{ {
@@ -57,7 +57,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
await VerifyExpand(serverType, SqlTestDb.MasterDatabaseName); await VerifyExpand(serverType, SqlTestDb.MasterDatabaseName);
} }
[Test] [Fact]
[CreateTestDb(TestServerType.Azure)] [CreateTestDb(TestServerType.Azure)]
public async Task ExpandOneDatabaseAzure() public async Task ExpandOneDatabaseAzure()
{ {

20
test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/QueryExecutionTests.cs
View File

@@ -11,61 +11,61 @@ using System.Runtime.CompilerServices;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts.ExecuteRequests; using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts.ExecuteRequests;
using Microsoft.SqlTools.ServiceLayer.Test.Common; using Microsoft.SqlTools.ServiceLayer.Test.Common;
using NUnit.Framework; using Xunit;
namespace Microsoft.SqlTools.ServiceLayer.PerfTests namespace Microsoft.SqlTools.ServiceLayer.PerfTests
{ {
public class QueryExecutionTests public class QueryExecutionTests
{ {
[Test] [Fact]
public async Task QueryResultSummaryOnPremTest() public async Task QueryResultSummaryOnPremTest()
{ {
await QueryResultSummaryOnPremTestCore(TestServerType.OnPrem, Scripts.MasterBasicQuery); await QueryResultSummaryOnPremTestCore(TestServerType.OnPrem, Scripts.MasterBasicQuery);
} }
[Test] [Fact]
public async Task QueryResultFirstOnPremTest() public async Task QueryResultFirstOnPremTest()
{ {
await QueryResultFirstOnPremTestCore(TestServerType.OnPrem, Scripts.MasterBasicQuery); await QueryResultFirstOnPremTestCore(TestServerType.OnPrem, Scripts.MasterBasicQuery);
} }
[Test] [Fact]
public async Task LongQueryResultSummaryOnPremTest() public async Task LongQueryResultSummaryOnPremTest()
{ {
await QueryResultSummaryOnPremTestCore(TestServerType.OnPrem, Scripts.MasterLongQuery); await QueryResultSummaryOnPremTestCore(TestServerType.OnPrem, Scripts.MasterLongQuery);
} }
[Test] [Fact]
public async Task LongQueryResultFirstOnPremTest() public async Task LongQueryResultFirstOnPremTest()
{ {
await QueryResultFirstOnPremTestCore(TestServerType.OnPrem, Scripts.MasterLongQuery); await QueryResultFirstOnPremTestCore(TestServerType.OnPrem, Scripts.MasterLongQuery);
} }
[Test] [Fact]
public async Task QueryResultSummaryOnAzureTest() public async Task QueryResultSummaryOnAzureTest()
{ {
await QueryResultSummaryOnPremTestCore(TestServerType.Azure, Scripts.MasterBasicQuery); await QueryResultSummaryOnPremTestCore(TestServerType.Azure, Scripts.MasterBasicQuery);
} }
[Test] [Fact]
public async Task QueryResultFirstOnAzureTest() public async Task QueryResultFirstOnAzureTest()
{ {
await QueryResultFirstOnPremTestCore(TestServerType.Azure, Scripts.MasterBasicQuery); await QueryResultFirstOnPremTestCore(TestServerType.Azure, Scripts.MasterBasicQuery);
} }
[Test] [Fact]
public async Task LongQueryResultSummaryOnAzureTest() public async Task LongQueryResultSummaryOnAzureTest()
{ {
await QueryResultSummaryOnPremTestCore(TestServerType.Azure, Scripts.MasterLongQuery); await QueryResultSummaryOnPremTestCore(TestServerType.Azure, Scripts.MasterLongQuery);
} }
[Test] [Fact]
public async Task LongQueryResultFirstOnAzureTest() public async Task LongQueryResultFirstOnAzureTest()
{ {
await QueryResultFirstOnPremTestCore(TestServerType.Azure, Scripts.MasterLongQuery); await QueryResultFirstOnPremTestCore(TestServerType.Azure, Scripts.MasterLongQuery);
} }
[Test] [Fact]
[CreateTestDb(TestServerType.OnPrem)] [CreateTestDb(TestServerType.OnPrem)]
public async Task CancelQueryOnPremTest() public async Task CancelQueryOnPremTest()
{ {

6
test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/SaveResultsTests.cs
View File

@@ -7,13 +7,13 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.SqlTools.ServiceLayer.Test.Common; using Microsoft.SqlTools.ServiceLayer.Test.Common;
using NUnit.Framework; using Xunit;
namespace Microsoft.SqlTools.ServiceLayer.PerfTests namespace Microsoft.SqlTools.ServiceLayer.PerfTests
{ {
public class SaveResultsTests public class SaveResultsTests
{ {
[Test] [Fact]
public async Task TestSaveResultsToCsvTest() public async Task TestSaveResultsToCsvTest()
{ {
await TestServiceDriverProvider.RunTestIterations(async (timer) => await TestServiceDriverProvider.RunTestIterations(async (timer) =>
@@ -35,7 +35,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
}); });
} }
[Test] [Fact]
public async Task TestSaveResultsToJsonTest() public async Task TestSaveResultsToJsonTest()
{ {
await TestServiceDriverProvider.RunTestIterations(async (timer) => await TestServiceDriverProvider.RunTestIterations(async (timer) =>

6
test/Microsoft.SqlTools.ServiceLayer.PerfTests/Tests/ScriptinTests.cs
View File

@@ -11,13 +11,13 @@ using System.Threading.Tasks;
using Microsoft.SqlTools.ServiceLayer.Test.Common; using Microsoft.SqlTools.ServiceLayer.Test.Common;
using Microsoft.SqlTools.SqlCore.Scripting; using Microsoft.SqlTools.SqlCore.Scripting;
using Microsoft.SqlTools.SqlCore.Scripting.Contracts; using Microsoft.SqlTools.SqlCore.Scripting.Contracts;
using NUnit.Framework; using Xunit;
namespace Microsoft.SqlTools.ServiceLayer.PerfTests namespace Microsoft.SqlTools.ServiceLayer.PerfTests
{ {
public class ScriptingTests public class ScriptingTests
{ {
[Test] [Fact]
[CreateTestDb(TestServerType.Azure)] [CreateTestDb(TestServerType.Azure)]
public async Task ScripTableAzure() public async Task ScripTableAzure()
{ {
@@ -25,7 +25,7 @@ namespace Microsoft.SqlTools.ServiceLayer.PerfTests
await VerifyScriptTable(serverType); await VerifyScriptTable(serverType);
} }
[Test] [Fact]
[CreateTestDb(TestServerType.OnPrem)] [CreateTestDb(TestServerType.OnPrem)]
public async Task ScripTableOnPrem() public async Task ScripTableOnPrem()
{ {