Add test for string.Concat(object) that ToString returns null (#36436)

dotnet · Apr 9, 2019 · f9c9710 · f9c9710
1 parent 3f7071d
commit f9c9710
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Common/tests/Tests/System/StringTests.cs b/src/Common/tests/Tests/System/StringTests.cs
@@ -372,8 +372,6 @@ public static IEnumerable<object[]> Concat_Objects_TestData()
 
             yield return new object[] { new object[] { 1 }, "1" };
             yield return new object[] { new object[] { null }, "" };
-            // dotnet/coreclr#6785, this will be null for the Concat(object) overload but "" for the object[]/IEnumerable<object> overload
-            // yield return new object[] { new object[] { new ObjectWithNullToString() }, "" };
 
             yield return new object[] { new object[] { 1, 2 }, "12" };
             yield return new object[] { new object[] { null, 1 }, "1" };
@@ -400,6 +398,11 @@ public static IEnumerable<object[]> Concat_Objects_TestData()
 
             // Concat should ignore objects that have a null ToString() value
             yield return new object[] { new object[] { new ObjectWithNullToString(), "Foo", new ObjectWithNullToString(), "Bar", new ObjectWithNullToString() }, "FooBar" };
+
+            if (!PlatformDetection.IsFullFramework)
+            {
+                yield return new object[] { new object[] { new ObjectWithNullToString() }, "" };
+            }
         }
 
         [Theory]