Fixed issue #114: Args matches with optional parameters broken

Source/NSubstitute.Acceptance.Specs/FieldReports/Issue114_ArgumentCheckOfOptionalParameter.cs

@@ -2,7 +2,7 @@
 
 namespace NSubstitute.Acceptance.Specs.FieldReports
 {
-    public class Issue_ArgumentCheckOfOptionalParameter
+    public class Issue114_ArgumentCheckOfOptionalParameter
     {
         public interface IInterface
         {
@@ -10,7 +10,6 @@ namespace NSubstitute.Acceptance.Specs.FieldReports
         }
 
         [Test]
-        [Pending, Explicit]
         public void PassArgumentCheckForOptionalParameter()
         {
             var substitute = Substitute.For<IInterface>();

Source/NSubstitute.Acceptance.Specs/NSubstitute.Acceptance.Specs.csproj

@@ -76,7 +76,7 @@
     <Compile Include="FieldReports\Issue110_CustomExceptions.cs" />
     <Compile Include="FieldReports\Issue118_ConcreteClassWithPublicStaticMethod.cs" />
     <Compile Include="FieldReports\Issue111_ArgMatchesWithRefAndOutParams.cs" />
-    <Compile Include="FieldReports\Issue_ArgumentCheckOfOptionalParameter.cs" />
+    <Compile Include="FieldReports\Issue114_ArgumentCheckOfOptionalParameter.cs" />
     <Compile Include="PartialSubExamples.cs" />
     <Compile Include="ReturnsAndDoes.cs" />
     <Compile Include="ExceptionsWhenCheckingReceivedCalls.cs" />

Source/NSubstitute/Core/Arguments/NonParamsArgumentSpecificationFactory.cs

@@ -18,7 +18,7 @@ namespace NSubstitute.Core.Arguments
             {
                 return suppliedArgumentSpecifications.Dequeue();
             }
-            if (!suppliedArgumentSpecifications.AnyFor(argument, parameterInfo.ParameterType))
+            if (!suppliedArgumentSpecifications.AnyFor(argument, parameterInfo.ParameterType) || parameterInfo.IsOptional)
             {
                 return _argumentEqualsSpecificationFactory.Create(argument, parameterInfo.ParameterType);
             }

Source/NSubstitute/Core/IParameterInfo.cs

@@ -6,5 +6,6 @@ namespace NSubstitute.Core
     {
         Type ParameterType { get; }
         bool IsParams { get; }
+        bool IsOptional { get; }
     }
 }

Source/NSubstitute/Core/ParameterInfoFromType.cs

@@ -20,5 +20,10 @@ namespace NSubstitute.Core
         {
             get { return false; }
         }
+
+        public bool IsOptional
+        {
+            get { return false; }
+        }
     }
 }

Source/NSubstitute/Core/ParameterInfoWrapper.cs

@@ -21,5 +21,10 @@ namespace NSubstitute.Core
         {
             get { return _parameterInfo.IsParams(); }
         }
+
+        public bool IsOptional
+        {
+            get { return _parameterInfo.IsOptional; }
+        }
     }
 }