Fix for 31. Not picking up ambiguous arg matchers properly

Update SuppliedArgumentSpecifications to return AnyFor correctly if object has already been removed.
nsubstitute · Oct 14, 2010 · 8d8aebf · 8d8aebf
1 parent 72be8ee
commit 8d8aebf
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/Source/NSubstitute.Acceptance.Specs/ParameterMatching.cs b/Source/NSubstitute.Acceptance.Specs/ParameterMatching.cs
@@ -108,7 +108,6 @@ public void Received_should_compare_elements_for_params_arguments()
         }
 
         [Test]
-        [Pending]
         public void Throw_with_ambiguous_arguments_when_given_an_arg_matcher_and_a_default_arg_value()
         {
             Assert.Throws<AmbiguousArgumentsException>(() =>

diff --git a/Source/NSubstitute.Specs/Arguments/SuppliedArgumentSpecificationsSpecs.cs b/Source/NSubstitute.Specs/Arguments/SuppliedArgumentSpecificationsSpecs.cs
@@ -37,6 +37,13 @@ public void AnyFor_should_return_true()
                 Assert.That(sut.AnyFor(Type3), Is.True);
             }
 
+            [Test]
+            public void AnyFor_should_return_true_after_items_removed()
+            {
+                sut.DequeueAll();
+                Assert.That(sut.AnyFor(Type3), Is.True);
+            }
+
             [Test]
             public void AnyFor_should_return_false()
             {

diff --git a/Source/NSubstitute/Core/Arguments/SuppliedArgumentSpecifications.cs b/Source/NSubstitute/Core/Arguments/SuppliedArgumentSpecifications.cs
@@ -7,15 +7,17 @@ namespace NSubstitute.Core.Arguments
     public class SuppliedArgumentSpecifications : ISuppliedArgumentSpecifications
     {
         private readonly Queue<IArgumentSpecification> _queue;
+        private readonly List<IArgumentSpecification> _list;
 
         public SuppliedArgumentSpecifications(IEnumerable<IArgumentSpecification> argumentSpecifications)
         {
-            _queue = new Queue<IArgumentSpecification>(argumentSpecifications);
+            _list = new List<IArgumentSpecification>(argumentSpecifications);
+            _queue = new Queue<IArgumentSpecification>(_list);
         }
 
         public bool AnyFor(Type type)
         {
-            return _queue.Any(x => x.ForType == type);
+            return _list.Any(x => x.ForType == type);
         }
 
         public bool NextFor(Type type)