From c797a7ce05f94f388ab5b2a6d8d7049861448184 Mon Sep 17 00:00:00 2001 From: Corniel Nobel Date: Thu, 28 Mar 2024 16:31:52 +0100 Subject: [PATCH] Update remaining Asserts (except legacy tests). --- .../Chemistry/CAS_Registry_Number_specs.cs | 6 ++--- .../Customization/Generic_SVO_specs.cs | 4 +-- specs/Qowaiv.Specs/Date_span_specs.cs | 4 +-- specs/Qowaiv.Specs/Date_specs.cs | 4 +-- specs/Qowaiv.Specs/Email_address_specs.cs | 4 +-- specs/Qowaiv.Specs/Financial/IBAN_specs.cs | 6 ++--- .../FluentAssertions/UuidAssertions.cs | 10 +++---- specs/Qowaiv.Specs/HouseNumber_specs.cs | 4 +-- specs/Qowaiv.Specs/IO/StreamSize_specs.cs | 4 +-- .../Identifiers/Id_for_Int32_specs.cs | 4 +-- .../Identifiers/Id_for_Int64_specs.cs | 4 +-- .../Identifiers/Id_for_String_specs.cs | 4 +-- .../Mathematics/Fraction_specs.cs | 4 +-- specs/Qowaiv.Specs/Month_span_specs.cs | 4 +-- specs/Qowaiv.Specs/Month_specs.cs | 4 +-- specs/Qowaiv.Specs/Percentage_specs.cs | 27 ++++++++++--------- specs/Qowaiv.Specs/Postal_code_specs.cs | 4 +-- .../Reflection/QowaivType_specs.cs | 6 ++--- specs/Qowaiv.Specs/Sex_specs.cs | 4 +-- specs/Qowaiv.Specs/Sql/Timestamp_specs.cs | 4 +-- specs/Qowaiv.Specs/Statistics/Elo_specs.cs | 4 +-- .../Sustainability/Energy_label_specs.cs | 6 ++--- specs/Qowaiv.Specs/UUID_specs.cs | 12 +++++---- .../Web/Internet_media_type_specs.cs | 9 +++---- specs/Qowaiv.Specs/Week_date_specs.cs | 4 +-- specs/Qowaiv.Specs/Year_specs.cs | 4 +-- specs/Qowaiv.Specs/YesNo_specs.cs | 4 +-- 27 files changed, 79 insertions(+), 79 deletions(-) diff --git a/specs/Qowaiv.Specs/Chemistry/CAS_Registry_Number_specs.cs b/specs/Qowaiv.Specs/Chemistry/CAS_Registry_Number_specs.cs index 484d1f37..1080c5e1 100644 --- a/specs/Qowaiv.Specs/Chemistry/CAS_Registry_Number_specs.cs +++ b/specs/Qowaiv.Specs/Chemistry/CAS_Registry_Number_specs.cs @@ -441,8 +441,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(CasRegistryNumber)) - .Should().Be(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(CasRegistryNumber)) + .Should().Be(new OpenApiDataType( dataType: typeof(CasRegistryNumber), description: "CAS Registry Number", example: "7732-18-5", @@ -454,7 +454,7 @@ public void with_info() [TestCase("7732-18-5")] [TestCase("10028-14-5")] public void pattern_matches(string input) - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(CasRegistryNumber))!.Matches(input).Should().BeTrue(); + => OpenApiDataType.FromType(typeof(CasRegistryNumber))!.Matches(input).Should().BeTrue(); } #if NET8_0_OR_GREATER diff --git a/specs/Qowaiv.Specs/Customization/Generic_SVO_specs.cs b/specs/Qowaiv.Specs/Customization/Generic_SVO_specs.cs index a912befe..7b94d771 100644 --- a/specs/Qowaiv.Specs/Customization/Generic_SVO_specs.cs +++ b/specs/Qowaiv.Specs/Customization/Generic_SVO_specs.cs @@ -413,8 +413,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(ForCustomSvo)) - .Should().Be(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(ForCustomSvo)) + .Should().Be(new OpenApiDataType( dataType: typeof(CustomSvo), description: "Custom SVO Example", example: "QOWAIV", diff --git a/specs/Qowaiv.Specs/Date_span_specs.cs b/specs/Qowaiv.Specs/Date_span_specs.cs index d28e2025..c222fc05 100644 --- a/specs/Qowaiv.Specs/Date_span_specs.cs +++ b/specs/Qowaiv.Specs/Date_span_specs.cs @@ -114,8 +114,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(DateSpan)) - .Should().Be(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(DateSpan)) + .Should().Be(new OpenApiDataType( dataType: typeof(DateSpan), description: "Date span, specified in years, months and days.", example: "1Y+10M+16D", diff --git a/specs/Qowaiv.Specs/Date_specs.cs b/specs/Qowaiv.Specs/Date_specs.cs index 9a2dcdf9..7b0676e4 100644 --- a/specs/Qowaiv.Specs/Date_specs.cs +++ b/specs/Qowaiv.Specs/Date_specs.cs @@ -234,8 +234,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(Date)) - .Should().Be(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(Date)) + .Should().Be(new OpenApiDataType( dataType: typeof(Date), description: "Full-date notation as defined by RFC 3339, section 5.6.", example: "2017-06-10", diff --git a/specs/Qowaiv.Specs/Email_address_specs.cs b/specs/Qowaiv.Specs/Email_address_specs.cs index 8da36b5d..7cb9b4d7 100644 --- a/specs/Qowaiv.Specs/Email_address_specs.cs +++ b/specs/Qowaiv.Specs/Email_address_specs.cs @@ -447,8 +447,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(EmailAddress)) - .Should().Be(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(EmailAddress)) + .Should().Be(new OpenApiDataType( dataType: typeof(EmailAddress), description: "Email notation as defined by RFC 5322.", type: "string", diff --git a/specs/Qowaiv.Specs/Financial/IBAN_specs.cs b/specs/Qowaiv.Specs/Financial/IBAN_specs.cs index 6f1209d3..1b804502 100644 --- a/specs/Qowaiv.Specs/Financial/IBAN_specs.cs +++ b/specs/Qowaiv.Specs/Financial/IBAN_specs.cs @@ -527,8 +527,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(InternationalBankAccountNumber)) - .Should().Be(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(InternationalBankAccountNumber)) + .Should().Be(new OpenApiDataType( dataType: typeof(InternationalBankAccountNumber), description: "International Bank Account Number notation as defined by ISO 13616:2007.", example: "BE71096123456769", @@ -539,7 +539,7 @@ public void with_info() [TestCase("NL20INGB0001234567")] public void pattern_matches(string input) - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(InternationalBankAccountNumber))!.Matches(input).Should().BeTrue(); + => OpenApiDataType.FromType(typeof(InternationalBankAccountNumber))!.Matches(input).Should().BeTrue(); } #if NET8_0_OR_GREATER diff --git a/specs/Qowaiv.Specs/FluentAssertions/UuidAssertions.cs b/specs/Qowaiv.Specs/FluentAssertions/UuidAssertions.cs index 31d767ab..5817c902 100644 --- a/specs/Qowaiv.Specs/FluentAssertions/UuidAssertions.cs +++ b/specs/Qowaiv.Specs/FluentAssertions/UuidAssertions.cs @@ -1,4 +1,5 @@ -using FluentAssertions.Numeric; +using FluentAssertions.Execution; +using FluentAssertions.Numeric; namespace FluentAssertions; @@ -39,11 +40,10 @@ public static AndConstraint> HavePattern(this Com } } - if (fail) - { - Assert.Fail($@"Expected: [{(string.Join(", ", exp))}] + Execute.Assertion + .ForCondition(!fail) + .WithExpectation($@"Expected: [{(string.Join(", ", exp))}] Actual: [{(string.Join(", ", act))}]"); - } subject.Version.Should().Be(UuidVersion.Sequential); diff --git a/specs/Qowaiv.Specs/HouseNumber_specs.cs b/specs/Qowaiv.Specs/HouseNumber_specs.cs index 482d91dd..6eb47900 100644 --- a/specs/Qowaiv.Specs/HouseNumber_specs.cs +++ b/specs/Qowaiv.Specs/HouseNumber_specs.cs @@ -156,8 +156,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(HouseNumber)) - .Should().Be(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(HouseNumber)) + .Should().Be(new OpenApiDataType( dataType: typeof(HouseNumber), description: "House number notation.", example: "13", diff --git a/specs/Qowaiv.Specs/IO/StreamSize_specs.cs b/specs/Qowaiv.Specs/IO/StreamSize_specs.cs index df6e5f70..9bc8602c 100644 --- a/specs/Qowaiv.Specs/IO/StreamSize_specs.cs +++ b/specs/Qowaiv.Specs/IO/StreamSize_specs.cs @@ -269,8 +269,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(StreamSize)) - .Should().Be(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(StreamSize)) + .Should().Be(new OpenApiDataType( dataType: typeof(StreamSize), description: "Stream size notation (in byte).", example: 1024, diff --git a/specs/Qowaiv.Specs/Identifiers/Id_for_Int32_specs.cs b/specs/Qowaiv.Specs/Identifiers/Id_for_Int32_specs.cs index 09b04c9f..00a60f2c 100644 --- a/specs/Qowaiv.Specs/Identifiers/Id_for_Int32_specs.cs +++ b/specs/Qowaiv.Specs/Identifiers/Id_for_Int32_specs.cs @@ -170,8 +170,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(ForInt32)) - .Should().Be(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(ForInt32)) + .Should().Be(new OpenApiDataType( dataType: typeof(Int32Id), description: "Int32 based identifier", example: 17, diff --git a/specs/Qowaiv.Specs/Identifiers/Id_for_Int64_specs.cs b/specs/Qowaiv.Specs/Identifiers/Id_for_Int64_specs.cs index d631ec8d..34c9dfd8 100644 --- a/specs/Qowaiv.Specs/Identifiers/Id_for_Int64_specs.cs +++ b/specs/Qowaiv.Specs/Identifiers/Id_for_Int64_specs.cs @@ -181,8 +181,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(ForInt64)) - .Should().Be(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(ForInt64)) + .Should().Be(new OpenApiDataType( dataType: typeof(Int64Id), description: "Int64 based identifier", example: 17, diff --git a/specs/Qowaiv.Specs/Identifiers/Id_for_String_specs.cs b/specs/Qowaiv.Specs/Identifiers/Id_for_String_specs.cs index dec8f145..d414468d 100644 --- a/specs/Qowaiv.Specs/Identifiers/Id_for_String_specs.cs +++ b/specs/Qowaiv.Specs/Identifiers/Id_for_String_specs.cs @@ -103,8 +103,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(ForString)) - .Should().Be(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(ForString)) + .Should().Be(new OpenApiDataType( dataType: typeof(StringId), description: "String based identifier", example: "Order-UK-2022-215", diff --git a/specs/Qowaiv.Specs/Mathematics/Fraction_specs.cs b/specs/Qowaiv.Specs/Mathematics/Fraction_specs.cs index 27ec25ec..ccefd265 100644 --- a/specs/Qowaiv.Specs/Mathematics/Fraction_specs.cs +++ b/specs/Qowaiv.Specs/Mathematics/Fraction_specs.cs @@ -937,8 +937,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(Fraction)) - .Should().Be(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(Fraction)) + .Should().Be(new OpenApiDataType( dataType: typeof(Fraction), description: "Faction", type: "string", diff --git a/specs/Qowaiv.Specs/Month_span_specs.cs b/specs/Qowaiv.Specs/Month_span_specs.cs index 3be0c25f..d009586d 100644 --- a/specs/Qowaiv.Specs/Month_span_specs.cs +++ b/specs/Qowaiv.Specs/Month_span_specs.cs @@ -261,8 +261,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(MonthSpan)) - .Should().Be(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(MonthSpan)) + .Should().Be(new OpenApiDataType( dataType: typeof(MonthSpan), description: "Month span, specified in years and months.", example: "1Y+10M", diff --git a/specs/Qowaiv.Specs/Month_specs.cs b/specs/Qowaiv.Specs/Month_specs.cs index 4b485999..1e52605b 100644 --- a/specs/Qowaiv.Specs/Month_specs.cs +++ b/specs/Qowaiv.Specs/Month_specs.cs @@ -538,8 +538,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(Month)) - .Should().BeEquivalentTo(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(Month)) + .Should().BeEquivalentTo(new OpenApiDataType( dataType: typeof(Month), description: "Month(-only) notation.", type: "string", diff --git a/specs/Qowaiv.Specs/Percentage_specs.cs b/specs/Qowaiv.Specs/Percentage_specs.cs index dc2a3a2d..8acbe4ee 100644 --- a/specs/Qowaiv.Specs/Percentage_specs.cs +++ b/specs/Qowaiv.Specs/Percentage_specs.cs @@ -1,4 +1,6 @@ -namespace Percentage_specs; +using FluentAssertions; + +namespace Percentage_specs; public class Is_valid_for { @@ -582,7 +584,7 @@ public void _double() public void _float() { var addition = 34.586f + 75.Percent(); - Assert.That(addition, Is.EqualTo(60.5255f).Within(0.00001)); + addition.Should().BeApproximately(60.5255f, 0.00001f); } [Test] @@ -749,14 +751,14 @@ public void _decimal() public void _double() { var addition = 34.586 * 75.Percent(); - Assert.That(addition, Is.EqualTo(25.9395).Within(0.00001)); + addition.Should().BeApproximately(25.9395, 0.00001); } [Test] public void _float() { var addition = 34.586f * 75.Percent(); - Assert.That(addition, Is.EqualTo(25.9395f).Within(0.00001)); + addition.Should().BeApproximately(25.9395f, 0.00001f); } [Test] @@ -829,21 +831,21 @@ public void _money() public void _decimal() { var addition = 34.586m / 75.Percent(); - Assert.That(addition, Is.EqualTo(46.11467m).Within(0.00001)); + addition.Should().BeApproximately(46.11467m, 0.00001m); } [Test] public void _double() { var addition = 34.586 / 75.Percent(); - Assert.That(addition, Is.EqualTo(46.11467).Within(0.00001)); + addition.Should().BeApproximately(46.11467, 0.00001); } [Test] public void _float() { var addition = 34.586f / 75.Percent(); - Assert.That(addition, Is.EqualTo(46.11467f).Within(0.00001)); + addition.Should().BeApproximately(46.11467f, 0.00001f); } [Test] @@ -935,9 +937,8 @@ public void up_to_26_digits(int decimals) [Test] public void up_to_minus_26_digits() - { - Assert.Throws(() => Svo.Percentage.Round(-27)); - } + => (-27).Invoking(Svo.Percentage.Round) + .Should().Throw(); [Test, Obsolete("Only exists for guidance towards decimal rounding methods.")] public void using_system_midpoint_rounding() @@ -1172,8 +1173,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(Percentage)) - .Should().Be(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(Percentage)) + .Should().Be(new OpenApiDataType( dataType: typeof(Percentage), description: "Ratio expressed as a fraction of 100 denoted using the percent sign '%'.", type: "string", @@ -1186,7 +1187,7 @@ public void with_info() [TestCase("-0.1%")] [TestCase("31%")] public void pattern_matches(string input) - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(Percentage))!.Matches(input).Should().BeTrue(); + => OpenApiDataType.FromType(typeof(Percentage))!.Matches(input).Should().BeTrue(); } #if NET8_0_OR_GREATER diff --git a/specs/Qowaiv.Specs/Postal_code_specs.cs b/specs/Qowaiv.Specs/Postal_code_specs.cs index 7ea2260c..a7c7f9ee 100644 --- a/specs/Qowaiv.Specs/Postal_code_specs.cs +++ b/specs/Qowaiv.Specs/Postal_code_specs.cs @@ -429,8 +429,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(PostalCode)) - .Should().Be(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(PostalCode)) + .Should().Be(new OpenApiDataType( dataType: typeof(PostalCode), description: "Postal code notation.", type: "string", diff --git a/specs/Qowaiv.Specs/Reflection/QowaivType_specs.cs b/specs/Qowaiv.Specs/Reflection/QowaivType_specs.cs index f9293961..c790e28c 100644 --- a/specs/Qowaiv.Specs/Reflection/QowaivType_specs.cs +++ b/specs/Qowaiv.Specs/Reflection/QowaivType_specs.cs @@ -40,13 +40,11 @@ public class NotNullableType [TestCase(typeof(string))] [TestCase(typeof(int))] public void Returns_type_for_non_nullable(Type type) -#pragma warning disable FAA0004 // Replace NUnit assertion with Fluent Assertions equivalent - => Assert.That(QowaivType.GetNotNullableType(type), Is.EqualTo(type)); -#pragma warning restore FAA0004 // Replace NUnit assertion with Fluent Assertions equivalent + => QowaivType.GetNotNullableType(type).Should().Be(type); [Test] public void Returns_underlying_type_for_nullable() - => Assert.That(QowaivType.GetNotNullableType(typeof(int?)), Is.EqualTo(typeof(int))); + => QowaivType.GetNotNullableType(typeof(int?)).Should().Be(typeof(int)); } public class IsNumeric diff --git a/specs/Qowaiv.Specs/Sex_specs.cs b/specs/Qowaiv.Specs/Sex_specs.cs index 56d401da..a6a470f5 100644 --- a/specs/Qowaiv.Specs/Sex_specs.cs +++ b/specs/Qowaiv.Specs/Sex_specs.cs @@ -432,8 +432,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(Sex)) - .Should().BeEquivalentTo(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(Sex)) + .Should().BeEquivalentTo(new OpenApiDataType( dataType: typeof(Sex), description: "Sex as specified by ISO/IEC 5218.", type: "string", diff --git a/specs/Qowaiv.Specs/Sql/Timestamp_specs.cs b/specs/Qowaiv.Specs/Sql/Timestamp_specs.cs index 02481e1b..db1c6295 100644 --- a/specs/Qowaiv.Specs/Sql/Timestamp_specs.cs +++ b/specs/Qowaiv.Specs/Sql/Timestamp_specs.cs @@ -128,8 +128,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(Timestamp)) - .Should().Be(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(Timestamp)) + .Should().Be(new OpenApiDataType( dataType: typeof(Timestamp), description: "SQL Server timestamp notation.", example: "0x00000000000007D9", diff --git a/specs/Qowaiv.Specs/Statistics/Elo_specs.cs b/specs/Qowaiv.Specs/Statistics/Elo_specs.cs index c0a9d049..62d6421a 100644 --- a/specs/Qowaiv.Specs/Statistics/Elo_specs.cs +++ b/specs/Qowaiv.Specs/Statistics/Elo_specs.cs @@ -178,8 +178,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(Elo)) - .Should().Be(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(Elo)) + .Should().Be(new OpenApiDataType( dataType: typeof(Elo), description: "Elo rating system notation.", example: 1600d, diff --git a/specs/Qowaiv.Specs/Sustainability/Energy_label_specs.cs b/specs/Qowaiv.Specs/Sustainability/Energy_label_specs.cs index 40834c03..b8697c19 100644 --- a/specs/Qowaiv.Specs/Sustainability/Energy_label_specs.cs +++ b/specs/Qowaiv.Specs/Sustainability/Energy_label_specs.cs @@ -528,8 +528,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(EnergyLabel)) - .Should().Be(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(EnergyLabel)) + .Should().Be(new OpenApiDataType( dataType: typeof(EnergyLabel), description: "EU energy label", example: "A++", @@ -544,7 +544,7 @@ public void with_info() [TestCase("A+")] [TestCase("A++++")] public void pattern_matches(string input) - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(EnergyLabel))!.Matches(input).Should().BeTrue(); + => OpenApiDataType.FromType(typeof(EnergyLabel))!.Matches(input).Should().BeTrue(); } #if NET8_0_OR_GREATER diff --git a/specs/Qowaiv.Specs/UUID_specs.cs b/specs/Qowaiv.Specs/UUID_specs.cs index 901d7024..5e258168 100644 --- a/specs/Qowaiv.Specs/UUID_specs.cs +++ b/specs/Qowaiv.Specs/UUID_specs.cs @@ -265,7 +265,8 @@ public void from_1_Jan_1970_on() { using (Clock.SetTimeForCurrentContext(() => DateTime.UnixEpoch.AddTicks(-1))) { - Assert.Catch(() => Uuid.NewSequential()); + Func next = Uuid.NewSequential; + next.Should().Throw(); } } @@ -274,7 +275,8 @@ public void until_3_Dec_9276() { using (Clock.SetTimeForCurrentContext(() => new DateTime(9276, 12, 04, 00, 00, 000, DateTimeKind.Utc))) { - Assert.Catch(() => Uuid.NewSequential()); + Func next = Uuid.NewSequential; + next.Should().Throw(); } } @@ -598,8 +600,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(Uuid)) - .Should().Be(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(Uuid)) + .Should().Be(new OpenApiDataType( dataType: typeof(Uuid), description: "Universally unique identifier, Base64 encoded.", example: "lmZO_haEOTCwGsCcbIZFFg", @@ -624,7 +626,7 @@ public void using_BinaryFormatter() public void storing_Guid_in_SerializationInfo() { var info = Serialize.GetInfo(Svo.Uuid); - Assert.AreEqual(Svo.Guid, info.GetValue("Value", typeof(Guid))); + info.GetValue("Value", typeof(Guid)).Should().Be(Svo.Guid); } [Test] diff --git a/specs/Qowaiv.Specs/Web/Internet_media_type_specs.cs b/specs/Qowaiv.Specs/Web/Internet_media_type_specs.cs index c892fb61..90f38a14 100644 --- a/specs/Qowaiv.Specs/Web/Internet_media_type_specs.cs +++ b/specs/Qowaiv.Specs/Web/Internet_media_type_specs.cs @@ -118,17 +118,16 @@ public void throws_for_invalid_json(object json, Type exceptionType) [TestCase("Invalid input")] [TestCase("2017-06-11")] public void FromJson_Invalid_Throws(object json) - { - Assert.Catch(() => JsonTester.Read(json)); - } + => json.Invoking(JsonTester.Read) + .Should().Throw(); } public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(InternetMediaType)) - .Should().Be(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(InternetMediaType)) + .Should().Be(new OpenApiDataType( dataType: typeof(InternetMediaType), description: "Media type notation as defined by RFC 6838.", example: "text/html", diff --git a/specs/Qowaiv.Specs/Week_date_specs.cs b/specs/Qowaiv.Specs/Week_date_specs.cs index 90237ec6..0420ef9f 100644 --- a/specs/Qowaiv.Specs/Week_date_specs.cs +++ b/specs/Qowaiv.Specs/Week_date_specs.cs @@ -180,8 +180,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(WeekDate)) - .Should().Be(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(WeekDate)) + .Should().Be(new OpenApiDataType( dataType: typeof(WeekDate), description: "Full-date notation as defined by ISO 8601.", example: "1997-W14-6", diff --git a/specs/Qowaiv.Specs/Year_specs.cs b/specs/Qowaiv.Specs/Year_specs.cs index 6ba7377b..97756251 100644 --- a/specs/Qowaiv.Specs/Year_specs.cs +++ b/specs/Qowaiv.Specs/Year_specs.cs @@ -510,8 +510,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(Year)) - .Should().Be(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(Year)) + .Should().Be(new OpenApiDataType( dataType: typeof(Year), description: "Year(-only) notation.", example: 1983, diff --git a/specs/Qowaiv.Specs/YesNo_specs.cs b/specs/Qowaiv.Specs/YesNo_specs.cs index 01b00d6f..bc1daa3b 100644 --- a/specs/Qowaiv.Specs/YesNo_specs.cs +++ b/specs/Qowaiv.Specs/YesNo_specs.cs @@ -517,8 +517,8 @@ public class Is_Open_API_data_type { [Test] public void with_info() - => Qowaiv.OpenApi.OpenApiDataType.FromType(typeof(YesNo)) - .Should().BeEquivalentTo(new Qowaiv.OpenApi.OpenApiDataType( + => OpenApiDataType.FromType(typeof(YesNo)) + .Should().BeEquivalentTo(new OpenApiDataType( dataType: typeof(YesNo), description: "Yes-No notation.", example: "yes",