From 074fe130534db03c66f4af63e54b6752e0e4d10f Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Wed, 27 Mar 2019 21:57:38 -0700 Subject: [PATCH] Add test for string.Concat(object) that ToString returns null --- src/Common/tests/Tests/System/StringTests.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Common/tests/Tests/System/StringTests.cs b/src/Common/tests/Tests/System/StringTests.cs index 67065ea884be..6a20294b0b7a 100644 --- a/src/Common/tests/Tests/System/StringTests.cs +++ b/src/Common/tests/Tests/System/StringTests.cs @@ -371,8 +371,6 @@ public static IEnumerable 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 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" }; @@ -399,6 +397,11 @@ public static IEnumerable 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]