1
0

Updating to VS 2026

This commit is contained in:
2025-11-13 20:30:44 +01:00
parent 1096186c40
commit 1767b55c8a
29 changed files with 230 additions and 277 deletions

View File

@@ -11,19 +11,19 @@ namespace AMWD.Common.Tests.Extensions
{
// Arrange
var item = new TestItem { Number = 10, Text = "Ten" };
ICollection<TestItem> list = new List<TestItem>
{
ICollection<TestItem> list =
[
new() {
Number = 1,
Text = "One"
}
};
];
// Act
list.AddIfNotNull(item);
// Assert
Assert.AreEqual(2, list.Count);
Assert.HasCount(2, list);
}
[TestMethod]
@@ -31,105 +31,95 @@ namespace AMWD.Common.Tests.Extensions
{
// Arrange
TestItem item = null;
ICollection<TestItem> list = new List<TestItem>
{
ICollection<TestItem> list =
[
new() {
Number = 1,
Text = "One"
}
};
];
// Act
list.AddIfNotNull(item);
// Assert
Assert.AreEqual(1, list.Count);
Assert.HasCount(1, list);
}
[TestMethod]
[ExpectedException(typeof(ArgumentNullException))]
public void ShouldThrowArgumentNullExceptionForNullList()
{
// Arrange
var item = new TestItem { Number = 10, Text = "Ten" };
ICollection<TestItem> list = null;
// Act
list.AddIfNotNull(item);
// Assert - ArgumentNullException
// Act & Assert
Assert.ThrowsExactly<ArgumentNullException>(() => list.AddIfNotNull(item));
}
[TestMethod]
public void ShouldAddRange()
{
// Arrange
ICollection<TestItem> items = new List<TestItem>
{
ICollection<TestItem> items =
[
new() { Number = 10, Text = "Ten" },
new() { Number = 11, Text = "Eleven" },
};
ICollection<TestItem> list = new List<TestItem>
{
];
ICollection<TestItem> list =
[
new() { Number = 1, Text = "One" },
};
// Act
list.AddRange(items);
// Act
.. items,
];
// Assert
Assert.AreEqual(3, list.Count);
Assert.HasCount(3, list);
}
[TestMethod]
[ExpectedException(typeof(ArgumentNullException))]
public void ShouldThrowArgumentNullExceptionForList()
{
// Arrange
ICollection<TestItem> items = new List<TestItem>
{
ICollection<TestItem> items =
[
new() { Number = 10, Text = "Ten" },
new() { Number = 11, Text = "Eleven" },
};
];
ICollection<TestItem> list = null;
// Act
list.AddRange(items);
// Assert - ArgumentNullException
// Act & Assert
Assert.ThrowsExactly<ArgumentNullException>(() => list.AddRange(items));
}
[TestMethod]
[ExpectedException(typeof(ArgumentNullException))]
public void ShouldThrowArgumentNullExceptionForItems()
{
// Arrange
ICollection<TestItem> items = null;
ICollection<TestItem> list = new List<TestItem>
{
ICollection<TestItem> list =
[
new() { Number = 1, Text = "One" },
};
];
// Act
list.AddRange(items);
// Assert - ArgumentNullException
// Act & Assert
Assert.ThrowsExactly<ArgumentNullException>(() => list.AddRange(items));
}
[TestMethod]
public void ShouldNotAddRange()
{
// Arrange
ICollection<TestItem> list = new List<TestItem>
{
ICollection<TestItem> list =
[
new() { Number = 1, Text = "One" },
};
];
// Act
list.AddRange(list);
// Assert
Assert.AreEqual(1, list.Count);
Assert.HasCount(1, list);
}
private class TestItem

View File

