ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-01-19 09:35:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Convert most tools service tests to nunit (#1037)

Browse Source 
* Remove xunit dependency from testdriver

* swap expected/actual as needed

* Convert Test.Common to nunit

* port hosting unit tests to nunit

* port batchparser integration tests to nunit

* port testdriver.tests to nunit

* fix target to copy dependency

* port servicelayer unittests to nunit

* more unit test fixes

* port integration tests to nunit

* fix test method type

* try using latest windows build for PRs

* reduce test memory use
This commit is contained in:
David Shiflet
2020-08-05 13:43:14 -04:00
committed by GitHub
parent bf4911795f
commit 839acf67cd
205 changed files with 4146 additions and 4329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/CommandOptionsTests.cs
View File

@@ -5,7 +5,7 @@
using System.IO;
using Microsoft.SqlTools.ServiceLayer.Utility;
using Xunit;
using NUnit.Framework;
namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
{
@@ -15,7 +15,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
public class CommandOptionsTests
{
[Fact]
[Test]
public void UsageIsShownWhenHelpFlagProvided()
{
var args = new string[] {"--help"};
@@ -23,10 +23,10 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
Assert.NotNull(options);
Assert.True(options.ShouldExit);
Assert.Equal(options.Locale, string.Empty);
Assert.AreEqual(options.Locale, string.Empty);
}
[Fact]
[Test]
public void UsageIsShownWhenBadArgumentsProvided()
{
var args = new string[] {"--unknown-argument", "/bad-argument"};
@@ -34,10 +34,10 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
Assert.NotNull(options);
Assert.True(options.ShouldExit);
Assert.Equal(options.Locale, string.Empty);
Assert.AreEqual(options.Locale, string.Empty);
}
[Fact]
[Test]
public void DefaultValuesAreUsedWhenNoArgumentsAreProvided()
{
int? testNo = 1;
@@ -97,10 +97,8 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
Assert.True(options.Locale == locale, $"{MsgPrefix} options:{nameof(locale)} should be '{locale}'");
}
[Theory]
[InlineData("en")]
[InlineData("es")]
public void LocaleSetWhenProvided(string locale)
[Test]
public void LocaleSetWhenProvided([Values("en", "es")] string locale)
{
var args = new string[] {"--locale", locale};
ServiceLayerCommandOptions options = new ServiceLayerCommandOptions(args); ;
@@ -108,10 +106,10 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
// Asserting all options were properly set
Assert.NotNull(options);
Assert.False(options.ShouldExit);
Assert.Equal(options.Locale, locale);
Assert.AreEqual(options.Locale, locale);
}
[Fact]
[Test]
public void ShouldExitNotSetWhenInvalidLocale()
{
string locale = "invalid";
@@ -123,7 +121,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
Assert.False(options.ShouldExit);
}
[Fact]
[Test]
public void LocaleNotSetWhenNotProvided()
{
var args = new string[] {};
@@ -132,11 +130,11 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
// Asserting all options were properly set
Assert.NotNull(options);
Assert.False(options.ShouldExit);
Assert.Equal(options.Locale, string.Empty);
Assert.AreEqual(options.Locale, string.Empty);
}
[Fact]
[Test]
public void TracingLevelSet()
{
string expectedLevel = "Information";
@@ -146,10 +144,10 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
// Asserting all options were properly set
Assert.NotNull(options);
Assert.False(options.ShouldExit);
Assert.Equal(options.TracingLevel, expectedLevel);
Assert.AreEqual(options.TracingLevel, expectedLevel);
}
[Fact]
[Test]
public void AutoFlushLogSet()
{
bool expectedAutoFlush = true;
@@ -159,10 +157,10 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
// Asserting all options were properly set
Assert.NotNull(options);
Assert.False(options.ShouldExit);
Assert.Equal(options.AutoFlushLog, expectedAutoFlush);
Assert.AreEqual(options.AutoFlushLog, expectedAutoFlush);
}
[Fact]
[Test]
public void LogFilePathSet()
{
string expectedFilePath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
@@ -172,7 +170,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
// Asserting all options were properly set
Assert.NotNull(options);
Assert.False(options.ShouldExit);
Assert.Equal(options.LogFilePath, expectedFilePath);
Assert.AreEqual(options.LogFilePath, expectedFilePath);
}
}
}

126
test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/LongListTests.cs
View File

@@ -6,7 +6,7 @@
using System;
using System.Linq;
using Microsoft.SqlTools.ServiceLayer.Utility;
using Xunit;
using NUnit.Framework;
namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
{
@@ -15,7 +15,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
/// </summary>
public class LongListTests
{
[Fact]
[Test]
public void LongListConstruction()
{
// If: I construct a new long list
@@ -23,42 +23,36 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
// Then:
// ... There should be no values in the list
Assert.Equal(0, ll.Count);
Assert.AreEqual(0, ll.Count);
}
#region GetItem / Add Tests
[Theory]
[InlineData(-1L)] // Negative index
[InlineData(0L)] // Index equal to count of elements
[InlineData(100L)] // Index larger than elements
public void GetItemOutOfRange(long index)
[Test]
public void GetItemOutOfRange([Values(-1L, 0L, 100L)] long index)
{
// If: I construct a new long list
LongList<char> ll = new LongList<char>();
// Then:
// ... There should be no values in the list
Assert.Throws<ArgumentOutOfRangeException>(() => ll[index]);
Assert.Throws<ArgumentOutOfRangeException>(() => { var x = ll[index]; }) ;
Assert.Throws<ArgumentOutOfRangeException>(() => ll.GetItem(index));
}
[Theory]
[InlineData(0)] // Element at beginning
[InlineData(1)] // Element in middle
[InlineData(2)] // Element at end
public void GetItemNotExpanded(long index)
[Test]
public void GetItemNotExpanded([Values(0,1,2)] long index)
{
// If: I construct a new long list with a couple items in it
LongList<int> ll = new LongList<int> {0, 1, 2};
// Then: I can read back the value from the list
Assert.Equal(3, ll.Count);
Assert.Equal(index, ll[index]);
Assert.Equal(index, ll.GetItem(index));
Assert.AreEqual(3, ll.Count);
Assert.AreEqual(index, ll[index]);
Assert.AreEqual(index, ll.GetItem(index));
}
[Fact]
[Test]
public void GetItemExanded()
{
// If: I construct a new long list that is guaranteed to have been expanded
@@ -70,11 +64,11 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
// Then:
// ... All the added values should be accessible
Assert.Equal(10, ll.Count);
Assert.AreEqual(10, ll.Count);
for (int i = 0; i < 10; i++)
{
Assert.Equal(i, ll[i]);
Assert.Equal(i, ll.GetItem(i));
Assert.AreEqual(i, ll[i]);
Assert.AreEqual(i, ll.GetItem(i));
}
}
@@ -82,11 +76,8 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
#region SetItem Tests
[Theory]
[InlineData(-1L)] // Negative index
[InlineData(0L)] // Index equal to count of elements
[InlineData(100L)] // Index larger than elements
public void SetItemOutOfRange(long index)
[Test]
public void SetItemOutOfRange([Values(-1L, 0L, 100L)] long index)
{
// If: I construct a new long list
LongList<int> ll = new LongList<int>();
@@ -97,7 +88,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
Assert.Throws<ArgumentOutOfRangeException>(() => ll.SetItem(index, 8));
}
[Fact]
[Test]
public void SetItemNotExpanded()
{
// If:
@@ -109,11 +100,10 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
ll.SetItem(i, 8);
}
// Then: All values in the list should be 8
Assert.All(ll, i => Assert.Equal(8, i));
Assert.That(ll, Has.All.EqualTo(8), "All values in the list should be 8");
}
[Fact]
[Test]
public void SetItemIndexerNotExpanded()
{
// If:
@@ -125,11 +115,10 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
ll[i] = 8;
}
// Then: All values in the list should be 8
Assert.All(ll, i => Assert.Equal(8, i));
Assert.That(ll, Has.All.EqualTo(8), "All values in the list should be 8");
}
[Fact]
[Test]
public void SetItemExpanded()
{
// If:
@@ -146,11 +135,10 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
ll.SetItem(i, 8);
}
// Then: All values in the list should be 8
Assert.All(ll, i => Assert.Equal(8, i));
Assert.That(ll, Has.All.EqualTo(8), "All values in the list should be 8");
}
[Fact]
[Test]
public void SetItemIndexerExpanded()
{
// If:
@@ -167,19 +155,15 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
ll[i] = 8;
}
// Then: All values in the list should be 8
Assert.All(ll, i => Assert.Equal(8, i));
Assert.That(ll, Has.All.EqualTo(8), "All values in the list should be 8");
}
#endregion
#region RemoveAt Tests
[Theory]
[InlineData(-1L)] // Negative index
[InlineData(0L)] // Index equal to count of elements
[InlineData(100L)] // Index larger than elements
public void RemoveOutOfRange(long index)
[Test]
public void RemoveOutOfRange([Values(-1L, 0L, 100L)] long index)
{
// If: I construct a new long list
LongList<char> ll = new LongList<char>();
@@ -189,11 +173,8 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
Assert.Throws<ArgumentOutOfRangeException>(() => ll.RemoveAt(index));
}
[Theory]
[InlineData(0)] // Remove at beginning of list
[InlineData(2)] // Remove from middle of list
[InlineData(4)] // Remove at end of list
public void RemoveAtNotExpanded(long index)
[Test]
public void RemoveAtNotExpanded([Values(0,2,4)] long index)
{
// If:
// ... I create a long list with a few elements in it (and one element that will be removed)
@@ -208,13 +189,12 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
// Then:
// ... The count should have subtracted
Assert.Equal(4, ll.Count);
Assert.AreEqual(4, ll.Count);
// ... All values should be 8 since we removed the 1
Assert.All(ll, i => Assert.Equal(8, i));
Assert.That(ll, Has.All.EqualTo(8), "All values in the list should be 8 since we removed the 1");
}
[Fact]
[Test]
public void RemoveAtExpanded()
{
// If:
@@ -240,7 +220,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
// ... The second half of the values should still remain
for (int i = 0; i < 10; i++)
{
Assert.Equal(i, ll[i]);
Assert.AreEqual(i, ll[i]);
}
// If:
@@ -256,7 +236,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
for (int i = 0; i < 10; i++)
{
int index = j * 10 + i;
Assert.Equal(i, ll[index]);
Assert.AreEqual(i, ll[index]);
}
}
}
@@ -265,7 +245,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
#region IEnumerable Tests
[Fact]
[Test]
public void GetEnumerator()
{
// Setup: Create a long list with a handful of elements
@@ -280,11 +260,11 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
int val = 0;
foreach (int element in ll)
{
Assert.Equal(val++, element);
Assert.AreEqual(val++, element);
}
}
[Fact]
[Test]
public void GetEnumeratorExpanded()
{
// Setup: Create a long list with a handful of elements
@@ -299,15 +279,12 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
int val = 0;
foreach (int element in ll)
{
Assert.Equal(val++, element);
Assert.AreEqual(val++, element);
}
}
[Theory]
[InlineData(-1)] // Negative
[InlineData(5)] // Equal to count
[InlineData(100)] // Far too large
public void LongSkipOutOfRange(long index)
[Test]
public void LongSkipOutOfRange([Values(-1,5,100)] long index)
{
// Setup: Create a long list with a handful of elements
LongList<int> ll = new LongList<int> {ExpandListSize = 2};
@@ -323,10 +300,8 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
Assert.Throws<ArgumentOutOfRangeException>(() => ll.LongSkip(index).ToArray());
}
[Theory]
[InlineData(0)] // Don't actually skip anything
[InlineData(2)] // Skip within the short list
public void LongSkip(long index)
[Test]
public void LongSkip([Values(0,2)] long index)
{
// Setup: Create a long list with a handful of elements
LongList<int> ll = new LongList<int>();
@@ -341,15 +316,12 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
// Then: The elements including the skip start index should be in the output
for (int i = 0; i < values.Length; i++)
{
Assert.Equal(ll[i+index], values[i]);
Assert.AreEqual(ll[i+index], values[i]);
}
}
[Theory]
[InlineData(0)] // Don't actually skip anything
[InlineData(1)] // Skip within the short list
[InlineData(3)] // Skip across expanded lists
public void LongSkipExpanded(long index)
[Test]
public void LongSkipExpanded([Values(0,1,3)] long index)
{
// Setup: Create a long list with a handful of elements
LongList<int> ll = new LongList<int> {ExpandListSize = 2};
@@ -364,7 +336,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
// Then: The elements including the skip start index should be in the output
for (int i = 0; i < values.Length; i++)
{
Assert.Equal(ll[i+index], values[i]);
Assert.AreEqual(ll[i+index], values[i]);
}
}
@@ -373,7 +345,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
/// <summary>
/// Add and remove and item in a LongList causing an expansion
/// </summary>
[Fact]
[Test]
public void LongListExpandTest()
{
var longList = new LongList<int> {ExpandListSize = 3};
@@ -381,7 +353,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
{
longList.Add(i);
}
Assert.Equal(longList.Count, 6);
Assert.AreEqual(6, longList.Count);
Assert.NotNull(longList.GetItem(4));
bool didEnum = false;
@@ -394,7 +366,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
Assert.True(didEnum);
longList.RemoveAt(4);
Assert.Equal(longList.Count, 5);
Assert.AreEqual(5, longList.Count);
}
}
}

