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

synergy-software · Feb 3, 2024 · 9e7380e · 9e7380e
1 parent b8cad60
commit 9e7380e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 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
@@ -223,7 +223,7 @@
    ) : void [AssertionMethod, ContractAnnotation]
  - Fail.IfWhitespace(
      value: string [CanBeNull, AssertionCondition],
-     name: string [NotNull, NotNull]
+     name: string? [Nullable, CallerArgumentExpression, Optional]
    ) : void [AssertionMethod, ContractAnnotation]
  - Fail.NotNull<T>(
      value: T? [CanBeNull, AssertionCondition, NoEnumeration],

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

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

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
@@ -137,9 +137,15 @@ string name
         [AssertionMethod]
         [ContractAnnotation("value: null => halt")]
         public static void IfWhitespace(
-            [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.IfWhitespace(value, Violation.WhenWhitespace(name));

diff --git a/Web/Synergy.Web.Api.Testing/TestServer.cs b/Web/Synergy.Web.Api.Testing/TestServer.cs
@@ -117,7 +117,7 @@ protected virtual HttpRequestMessage CreateHttpRequest(
 
         private Uri PrepareRequestUri(string path, object? parameterToGet = null)
         {
-            Fail.IfWhitespace(path, nameof(path));
+            Fail.IfWhitespace(path);
 
             var uriBuilder = new UriBuilder
                              {