Merge pull request #5 from pfpack/feature/Primitives

Primitives: Strings / General

Author: pmosk

src/primitives/Primitives.Tests/StringExtensions.Tests/OrEmpty.cs

@@ -26,7 +26,7 @@ public void OrEmpty_SourceIsNotNull_ExpectSourceValue(
             string source)
         {
             var actual = source.OrEmpty();
-            Assert.AreEqual(source, actual);
+            Assert.AreSame(source, actual);
         }
     }
 }

src/primitives/Primitives.Tests/StringExtensions.Tests/OrNullIfEmpty.cs

@@ -0,0 +1,32 @@
+#nullable enable
+
+using NUnit.Framework;
+using System;
+using static PrimeFuncPack.UnitTest.TestData;
+
+namespace PrimeFuncPack.Primitives.Tests
+{
+    partial class StringExtensionsTests
+    {
+        [Test]
+        public void OrNullIfEmpty_SourceIsEmpty_ExpectNull()
+        {
+            string? source = string.Empty;
+
+            var actual = source.OrNullIfEmpty();
+            Assert.IsNull(actual);
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase(WhiteSpaceString)]
+        [TestCase(TabString)]
+        [TestCase(SomeString)]
+        public void OrNullIfEmpty_SourceIsNotEmpty_ExpectSourceValue(
+            string? source)
+        {
+            var actual = source.OrNullIfEmpty();
+            Assert.AreSame(source, actual);
+        }
+    }
+}

src/primitives/Primitives.Tests/StringExtensions.Tests/OrNullIfWhiteSpace.cs

@@ -0,0 +1,33 @@
+#nullable enable
+
+using NUnit.Framework;
+using System;
+using static PrimeFuncPack.UnitTest.TestData;
+
+namespace PrimeFuncPack.Primitives.Tests
+{
+    partial class StringExtensionsTests
+    {
+        [Test]
+        [TestCase(EmptyString)]
+        [TestCase(WhiteSpaceString)]
+        [TestCase(ThreeWhiteSpacesString)]
+        [TestCase(TabString)]
+        public void OrNullIfWhiteSpace_SourceIsWhiteSpace_ExpectNull(
+            string? source)
+        {
+            var actual = source.OrNullIfWhiteSpace();
+            Assert.IsNull(actual);
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase(SomeString)]
+        public void OrNullIfWhiteSpace_SourceIsNotWhiteSpace_ExpectSourceValue(
+            string? source)
+        {
+            var actual = source.OrNullIfWhiteSpace();
+            Assert.AreSame(source, actual);
+        }
+    }
+}

src/primitives/Primitives.Tests/Strings.Tests/OrEmpty.cs

@@ -26,7 +26,7 @@ public void OrEmpty_SourceIsNotNull_ExpectSourceValue(
             string source)
         {
             var actual = Strings.OrEmpty(source);
-            Assert.AreEqual(source, actual);
+            Assert.AreSame(source, actual);
         }
     }
 }

src/primitives/Primitives.Tests/Strings.Tests/OrNullIfEmpty.cs

@@ -0,0 +1,32 @@
+#nullable enable
+
+using NUnit.Framework;
+using System;
+using static PrimeFuncPack.UnitTest.TestData;
+
+namespace PrimeFuncPack.Primitives.Tests
+{
+    partial class StringsTests
+    {
+        [Test]
+        public void OrNullIfEmpty_SourceIsEmpty_ExpectNull()
+        {
+            string? source = string.Empty;
+
+            var actual = Strings.OrNullIfEmpty(source);
+            Assert.IsNull(actual);
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase(WhiteSpaceString)]
+        [TestCase(TabString)]
+        [TestCase(SomeString)]
+        public void OrNullIfEmpty_SourceIsNotEmpty_ExpectSourceValue(
+            string? source)
+        {
+            var actual = Strings.OrNullIfEmpty(source);
+            Assert.AreSame(source, actual);
+        }
+    }
+}

src/primitives/Primitives.Tests/Strings.Tests/OrNullIfWhiteSpace.cs

@@ -0,0 +1,33 @@
+#nullable enable
+
+using NUnit.Framework;
+using System;
+using static PrimeFuncPack.UnitTest.TestData;
+
+namespace PrimeFuncPack.Primitives.Tests
+{
+    partial class StringsTests
+    {
+        [Test]
+        [TestCase(EmptyString)]
+        [TestCase(WhiteSpaceString)]
+        [TestCase(ThreeWhiteSpacesString)]
+        [TestCase(TabString)]
+        public void OrNullIfWhiteSpace_SourceIsWhiteSpace_ExpectNull(
+            string? source)
+        {
+            var actual = Strings.OrNullIfWhiteSpace(source);
+            Assert.IsNull(actual);
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase(SomeString)]
+        public void OrNullIfWhiteSpace_SourceIsNotWhiteSpace_ExpectSourceValue(
+            string? source)
+        {
+            var actual = Strings.OrNullIfWhiteSpace(source);
+            Assert.AreSame(source, actual);
+        }
+    }
+}

src/primitives/Primitives/Pipeline/PipelineExtensions.Pipe.PipeSelf.cs

@@ -5,9 +5,10 @@ namespace System
     partial class PipelineExtensions
     {
         public static TResult Pipe<T, TResult>(this T value, Func<T, TResult> pipe)
-            =>
-            (pipe ?? throw new ArgumentNullException(nameof(pipe)))
-            .Invoke(value);
+        {
+            _ = pipe ?? throw new ArgumentNullException(nameof(pipe));
+            return pipe.Invoke(value);
+        }
     }
 }
 
@@ -18,8 +19,9 @@ namespace PrimeFuncPack
     partial class PipelineExtensions
     {
         public static TResult PipeSelf<T, TResult>(this T value, Func<T, TResult> pipe)
-            =>
-            (pipe ?? throw new ArgumentNullException(nameof(pipe)))
-            .Invoke(value);
+        {
+            _ = pipe ?? throw new ArgumentNullException(nameof(pipe));
+            return pipe.Invoke(value);
+        }
     }
 }

src/primitives/Primitives/Strings/StringExtensions.cs

@@ -8,6 +8,14 @@ public static string OrEmpty(this string? value)
             =>
             Strings.OrEmpty(value);
 
+        public static string? OrNullIfEmpty(this string? value)
+            =>
+            Strings.OrNullIfEmpty(value);
+
+        public static string? OrNullIfWhiteSpace(this string? value)
+            =>
+            Strings.OrNullIfWhiteSpace(value);
+
         public static string ToStringOrEmpty<T>(this T value)
             =>
             Strings.ToStringOrEmpty(value);

src/primitives/Primitives/Strings/Strings.cs

@@ -12,8 +12,20 @@ public static string OrEmpty(string? value)
             =>
             value ?? Empty;
 
+        public static string? OrNullIfEmpty(string? value)
+            =>
+            string.IsNullOrEmpty(value)
+                ? null
+                : value;
+
+        public static string? OrNullIfWhiteSpace(string? value)
+            =>
+            string.IsNullOrWhiteSpace(value)
+                ? null
+                : value;
+
         public static string ToStringOrEmpty<T>(T value)
             =>
-            value switch { not null => value.ToString() ?? Empty, _ => Empty };
+            value?.ToString() ?? Empty;
     }
 }