#28: Synergy.Contracts: Added Fail.IfEmpty(text) method

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

Hide file tree

Showing 5 changed files with 12 additions and 5 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
@@ -131,7 +131,7 @@
    ) : void [AssertionMethod, ContractAnnotation]
  - Fail.IfEmpty(
      value: string [CanBeNull, AssertionCondition],
-     name: string [NotNull, NotNull]
+     name: string? [Nullable, CallerArgumentExpression, Optional]
    ) : void [AssertionMethod, ContractAnnotation]
  - Fail.IfEnumNotDefined<T>(
      value: object [NotNull, NotNull]

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
@@ -131,7 +131,7 @@
    ) : void [AssertionMethod, ContractAnnotation]
  - Fail.IfEmpty(
      value: string [CanBeNull, AssertionCondition],
-     name: string [NotNull, NotNull]
+     name: string? [Nullable, CallerArgumentExpression, Optional]
    ) : void [AssertionMethod, ContractAnnotation]
  - Fail.IfEnumNotDefined<T>(
      value: object [NotNull, NotNull]

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
@@ -131,7 +131,7 @@
    ) : void [AssertionMethod, ContractAnnotation]
  - Fail.IfEmpty(
      value: string [CanBeNull, AssertionCondition],
-     name: string [NotNull, NotNull]
+     name: string? [Nullable, CallerArgumentExpression, Optional]
    ) : void [AssertionMethod, ContractAnnotation]
  - Fail.IfEnumNotDefined<T>(
      value: object [NotNull, NotNull]

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
@@ -43,8 +43,15 @@ string argumentName
         [AssertionMethod]
         [ContractAnnotation("value: null => halt")]
         public static void IfEmpty(
-            [CanBeNull, AssertionCondition(AssertionConditionType.IS_NOT_NULL)] string value,
-            [NotNull] [System.Diagnostics.CodeAnalysis.NotNull] string name)
+            [CanBeNull, AssertionCondition(AssertionConditionType.IS_NOT_NULL)]
+            string value,
+#if NET6_0_OR_GREATER
+            [System.Runtime.CompilerServices.CallerArgumentExpression("value")]
+            string? name = null
+#else
+            string name
+#endif
+        )
         {
             Fail.RequiresArgumentName(name);
             Fail.IfEmpty(value, Violation.WhenEmpty(name));