Add ToArray to avoid casting.

Author: Tratcher

src/Microsoft.Framework.Primitives/StringValues.cs

@@ -47,15 +47,7 @@ public static implicit operator string (StringValues values)
 
         public static implicit operator string[] (StringValues value)
         {
-            if (value._values != null)
-            {
-                return value._values;
-            }
-            if (value._value != null)
-            {
-                return new string[1] { value._value };
-            }
-            return EmptyArray;
+            return value.GetArrayValue();
         }
 
         public int Count => _values?.Length ?? (_value != null ? 1 : 0);
@@ -106,6 +98,20 @@ private string GetStringValue()
             }
         }
 
+        public string[] ToArray()
+        {
+            return GetArrayValue() ?? EmptyArray;
+        }
+
+        private string[] GetArrayValue()
+        {
+            if (_value != null)
+            {
+                return new[] { _value };
+            }
+            return _values;
+        }
+
         int IList<string>.IndexOf(string item)
         {
             var index = 0;

test/Microsoft.AspNet.Http.Tests/HeaderDictionaryTests.cs

@@ -24,7 +24,7 @@ public void PropertiesAreAccessible()
             Assert.True(headers.ContainsKey("header1"));
             Assert.False(headers.ContainsKey("header2"));
             Assert.Equal("Value1", headers["header1"]);
-            Assert.Equal(new[] { "Value1" }, (string[])headers["header1"]);
+            Assert.Equal(new[] { "Value1" }, headers["header1"].ToArray());
         }
     }
 }

test/Microsoft.Framework.Primitives.Tests/StringValuesTests.cs

@@ -29,7 +29,7 @@ public void DefaultConstructor_ExpectedValues()
             var stringValues = new StringValues();
             Assert.Equal(0, stringValues.Count);
             Assert.Equal((string)null, stringValues);
-            Assert.Equal<string[]>(new string[0], stringValues);
+            Assert.Equal(new string[0], stringValues.ToArray());
 
             Assert.True(StringValues.IsNullOrEmpty(stringValues));
             Assert.Throws<IndexOutOfRangeException>(() => stringValues[0]);
@@ -43,12 +43,13 @@ public void Constructor_NullStringValue_ExpectedValues()
         {
             var stringValues = new StringValues((string)null);
             Assert.Equal(0, stringValues.Count);
-            Assert.Equal((string)null, stringValues);
-            Assert.Equal<string[]>(new string[0], stringValues);
+            Assert.Null((string)stringValues);
+            Assert.Equal(string.Empty, stringValues.ToString());
+            Assert.Null((string[])stringValues);
+            Assert.Equal(new string[0], stringValues.ToArray());
 
             Assert.True(StringValues.IsNullOrEmpty(stringValues));
             Assert.Throws<IndexOutOfRangeException>(() => stringValues[0]);
-            Assert.Equal(string.Empty, stringValues.ToString());
             Assert.Equal(-1, ((IList<string>)stringValues).IndexOf(string.Empty));
             Assert.Equal(0, stringValues.Count());
         }
@@ -58,8 +59,10 @@ public void Constructor_NullStringArray_ExpectedValues()
         {
             var stringValues = new StringValues((string[])null);
             Assert.Equal(0, stringValues.Count);
-            Assert.Equal((string)null, stringValues);
-            Assert.Equal<string[]>(new string[0], stringValues);
+            Assert.Null((string)stringValues);
+            Assert.Equal(string.Empty, stringValues.ToString());
+            Assert.Null((string[])stringValues);
+            Assert.Equal(new string[0], stringValues.ToArray());
 
             Assert.True(StringValues.IsNullOrEmpty(stringValues));
             Assert.Throws<IndexOutOfRangeException>(() => stringValues[0]);
@@ -74,8 +77,8 @@ public void ImplicitStringConverter_Works()
             string nullString = null;
             StringValues stringValues = nullString;
             Assert.Equal(0, stringValues.Count);
-            Assert.Equal((string)null, stringValues);
-            Assert.Equal<string[]>(new string[0], stringValues);
+            Assert.Null((string)stringValues);
+            Assert.Null((string[])stringValues);
 
             string aString = "abc";
             stringValues = aString;
@@ -91,8 +94,8 @@ public void ImplicitStringArrayConverter_Works()
             string[] nullStringArray = null;
             StringValues stringValues = nullStringArray;
             Assert.Equal(0, stringValues.Count);
-            Assert.Equal((string)null, stringValues);
-            Assert.Equal<string[]>(new string[0], stringValues);
+            Assert.Null((string)stringValues);
+            Assert.Null((string[])stringValues);
 
             string aString = "abc";
             string[] aStringArray = new[] { aString };