[Nant-commits] CVS: nant/src/NAnt/Tasks/NUnit NUnitTestRunner.cs,1.6,1.7

[Gerry S. <ger...@us...>]

Update of /cvsroot/nant/nant/src/NAnt/Tasks/NUnit
In directory usw-pr-cvs1:/tmp/cvs-serv12083/src/NAnt/Tasks/NUnit

Modified Files:
	NUnitTestRunner.cs 
Log Message:
* updated to NUnit 1.11 official release

Index: NUnitTestRunner.cs
===================================================================
RCS file: /cvsroot/nant/nant/src/NAnt/Tasks/NUnit/NUnitTestRunner.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** NUnitTestRunner.cs	28 Jan 2002 02:25:01 -0000	1.6
--- NUnitTestRunner.cs	27 Feb 2002 00:41:22 -0000	1.7
***************
*** 22,26 ****
  using NUnit.Runner;
  using System.Reflection;
! using System.Runtime.Remoting; 
  
  namespace SourceForge.NAnt.Tasks.NUnit {
--- 22,26 ----
  using NUnit.Runner;
  using System.Reflection;
! using System.Runtime.Remoting;
  
  namespace SourceForge.NAnt.Tasks.NUnit {
***************
*** 55,74 ****
          /// <summary>Returns the test suite from a given class.</summary>
          /// <remarks>
!         /// The className parameter needs to be in form:
          /// "full.qualified.class.name,Assembly"
          /// </remarks>
!         ITest GetSuite(string className) {
              // Don't worry about catching exceptions in this method.  The
              // NUnitTask will catch them and throw a BuildException back to
              // NAnt with the correct location in the build file. [gs]
-           
-             Type testClass = new StandardTestSuiteLoader().Load(className);                        
-             PropertyInfo suiteProperty = testClass.GetProperty("Suite", new Type[0]);
-             if (suiteProperty == null) {
-                 // try to extract a test suite automatically
-                 return new TestSuite(testClass);
-             }
  
!             ITest test = (ITest)suiteProperty.GetValue(null, new Type[0]);
              return test;
          }
--- 55,68 ----
          /// <summary>Returns the test suite from a given class.</summary>
          /// <remarks>
!         /// The assemblyQualifiedName parameter needs to be in form:
          /// "full.qualified.class.name,Assembly"
          /// </remarks>
!         ITest GetSuite(string assemblyQualifiedName) {
              // Don't worry about catching exceptions in this method.  The
              // NUnitTask will catch them and throw a BuildException back to
              // NAnt with the correct location in the build file. [gs]
  
!             StandardLoader loader = new StandardLoader();
!             ITest test = loader.LoadTest(assemblyQualifiedName);
              return test;
          }
***************
*** 151,155 ****
          // Formatter notification methods
          //---------------------------------------------------------
!         
          void FireStartTestSuite() {
              foreach (IResultFormatter formatter in Formatters) {
--- 145,149 ----
          // Formatter notification methods
          //---------------------------------------------------------
! 
          void FireStartTestSuite() {
              foreach (IResultFormatter formatter in Formatters) {