Added model binder test

Cleaned up some dead test classes that are no longer used by the model binder tests

Author: Keboo

src/System.CommandLine.Tests/Binding/ModelBinderTests.cs

@@ -616,5 +616,30 @@ public void Custom_ModelBinders_specified_via_BindingContext_can_be_used_for_com
 
             boundInstance.Value.Should().Be(456);
         }
+
+        [Fact]
+        public void Default_values_from_options_with_the_same_type_are_bound_and_use_their_own_defaults()
+        {
+            int first = 0, second = 0;
+
+            var rootCommand = new RootCommand
+            {
+                new Option<int>("one", () => 1),
+                new Option<int>("two", () => 2)
+            };
+            rootCommand.Handler = CommandHandler.Create<int, int>((one, two) =>
+            {
+                first = one;
+                second = two;
+            });
+
+            var parser = new CommandLineBuilder(rootCommand)
+                .Build();
+
+            parser.Invoke("");
+
+            first.Should().Be(1);
+            second.Should().Be(2);
+        }
     }
 }

src/System.CommandLine.Tests/Binding/TestModels.cs

@@ -5,26 +5,6 @@
 
 namespace System.CommandLine.Tests.Binding
 {
-    public class ClassWithSingleLetterCtorParameter
-    {
-        public ClassWithSingleLetterCtorParameter(int x, string y)
-        {
-            X = x;
-            Y = y;
-        }
-
-        public int X { get; }
-
-        public string Y { get; }
-    }
-
-    public class ClassWithSingleLetterProperty
-    {
-        public int X { get; set; }
-
-        public int Y { get; set; }
-    }
-
     public class ClassWithMultiLetterCtorParameters
     {
         public ClassWithMultiLetterCtorParameters(
@@ -66,23 +46,6 @@ public ClassWithSettersAndCtorParametersWithDifferentNames(
         public bool BoolOption { get; set; }
     }
 
-    public class ClassWithSettersAndCtorParametersWithMatchingNames
-    {
-        public ClassWithSettersAndCtorParametersWithMatchingNames(
-            int intOption = 123,
-            string stringOption = "the default",
-            bool boolOption = false)
-        {
-            IntOption = intOption;
-            StringOption = stringOption;
-            BoolOption = boolOption;
-        }
-
-        public int IntOption { get; set; }
-        public string StringOption { get; set; }
-        public bool BoolOption { get; set; }
-    }
-
     public class ClassWithCtorParameter<T>
     {
         public ClassWithCtorParameter(T value) => Value = value;
@@ -125,79 +88,6 @@ public Task<int> HandleAsync(T value)
         public T ReceivedValue { get; set; }
     }
 
-    public class TypeWithInvokeAndCtor
-    {
-        public TypeWithInvokeAndCtor(int intFromCtor, string stringFromCtor)
-        {
-            IntValueFromCtor = intFromCtor;
-            StringValueFromCtor = stringFromCtor;
-        }
-
-        public int IntValueFromCtor { get; }
-
-        public string StringValueFromCtor { get; }
-
-        public int IntProperty { get; set; }
-        public string StringProperty { get; set; }
-
-        public Task<int> Invoke(string stringParam, int intParam)
-        {
-            return Task.FromResult(76);
-        }
-    }
-
-    public class ClassWithInvokeAndDefaultCtor
-    {
-        public int IntProperty { get; set; }
-        public string StringProperty { get; set; }
-
-        public Task<int> Invoke(string stringParam, int intParam)
-        {
-            return Task.FromResult(66);
-        }
-
-        public Task<int> SomethingElse(int intParam, string stringParam)
-        {
-            return Task.FromResult(67);
-        }
-    }
-
-    public class ClassWithStaticsInvokeAndCtor
-    {
-        public ClassWithStaticsInvokeAndCtor(int intFromCtor, string stringFromCtor)
-        {
-            IntValueFromCtor = intFromCtor;
-            StringValueFromCtor = stringFromCtor;
-        }
-
-        public static int StaticIntProperty { get; set; } = 67;
-
-        public static string StaticStringProperty { get; set; }
-
-        public int IntValueFromCtor { get; }
-
-        public string StringValueFromCtor { get; }
-
-        public int IntProperty { get; set; }
-        public string StringProperty { get; set; }
-
-        public static Task<int> Invoke(string stringParam, int intParam)
-        {
-            return Task.FromResult(96);
-        }
-    }
-
-    public class ClassWithParameterlessInvokeAndDefaultCtor
-    {
-        public int IntProperty { get; set; }
-        public string StringProperty { get; set; }
-
-        public Task<int> Invoke()
-        {
-            return Task.FromResult(86);
-        }
-    }
-
     public class ClassWithMultipleCtor
     {
         public ClassWithMultipleCtor()