[Springnet-commits] Spring.Net/test/Spring/Spring.Core.Tests/Core MethodParametersCountCriteriaTests.cs, 1.1, 1.2 MethodParametersCriteriaTests.cs, 1.1, 1.2

[Bruno B. <bb...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Core
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv17775/test/Spring/Spring.Core.Tests/Core

Modified Files:
	MethodParametersCountCriteriaTests.cs 
	MethodParametersCriteriaTests.cs 
Log Message:
MethodParametersCriteria and MethodParametersCountCriteria take into account 'params' parameter.

Index: MethodParametersCriteriaTests.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Core/MethodParametersCriteriaTests.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MethodParametersCriteriaTests.cs	4 Aug 2007 01:05:52 -0000	1.1
--- MethodParametersCriteriaTests.cs	20 Sep 2007 14:20:47 -0000	1.2
***************
*** 76,79 ****
--- 76,103 ----
          }
  
+         [Test]
+         public void IsSatisfiedWithParamsParameters()
+         {
+             MethodParametersCriteria criteria = new MethodParametersCriteria(new Type[] { typeof(int), typeof(string) });
+             MethodInfo method = GetType().GetMethod("ParamsParameters");
+             Assert.IsTrue(criteria.IsSatisfied(method), "Was not satisified with a method that takes a parameter array ('params') as a parameter.");
+ 
+             criteria = new MethodParametersCriteria(new Type[] { typeof(int), typeof(string[]) });
+             method = GetType().GetMethod("ParamsParameters");
+             Assert.IsTrue(criteria.IsSatisfied(method), "Was not satisified with a method that takes a parameter array ('params') as a parameter.");
+ 
+             criteria = new MethodParametersCriteria(new Type[] { typeof(int) });
+             method = GetType().GetMethod("ParamsParameters");
+             Assert.IsTrue(criteria.IsSatisfied(method), "Was not satisified with a method that takes a parameter array ('params') as a parameter.");
+ 
+             criteria = new MethodParametersCriteria(new Type[] { typeof(int), typeof(string), typeof(string), typeof(string) });
+             method = GetType().GetMethod("ParamsParameters");
+             Assert.IsTrue(criteria.IsSatisfied(method), "Was not satisified with a method that takes a parameter array ('params') as a parameter.");
+ 
+             criteria = new MethodParametersCriteria(new Type[] { typeof(int), typeof(string[]), typeof(string) });
+             method = GetType().GetMethod("ParamsParameters");
+             Assert.IsFalse(criteria.IsSatisfied(method), "Was not satisified with a method that takes a parameter array ('params') as a parameter.");
+         }
+ 
          // some methods for testing signatures...
          public void Foo () 
***************
*** 93,96 ****
--- 117,124 ----
          {
          }
+ 
+         public void ParamsParameters(int foo, params string[] strs)
+         {
+         }
  	}
  }

Index: MethodParametersCountCriteriaTests.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Core/MethodParametersCountCriteriaTests.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MethodParametersCountCriteriaTests.cs	4 Aug 2007 01:05:52 -0000	1.1
--- MethodParametersCountCriteriaTests.cs	20 Sep 2007 14:20:46 -0000	1.2
***************
*** 39,43 ****
      {
          [Test]
!         public void Instantiation () {
              MethodParametersCountCriteria criteria = new MethodParametersCountCriteria ();
              Assert.AreEqual (0, criteria.ExpectedParameterCount);
--- 39,44 ----
      {
          [Test]
!         public void Instantiation () 
!         {
              MethodParametersCountCriteria criteria = new MethodParametersCountCriteria ();
              Assert.AreEqual (0, criteria.ExpectedParameterCount);
***************
*** 62,81 ****
  
          [Test]
!         public void IsSatisfied () 
          {
              MethodParametersCountCriteria criteria = new MethodParametersCountCriteria ();
              MethodInfo method = GetType ().GetMethod ("NoParameter", BindingFlags.Public | BindingFlags.Instance);
              Assert.IsTrue (criteria.IsSatisfied (method));
  
!             criteria = new MethodParametersCountCriteria (1);
!             method = GetType ().GetMethod ("OneParameter", BindingFlags.Public | BindingFlags.Instance);
              Assert.IsTrue (criteria.IsSatisfied (method));
  
!             criteria = new MethodParametersCountCriteria (2);
!             method = GetType ().GetMethod ("TwoParameters", BindingFlags.Public | BindingFlags.Instance);
              Assert.IsTrue (criteria.IsSatisfied (method));
          }
  
          [Test]
          public void IsNotSatisfiedWithNull () 
          {
--- 63,110 ----
  
          [Test]
!         public void IsSatisfiedWithNoParameter () 
          {
              MethodParametersCountCriteria criteria = new MethodParametersCountCriteria ();
              MethodInfo method = GetType ().GetMethod ("NoParameter", BindingFlags.Public | BindingFlags.Instance);
              Assert.IsTrue (criteria.IsSatisfied (method));
+         }
  
!         [Test]
!         public void IsSatisfiedWithOneParameter () 
!         {
!             MethodParametersCountCriteria criteria = new MethodParametersCountCriteria ();
!             MethodInfo method = GetType().GetMethod("OneParameter", BindingFlags.Public | BindingFlags.Instance);
              Assert.IsTrue (criteria.IsSatisfied (method));
+         }
  
!         [Test]
!         public void IsSatisfiedWithTwoParameters () 
!         {
!             MethodParametersCountCriteria criteria = new MethodParametersCountCriteria(2);
!             MethodInfo method = GetType().GetMethod("TwoParameters", BindingFlags.Public | BindingFlags.Instance);
              Assert.IsTrue (criteria.IsSatisfied (method));
          }
  
          [Test]
+         public void IsSatisfiedWithParamsParameters () 
+         {
+             MethodParametersCountCriteria criteria = new MethodParametersCountCriteria(1);
+             MethodInfo method = GetType().GetMethod("ParamsParameters", BindingFlags.Public | BindingFlags.Instance);
+             Assert.IsFalse(criteria.IsSatisfied(method));
+ 
+             criteria = new MethodParametersCountCriteria(2);
+             method = GetType().GetMethod("ParamsParameters", BindingFlags.Public | BindingFlags.Instance);
+             Assert.IsTrue(criteria.IsSatisfied(method));
+ 
+             criteria = new MethodParametersCountCriteria (3);
+             method = GetType().GetMethod("ParamsParameters", BindingFlags.Public | BindingFlags.Instance);
+             Assert.IsTrue (criteria.IsSatisfied (method));
+ 
+             criteria = new MethodParametersCountCriteria(5);
+             method = GetType().GetMethod("ParamsParameters", BindingFlags.Public | BindingFlags.Instance);
+             Assert.IsTrue(criteria.IsSatisfied(method));
+         }
+ 
+         [Test]
          public void IsNotSatisfiedWithNull () 
          {
***************
*** 96,99 ****
--- 125,132 ----
          {
          }
+ 
+         public void ParamsParameters(int foo, int bar, params string[] strs)
+         {
+         }
  	}
  }