@@ -7,6 +7,8 @@ namespace AMWD.Common.Tests.Extensions
[TestClass]
public class ReaderWriterLockSlimExtensionsTest
{
public TestContext TestContext { get; set; }
[TestMethod]
public void ShouldEnterReadLock()
{
@@ -151,8 +153,8 @@ namespace AMWD.Common.Tests.Extensions
}
catch (Exception)
{ /* keep it quiet */ }
});
awaitableTask.Wait();
}, TestContext.CancellationToken);
awaitableTask.Wait(TestContext.CancellationToken);
// assert
Assert.IsTrue(isTimeout);
@@ -180,8 +182,8 @@ namespace AMWD.Common.Tests.Extensions
}
catch (Exception)
{ /* keep it quiet */ }
});
awaitableTask.Wait();
}, TestContext.CancellationToken);
awaitableTask.Wait(TestContext.CancellationToken);
// assert
Assert.IsTrue(isTimeout);
@@ -209,8 +211,8 @@ namespace AMWD.Common.Tests.Extensions
}
catch (Exception)
{ /* keep it quiet */ }
});
awaitableTask.Wait();
}, TestContext.CancellationToken);
awaitableTask.Wait(TestContext.CancellationToken);
// assert
Assert.IsTrue(isTimeout);

View File

@@ -8,6 +8,8 @@ namespace AMWD.Common.Tests.Extensions
[TestClass]
public class StreamExtensionsTest
{
public TestContext TestContext { get; set; }
[TestMethod]
public void ShouldReadLineFromStreamSynchronous()
{
@@ -69,7 +71,7 @@ namespace AMWD.Common.Tests.Extensions
var stream = new MemoryStream(buffer);
// act
string line = await stream.ReadLineAsync();
string line = await stream.ReadLineAsync(cancellationToken: TestContext.CancellationToken);
// assert
Assert.AreEqual("First Line", line);
@@ -85,7 +87,7 @@ namespace AMWD.Common.Tests.Extensions
var stream = new MemoryStream(buffer);
// act
string line = await stream.ReadLineAsync();
string line = await stream.ReadLineAsync(cancellationToken: TestContext.CancellationToken);
// assert
Assert.AreEqual("Single Line", line);
@@ -100,7 +102,7 @@ namespace AMWD.Common.Tests.Extensions
var stream = new WriteOnlyStream();
// act
string line = await stream.ReadLineAsync();
string line = await stream.ReadLineAsync(cancellationToken: TestContext.CancellationToken);
// assert
Assert.IsNull(line);

View File

@@ -9,16 +9,13 @@ namespace AMWD.Common.Tests.Extensions
public class StringExtensionsTest
{
[TestMethod]
[ExpectedException(typeof(ArgumentNullException))]
public void ShouldThrowArgumentNullExceptionWhenNull()
{
// arrange
string hex = null;
// act
var bytes = hex.HexToBytes();
// assert - ArgumentNullException
// act & assert
Assert.ThrowsExactly<ArgumentNullException>(() => hex.HexToBytes());
}
[TestMethod]
@@ -35,19 +32,16 @@ namespace AMWD.Common.Tests.Extensions
Assert.IsFalse(bytes.Any());
}
[DataTestMethod]
[TestMethod]
[DataRow("aff", null)]
[DataRow("de:ad:be:e", ":")]
[DataRow("hell", "")]
[ExpectedException(typeof(FormatException))]
public void ShouldThrowFormatExceptionWhenInvalid(string hex, string delimiter)
{
// arrange
// act
var bytes = hex.HexToBytes(delimiter);
// assert - FormatException
// act & assert
Assert.ThrowsExactly<FormatException>(() => hex.HexToBytes(delimiter));
}
[TestMethod]
@@ -308,8 +302,8 @@ namespace AMWD.Common.Tests.Extensions
var nameserver = new IPEndPoint(IPAddress.Parse("1.1.1.1"), 53);
// act
bool valid = validEmail.IsValidEmailAddress(new[] { nameserver });
bool invalid = !invalidEmail.IsValidEmailAddress(new[] { nameserver });
bool valid = validEmail.IsValidEmailAddress([nameserver]);
bool invalid = !invalidEmail.IsValidEmailAddress([nameserver]);
// assert
Assert.IsTrue(valid);
@@ -349,7 +343,7 @@ namespace AMWD.Common.Tests.Extensions
// assert
Assert.AreEqual($"{value}\r{value}\r", sb.ToString());
Assert.IsFalse(sb.ToString().Contains('\n'));
Assert.DoesNotContain('\n', sb.ToString());
}
}
}