Removed Values<> tests and improved based on feedback

Author: nickevansuk

Source/Schema.NET/OneOrMany{T}.cs

@@ -107,7 +107,7 @@ public int Count
         /// <param name="item">The single item value.</param>
         /// <returns>The result of the conversion.</returns>
 #pragma warning disable CA2225 // Operator overloads have named alternates
-        public static implicit operator OneOrMany<T>(T item) => item != null && item.GetType() == typeof(string) && string.IsNullOrWhiteSpace(item as string) ? default : new OneOrMany<T>(item);
+        public static implicit operator OneOrMany<T>(T item) => item != null && IsStringNullOrWhiteSpace(item) ? default : new OneOrMany<T>(item);
 #pragma warning restore CA2225 // Operator overloads have named alternates
 
         /// <summary>
@@ -116,7 +116,7 @@ public int Count
         /// <param name="array">The array of values.</param>
         /// <returns>The result of the conversion.</returns>
 #pragma warning disable CA2225 // Operator overloads have named alternates
-        public static implicit operator OneOrMany<T>(T[] array) => new OneOrMany<T>(array);
+        public static implicit operator OneOrMany<T>(T[] array) => new OneOrMany<T>(array?.Where(x => x != null && !IsStringNullOrWhiteSpace(x)));
 #pragma warning restore CA2225 // Operator overloads have named alternates
 
         /// <summary>
@@ -125,7 +125,7 @@ public int Count
         /// <param name="list">The list of values.</param>
         /// <returns>The result of the conversion.</returns>
 #pragma warning disable CA2225 // Operator overloads have named alternates
-        public static implicit operator OneOrMany<T>(List<T> list) => new OneOrMany<T>(list.Where(x => x != null && !(x.GetType() == typeof(string) && string.IsNullOrWhiteSpace(x as string))));
+        public static implicit operator OneOrMany<T>(List<T> list) => new OneOrMany<T>(list?.Where(x => x != null && !IsStringNullOrWhiteSpace(x)));
 #pragma warning restore CA2225 // Operator overloads have named alternates
 
         /// <summary>
@@ -272,5 +272,7 @@ public override int GetHashCode()
 
             return 0;
         }
+
+        private static bool IsStringNullOrWhiteSpace(T item) => item.GetType() == typeof(string) && string.IsNullOrWhiteSpace(item as string);
     }
 }

Tests/Schema.NET.Test/OneOrManyTest.cs

@@ -243,7 +243,7 @@ public void GetHashCode_TwoItems_HashCodeEqualToTwoItems() =>
         [InlineData("")]
         [InlineData(" ")]
         [InlineData("  ")]
-        public void ToString_EmptyOrWhiteSpace_BookOmitsNameProperty(string name)
+        public void ToString_NullEmptyOrWhiteSpace_BookOmitsNameProperty(string name)
         {
             var book = new Book() { Name = name };
             Assert.Equal("{\"@context\":\"http://schema.org\",\"@type\":\"Book\"}", book.ToString());
@@ -254,7 +254,7 @@ public void ToString_EmptyOrWhiteSpace_BookOmitsNameProperty(string name)
         [InlineData("")]
         [InlineData(" ")]
         [InlineData("  ")]
-        public void ToString_EmptyOrWhiteSpace_BookOmitsNamePropertyFromList(string name)
+        public void ToString_NullEmptyOrWhiteSpace_BookOmitsNamePropertyFromList(string name)
         {
             var book = new Book() { Name = new List<string> { "Hamlet", name } };
             Assert.Equal("{\"@context\":\"http://schema.org\",\"@type\":\"Book\",\"name\":\"Hamlet\"}", book.ToString());
@@ -265,22 +265,32 @@ public void ToString_EmptyOrWhiteSpace_BookOmitsNamePropertyFromList(string name
         [InlineData("")]
         [InlineData(" ")]
         [InlineData("  ")]
-        public void ToString_EmptyOrWhiteSpace_OrganizationOmitsAddressProperty(string address)
+        public void ToString_NullEmptyOrWhiteSpace_BookOmitsNamePropertyFromArray(string name)
         {
-            var organization = new Organization() { Address = address };
-            Assert.Equal("{\"@context\":\"http://schema.org\",\"@type\":\"Organization\"}", organization.ToString());
+            var book = new Book() { Name = new string[] { "Hamlet", name } };
+            Assert.Equal("{\"@context\":\"http://schema.org\",\"@type\":\"Book\",\"name\":\"Hamlet\"}", book.ToString());
         }
 
         [Theory]
         [InlineData(null)]
         [InlineData("")]
         [InlineData(" ")]
         [InlineData("  ")]
-        public void ToString_EmptyOrWhiteSpace_OrganizationOmitsNamePropertyFromList(string address)
+        public void ToString_NullEmptyOrWhiteSpace_OrganizationOmitsNamePropertyFromList(string address)
         {
             var organization = new Organization() { Name = new List<string> { "Cardiff, UK", address } };
             Assert.Equal("{\"@context\":\"http://schema.org\",\"@type\":\"Organization\",\"name\":\"Cardiff, UK\"}", organization.ToString());
         }
 
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        [InlineData(" ")]
+        [InlineData("  ")]
+        public void ToString_NullEmptyOrWhiteSpace_OrganizationOmitsNamePropertyFromArray(string address)
+        {
+            var organization = new Organization() { Name = new string[] { "Cardiff, UK", address } };
+            Assert.Equal("{\"@context\":\"http://schema.org\",\"@type\":\"Organization\",\"name\":\"Cardiff, UK\"}", organization.ToString());
+        }
     }
 }

Tests/Schema.NET.Test/core/EventTest.cs

@@ -40,7 +40,6 @@ public class EventTest
                     PriceCurrency = "USD", // Recommended
                     Availability = ItemAvailability.InStock, // Recommended
                     ValidFrom = new DateTimeOffset(2017, 1, 20, 16, 20, 0, TimeSpan.FromHours(-8)), // Recommended
-                    Category = NullString,
                 },
                 new Offer
                 {