make TrimOuterQuotes() an extension method

Author: jpdillingham

src/Utility.CommandLine.Arguments/Arguments.cs

@@ -96,6 +96,20 @@ internal static Type GetCallingType(string caller)
 
             return callingMethod.DeclaringType;
         }
+
+        internal static string TrimOuterQuotes(this string value)
+        {
+            if (value.StartsWith("\"") && value.EndsWith("\""))
+            {
+                value = value.Trim('"');
+            }
+            else if (value.StartsWith("'") && value.EndsWith("'"))
+            {
+                value = value.Trim('\'');
+            }
+
+            return value;
+        }
     }
 
     /// <summary>
@@ -554,7 +568,7 @@ private static List<KeyValuePair<string, string>> GetArgumentList(string command
                 string argument = match.Groups[1].Value;
                 string value = match.Groups[2].Value;
 
-                value = TrimOuterQuotes(value);
+                value = value.TrimOuterQuotes();
 
                 // check to see if the argument uses a single dash. if so, split the argument name into a char array and add each
                 // to the list. if a value is specified, it belongs to the final character.
@@ -618,7 +632,7 @@ private static List<string> GetOperandList(string commandLineString)
                 string fullMatch = match.Groups[0].Value;
                 string operand = match.Groups[3].Value;
 
-                operands.Add(TrimOuterQuotes(operand));
+                operands.Add(operand.TrimOuterQuotes());
             }
 
             return operands;
@@ -650,20 +664,6 @@ private static PropertyInfo GetOperandsProperty(Type type)
 
             return property;
         }
-
-        private static string TrimOuterQuotes(string value)
-        {
-            if (value.StartsWith("\"") && value.EndsWith("\""))
-            {
-                value = value.Trim('"');
-            }
-            else if (value.StartsWith("'") && value.EndsWith("'"))
-            {
-                value = value.Trim('\'');
-            }
-
-            return value;
-        }
     }
 
     /// <summary>

tests/Utility.CommandLine.Arguments.Tests/ArgumentsTests.cs

@@ -464,8 +464,19 @@ public void PopulateMultipleValuesNotCollectionBacked()
         {
             Exception ex = Record.Exception(() => CommandLine.Arguments.Populate(GetType(), "--integer 1 --integer 2"));
 
-            Assert.NotNull(ex);
-            Assert.IsType<InvalidCastException>(ex);
+            Assert.Null(ex);
+
+            Assert.Equal(2, Integer);
+        }
+
+        [Fact]
+        public void PopulateMultipleValuesNotCollectionBacked_Last_Value_Wins()
+        {
+            Exception ex = Record.Exception(() => CommandLine.Arguments.Populate(GetType(), "--integer 2 --integer 1"));
+
+            Assert.Null(ex);
+
+            Assert.Equal(1, Integer);
         }
 
         [Fact]
@@ -851,7 +862,7 @@ public void Value_Is_Replaced_Given_Multiple_Short()
 
             Assert.Single(dict);
 
-            Assert.Equal(2, dict["b"]);
+            Assert.Equal("2", dict["b"]);
         }
 
         [Fact]
@@ -866,7 +877,7 @@ public void Value_Is_Replaced_Given_Multiple_Long()
 
             Assert.Single(dict);
 
-            Assert.Equal(2, dict["bb"]);
+            Assert.Equal("2", dict["bb"]);
         }
 
         [Fact]
@@ -881,7 +892,7 @@ public void Value_Is_Replaced_Given_Mixed_Args_Long_First()
 
             Assert.Single(dict);
 
-            Assert.Equal(2, dict["bb"]);
+            Assert.Equal("2", dict["bb"]);
         }
 
         [Fact]
@@ -896,7 +907,7 @@ public void Value_Is_Replaced_Given_Mixed_Args_Short_First()
 
             Assert.Single(dict);
 
-            Assert.Equal(2, dict["b"]);
+            Assert.Equal("2", dict["b"]);
         }
 
         [Fact]
@@ -912,8 +923,8 @@ public void Value_Is_Not_Replaced_Given_Mixed_Args_Short_First_No_Type()
             Assert.Equal(2, dict.Count);
             Assert.True(dict.ContainsKey("b"));
             Assert.True(dict.ContainsKey("bb"));
-            Assert.Equal(1, dict["b"]);
-            Assert.Equal(2, dict["bb"]);
+            Assert.Equal("1", dict["b"]);
+            Assert.Equal("2", dict["bb"]);
         }
     }