4
test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/SrTests.cs
View File

@@ -4,7 +4,7 @@
//
using System.Globalization;
using Xunit;
using NUnit.Framework;
using ServiceLayerSr = Microsoft.SqlTools.ServiceLayer.SR;
@@ -15,7 +15,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
/// <summary>
/// Add and remove and item in a LongList
/// </summary>
[Fact]
[Test]
public void SrPropertiesTest()
{
ServiceLayerSr.Culture = CultureInfo.CurrentCulture;

34
test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TaskExtensionTests.cs
View File

@@ -6,7 +6,7 @@
using System;
using System.Threading.Tasks;
using Microsoft.SqlTools.ServiceLayer.Utility;
using Xunit;
using NUnit.Framework;
namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
{
@@ -14,7 +14,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
{
#region Continue with Action
[Fact]
[Test]
public async Task ContinueWithOnFaultedActionNullContinuation()
{
// Setup: Create a task that will definitely fault
@@ -26,10 +26,10 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
await continuationTask;
// Then: The task should have completed without fault
Assert.Equal(TaskStatus.RanToCompletion, continuationTask.Status);
Assert.AreEqual(TaskStatus.RanToCompletion, continuationTask.Status);
}
[Fact]
[Test]
public async Task ContinueWithOnFaultedActionContinuatation()
{
// Setup:
@@ -46,13 +46,13 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
// Then:
// ... The task should have completed without fault
Assert.Equal(TaskStatus.RanToCompletion, continuationTask.Status);
Assert.AreEqual(TaskStatus.RanToCompletion, continuationTask.Status);
// ... The continuation action should have been called with the original failure task
Assert.Equal(failureTask, providedTask);
Assert.AreEqual(failureTask, providedTask);
}
[Fact]
[Test]
public async Task ContinueWithOnFaultedActionExceptionInContinuation()
{
// Setup:
@@ -74,17 +74,17 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
// Then:
// ... The task should have completed without fault
Assert.Equal(TaskStatus.RanToCompletion, continuationTask.Status);
Assert.AreEqual(TaskStatus.RanToCompletion, continuationTask.Status);
// ... The continuation action should have been called with the original failure task
Assert.Equal(failureTask, providedTask);
Assert.AreEqual(failureTask, providedTask);
}
#endregion
#region Continue with Task
[Fact]
[Test]
public async Task ContinueWithOnFaultedFuncNullContinuation()
{
// Setup: Create a task that will definitely fault
@@ -97,10 +97,10 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
await continuationTask;
// Then: The task should have completed without fault
Assert.Equal(TaskStatus.RanToCompletion, continuationTask.Status);
Assert.AreEqual(TaskStatus.RanToCompletion, continuationTask.Status);
}
[Fact]
[Test]
public async Task ContinueWithOnFaultedFuncContinuatation()
{
// Setup:
@@ -122,13 +122,13 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
// Then:
// ... The task should have completed without fault
Assert.Equal(TaskStatus.RanToCompletion, continuationTask.Status);
Assert.AreEqual(TaskStatus.RanToCompletion, continuationTask.Status);
// ... The continuation action should have been called with the original failure task
Assert.Equal(failureTask, providedTask);
Assert.AreEqual(failureTask, providedTask);
}
[Fact]
[Test]
public async Task ContinueWithOnFaultedFuncExceptionInContinuation()
{
// Setup:
@@ -150,10 +150,10 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
// Then:
// ... The task should have completed without fault
Assert.Equal(TaskStatus.RanToCompletion, continuationTask.Status);
Assert.AreEqual(TaskStatus.RanToCompletion, continuationTask.Status);
// ... The continuation action should have been called with the original failure task
Assert.Equal(failureTask, providedTask);
Assert.AreEqual(failureTask, providedTask);
}
#endregion

4
test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TestUtils.cs
View File

@@ -4,7 +4,7 @@ using System.Threading.Tasks;
using Microsoft.SqlTools.Hosting.Protocol;
using Microsoft.SqlTools.ServiceLayer.Test.Common.RequestContextMocking;
using Moq;
using Xunit;
using NUnit.Framework;
namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
{
@@ -47,7 +47,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
public static void VerifyResult<T, U>(Mock<RequestContext<T>> contextMock, U expected, U actual)
{
contextMock.Verify(c => c.SendResult(It.IsAny<T>()), Times.Once);
Assert.Equal(expected, actual);
Assert.AreEqual(expected, actual);
contextMock.Verify(c => c.SendError(It.IsAny<string>(), It.IsAny<int>()), Times.Never);
}

14
test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/TextUtilitiesTests.cs
View File

@@ -4,7 +4,7 @@
//
using Microsoft.SqlTools.Utility;
using Xunit;
using NUnit.Framework;
namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
{
@@ -13,7 +13,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
/// </summary>
public class TextUtilitiesTests
{
[Fact]
[Test]
public void PositionOfCursorFirstLine()
{
string sql = "EXEC sys.fn_isrolemember ";
@@ -21,11 +21,11 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
int prevNewLine;
int cursorPosition = TextUtilities.PositionOfCursor(sql, 0, sql.Length, out prevNewLine);
Assert.Equal(prevNewLine, 0);
Assert.Equal(cursorPosition, sql.Length);
Assert.AreEqual(0, prevNewLine);
Assert.AreEqual(cursorPosition, sql.Length);
}
[Fact]
[Test]
public void PositionOfCursorSecondLine()
{
string sql = "--lineone\nEXEC sys.fn_isrolemember ";
@@ -33,8 +33,8 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
int prevNewLine;
int cursorPosition = TextUtilities.PositionOfCursor(sql, 1, 15, out prevNewLine);
Assert.Equal(prevNewLine, 10);
Assert.Equal(cursorPosition, 25);
Assert.AreEqual(10, prevNewLine);
Assert.AreEqual(25, cursorPosition);
}
}
}

10
test/Microsoft.SqlTools.ServiceLayer.UnitTests/Utility/ValidateTests.cs
View File

@@ -5,31 +5,31 @@
using System;
using Microsoft.SqlTools.Utility;
using Xunit;
using NUnit.Framework;
namespace Microsoft.SqlTools.ServiceLayer.UnitTests.Utility
{
public class ValidateTests
{
[Fact]
[Test]
public void IsWithinRangeTest()
{
Assert.Throws<ArgumentOutOfRangeException>(() => Validate.IsWithinRange("parameterName", 1, 2, 3));
}
[Fact]
[Test]
public void IsLessThanTest()
{
Assert.Throws<ArgumentOutOfRangeException>(() => Validate.IsLessThan("parameterName", 2, 1));
}
[Fact]
[Test]
public void IsNotEqualTest()
{
Assert.Throws<ArgumentException>(() => Validate.IsNotEqual<int>("parameterName", 1, 1));
}
[Fact]
[Test]
public void IsNullOrWhiteSpaceTest()
{
Assert.Throws<ArgumentException>(() => Validate.IsNotNullOrWhitespaceString("parameterName", null));