Merge pull request #734 from DuendeSoftware/dom/string_join

Replace home grown logic of ToSpaceSeparatedString with String.Join
DuendeSoftware · Feb 21, 2022 · 5a6e73e · 5a6e73e
2 parents 6624811 + f1fdfac
commit 5a6e73e
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 17 deletions.
diff --git a/src/EntityFramework.Storage/Extensions/StringsExtensions.cs b/src/EntityFramework.Storage/Extensions/StringsExtensions.cs
@@ -22,14 +22,7 @@ public static string ToSpaceSeparatedString(this IEnumerable<string> list)
             return string.Empty;
         }
 
-        var sb = new StringBuilder(100);
-
-        foreach (var element in list)
-        {
-            sb.Append(element + " ");
-        }
-
-        return sb.ToString().Trim();
+        return String.Join(' ', list);
     }
 
     [DebuggerStepThrough]

diff --git a/src/IdentityServer/Extensions/StringsExtensions.cs b/src/IdentityServer/Extensions/StringsExtensions.cs
@@ -15,7 +15,6 @@ namespace Duende.IdentityServer.Extensions;
 
 internal static class StringExtensions
 {
-    // todo: use string.Join instead!
     [DebuggerStepThrough]
     public static string ToSpaceSeparatedString(this IEnumerable<string> list)
     {
@@ -24,14 +23,7 @@ public static string ToSpaceSeparatedString(this IEnumerable<string> list)
             return string.Empty;
         }
 
-        var sb = new StringBuilder(100);
-
-        foreach (var element in list)
-        {
-            sb.Append(element + " ");
-        }
-
-        return sb.ToString().Trim();
+        return String.Join(' ', list);
     }
 
     [DebuggerStepThrough]

diff --git a/test/IdentityServer.UnitTests/Extensions/StringExtensionsTests.cs b/test/IdentityServer.UnitTests/Extensions/StringExtensionsTests.cs
@@ -5,6 +5,7 @@
 using Xunit;
 using Duende.IdentityServer.Extensions;
 using FluentAssertions;
+using System.Linq;
 
 namespace UnitTests.Extensions;
 
@@ -76,6 +77,40 @@ public void TestGetOrigin()
         CheckOrigin("test://localhost:8080/test/resource", "test://localhost:8080");
     }
 
+    [Fact]
+    [Trait("Category", Category)]
+    public void ToSpaceSeparatedString_should_return_correct_value()
+    {
+        var value = new[] { "foo", "bar", "baz", "baz", "foo", "bar" }.ToSpaceSeparatedString();
+        value.Should().Be("foo bar baz baz foo bar");
+    }
+
+    [Fact]
+    [Trait("Category", Category)]
+    public void FromSpaceSeparatedString_should_return_correct_values()
+    {
+        var values = "foo bar   baz baz     foo bar".FromSpaceSeparatedString().ToArray();
+        values.Length.Should().Be(6);
+        values[0].Should().Be("foo");
+        values[1].Should().Be("bar");
+        values[2].Should().Be("baz");
+        values[3].Should().Be("baz");
+        values[4].Should().Be("foo");
+        values[5].Should().Be("bar");
+    }
+
+    [Fact]
+    [Trait("Category", Category)]
+    public void FromSpaceSeparatedString_should_only_process_spaces()
+    {
+        var values = "foo bar\tbaz baz\rfoo bar\r\nbar".FromSpaceSeparatedString().ToArray();
+        values.Length.Should().Be(4);
+        values[0].Should().Be("foo");
+        values[1].Should().Be("bar\tbaz");
+        values[2].Should().Be("baz\rfoo");
+        values[3].Should().Be("bar\r\nbar");
+    }
+
 
     // scope parsing