#28: Synergy.Contracts: Added Fail.IfArgumentEmpty(name) method

synergy-software · Feb 3, 2024 · 1fbce88 · 1fbce88
1 parent cba2fee
commit 1fbce88
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/...ntracts.Test/Architecture/Public/Api.of.Synergy.Contracts.DotNet6_0.verified.md b/...ntracts.Test/Architecture/Public/Api.of.Synergy.Contracts.DotNet6_0.verified.md
@@ -76,7 +76,7 @@
    ) : T? [Extension, NotNull, AssertionMethod, ContractAnnotation]
  - Fail.IfArgumentEmpty(
      argumentValue: string [CanBeNull, AssertionCondition],
-     argumentName: string [NotNull, NotNull]
+     argumentName: string? [Nullable, CallerArgumentExpression, Optional]
    ) : void [AssertionMethod, ContractAnnotation]
  - Fail.IfArgumentEmpty(
      value: Guid,

diff --git a/...ntracts.Test/Architecture/Public/Api.of.Synergy.Contracts.DotNet7_0.verified.md b/...ntracts.Test/Architecture/Public/Api.of.Synergy.Contracts.DotNet7_0.verified.md
@@ -76,7 +76,7 @@
    ) : T? [Extension, NotNull, AssertionMethod, ContractAnnotation]
  - Fail.IfArgumentEmpty(
      argumentValue: string [CanBeNull, AssertionCondition],
-     argumentName: string [NotNull, NotNull]
+     argumentName: string? [Nullable, CallerArgumentExpression, Optional]
    ) : void [AssertionMethod, ContractAnnotation]
  - Fail.IfArgumentEmpty(
      value: Guid,

diff --git a/...ntracts.Test/Architecture/Public/Api.of.Synergy.Contracts.DotNet8_0.verified.md b/...ntracts.Test/Architecture/Public/Api.of.Synergy.Contracts.DotNet8_0.verified.md
@@ -76,7 +76,7 @@
    ) : T? [Extension, NotNull, AssertionMethod, ContractAnnotation]
  - Fail.IfArgumentEmpty(
      argumentValue: string [CanBeNull, AssertionCondition],
-     argumentName: string [NotNull, NotNull]
+     argumentName: string? [Nullable, CallerArgumentExpression, Optional]
    ) : void [AssertionMethod, ContractAnnotation]
  - Fail.IfArgumentEmpty(
      value: Guid,

diff --git a/Contracts/Synergy.Contracts.Test/Failures/Doubles/Contractor.cs b/Contracts/Synergy.Contracts.Test/Failures/Doubles/Contractor.cs
@@ -8,7 +8,7 @@ public class Contractor
         [NotNull, Pure]
         public static Contractor CreateCompany([NotNull] string name)
         {
-            Fail.IfArgumentEmpty(name, nameof(name));
+            Fail.IfArgumentEmpty(name);
 
             return new Contractor
             {
@@ -21,7 +21,7 @@ public static Contractor CreateCompany([NotNull] string name)
         [NotNull, Pure]
         public static Contractor CreatePerson([NotNull] string firstName, [NotNull] string lastName)
         {
-            Fail.IfArgumentEmpty(firstName, nameof(firstName));
+            Fail.IfArgumentEmpty(firstName);
             Fail.IfArgumentWhiteSpace(lastName, nameof(lastName));
 
             return new Contractor()
@@ -70,8 +70,8 @@ public string GetCity()
 
         public void SetPersonName([NotNull] string firstName, [NotNull] string lastName)
         {
-            Fail.IfArgumentEmpty(firstName, nameof(firstName));
-            Fail.IfArgumentEmpty(lastName, nameof(lastName));
+            Fail.IfArgumentEmpty(firstName);
+            Fail.IfArgumentEmpty(lastName);
 
             throw Fail.Because("Not implemented yet");
         }

diff --git a/Contracts/Synergy.Contracts.Test/Failures/FailStringTest.cs b/Contracts/Synergy.Contracts.Test/Failures/FailStringTest.cs
diff --git a/Contracts/Synergy.Contracts/Failures/FailString.cs b/Contracts/Synergy.Contracts/Failures/FailString.cs
@@ -14,8 +14,15 @@ static partial class Fail
         [AssertionMethod]
         [ContractAnnotation("argumentValue: null => halt")]
         public static void IfArgumentEmpty(
-            [CanBeNull, AssertionCondition(AssertionConditionType.IS_NOT_NULL)] string argumentValue,
-            [NotNull] [System.Diagnostics.CodeAnalysis.NotNull] string argumentName)
+            [CanBeNull, AssertionCondition(AssertionConditionType.IS_NOT_NULL)]
+            string argumentValue,
+#if NET6_0_OR_GREATER
+            [System.Runtime.CompilerServices.CallerArgumentExpression("argumentValue")]
+            string? argumentName = null
+#else
+            string argumentName
+#endif
+        )
         {
             Fail.RequiresArgumentName(argumentName);
             Fail.IfArgumentNull(argumentValue, argumentName);