Merge pull request #4 from jpdillingham/dev

Resolved a NullReferenceException when using Populate() with a target Type containing no properties marked with an OperandsAttribute.

Author: jpdillingham

Utility.CommandLine.Arguments.Tests/Arguments.cs

@@ -539,4 +539,28 @@ public void PopulateOperands()
 
         #endregion Public Methods
     }
+
+    /// <summary>
+    ///     Unit tests for the <see cref="CommandLine.Arguments"/> class.
+    /// </summary>
+    /// <remarks>Used to facilitate testing of a class with no properties.</remarks>
+    [Collection("Arguments")]
+    public class TestClassWithNoProperties
+    {
+        #region Public Methods
+
+        /// <summary>
+        ///     Tests the <see cref="Utility.CommandLine.Arguments.Populate(Type, string)"/> method with an explicit string
+        ///     containing a single argument/value pair, and with a Type containing no properties.
+        /// </summary>
+        [Fact]
+        public void Populate()
+        {
+            Exception ex = Record.Exception(() => CommandLine.Arguments.Populate(GetType(), "--hello world one two"));
+
+            Assert.Null(ex);
+        }
+
+        #endregion Public Methods
+    }
 }

Utility.CommandLine.Arguments/Arguments.cs

@@ -312,13 +312,18 @@ public static void Populate(Type type, Arguments arguments)
 
             PropertyInfo operandsProperty = GetOperandsProperty(type);
 
-            if (operandsProperty.PropertyType.IsAssignableFrom(typeof(List<string>)))
+            // check to ensure the target class has a property marked with the Operands attribute; if not GetOperandsProperty()
+            // will return null.
+            if (operandsProperty != default(PropertyInfo))
             {
-                operandsProperty.SetValue(null, arguments.OperandList);
-            }
-            else
-            {
-                operandsProperty.SetValue(null, arguments.OperandList.ToArray());
+                if (operandsProperty.PropertyType.IsAssignableFrom(typeof(List<string>)))
+                {
+                    operandsProperty.SetValue(null, arguments.OperandList);
+                }
+                else
+                {
+                    operandsProperty.SetValue(null, arguments.OperandList.ToArray());
+                }
             }
         }
 
@@ -458,7 +463,7 @@ private static PropertyInfo GetOperandsProperty(Type type)
                     .Any(a => a.AttributeType.Name == typeof(OperandsAttribute).Name))
                         .FirstOrDefault();
 
-            if (property.PropertyType != typeof(string[]) && property.PropertyType != typeof(List<string>))
+            if (property != default(PropertyInfo) && property.PropertyType != typeof(string[]) && property.PropertyType != typeof(List<string>))
             {
                 throw new InvalidCastException("The target for the Operands attribute must be of string[] or List<string>.");
             }

Utility.CommandLine.Arguments/Properties/AssemblyInfo.cs

@@ -11,5 +11,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("b739dd22-4bd3-4d17-a351-33d129e9fe30")]
-[assembly: AssemblyVersion("1.1.1")]
-[assembly: AssemblyFileVersion("1.1.1")]
+[assembly: AssemblyVersion("1.1.2")]
+[assembly: AssemblyFileVersion("1.1.2")]