[Adapdev-commits] Adapdev/src/Adapdev.UnitTest.TestRunner Adapdev.UnitTest.TestRunner.csproj,1.3,1.4 AdapdevTestRunner.cs,1.3,1.4

[Sean M. <int...@us...>]

Update of /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.TestRunner
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19786/src/Adapdev.UnitTest.TestRunner

Modified Files:
	Adapdev.UnitTest.TestRunner.csproj AdapdevTestRunner.cs 
Log Message:
Updated TestDriven.NET integration
Added TestDriven.NET FitTests
Changed version number to 0.8.4

Index: AdapdevTestRunner.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.TestRunner/AdapdevTestRunner.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AdapdevTestRunner.cs	16 Nov 2005 07:01:59 -0000	1.3
--- AdapdevTestRunner.cs	28 Nov 2005 23:40:24 -0000	1.4
***************
*** 2,7 ****
--- 2,9 ----
  using System.Text;
  using TestDriven.Framework;
+ using TDF = TestDriven.Framework;
  using System.Reflection;
  using Adapdev.UnitTest.Core;
+ using AUC = Adapdev.UnitTest.Core;
  using System.Diagnostics;
  
***************
*** 10,14 ****
      public class AdapdevTestRunner : ITestRunner
      {
!         public TestRunResult RunAssembly(ITestListener testListener, Assembly assembly)
          {
  			ITestSuiteFilter filter = new NoFilter();
--- 12,16 ----
      public class AdapdevTestRunner : ITestRunner
      {
!         public TestRunState RunAssembly(ITestListener testListener, Assembly assembly)
          {
  			ITestSuiteFilter filter = new NoFilter();
***************
*** 16,20 ****
  		}
  
!         public TestRunResult RunMember(ITestListener testListener, Assembly assembly, MemberInfo member)
          {
  			if (member is Type)
--- 18,22 ----
  		}
  
!         public TestRunState RunMember(ITestListener testListener, Assembly assembly, MemberInfo member)
          {
  			if (member is Type)
***************
*** 30,38 ****
  			else
  			{
! 				return TestRunResult.NoTests;
  			}
          }
  
!         public TestRunResult RunNamespace(ITestListener testListener, Assembly assembly, string ns)
          {
  			ITestSuiteFilter filter = new NamespaceFilter(ns);
--- 32,40 ----
  			else
  			{
! 				return TestRunState.NoTests;
  			}
          }
  
!         public TestRunState RunNamespace(ITestListener testListener, Assembly assembly, string ns)
          {
  			ITestSuiteFilter filter = new NamespaceFilter(ns);
***************
*** 40,44 ****
          }
  
! 		TestRunResult run(ITestListener testListener, Assembly assembly, ITestSuiteFilter filter)
  		{
  			string assemblyFile = new Uri(assembly.CodeBase).LocalPath;
--- 42,46 ----
          }
  
! 		TestRunState run(ITestListener testListener, Assembly assembly, ITestSuiteFilter filter)
  		{
  			string assemblyFile = new Uri(assembly.CodeBase).LocalPath;
***************
*** 49,53 ****
  			if (suite.GetTestCount() == 0)
  			{
! 				return TestRunResult.NoTests;
  			}
  
--- 51,55 ----
  			if (suite.GetTestCount() == 0)
  			{
! 				return TestRunState.NoTests;
  			}
  
***************
*** 58,62 ****
  
  			// HACK: Not always Success.
! 			return TestRunResult.Success;
  		}
  
--- 60,64 ----
  
  			// HACK: Not always Success.
! 			return TestRunState.Success;
  		}
  
***************
*** 75,79 ****
              {
                  TestEventDispatcher dispatcher = new TestEventDispatcher();
-                 dispatcher.TestCompleted += new TestCompletedEventHandler(dispatcher_TestCompleted);
  				dispatcher.TestIterationCompleted += new TestIterationCompletedEventHandler(dispatcher_TestIterationCompleted);
  				dispatcher.TestSuiteCompleted += new TestSuiteCompletedEventHandler(dispatcher_TestSuiteCompleted);
--- 77,80 ----
***************
*** 81,114 ****
              }
  
-             void dispatcher_TestCompleted(object sender, TestResultEventArgs e)
-             {
- 			}
- 
  			private void dispatcher_TestIterationCompleted(object sender, TestIterationEventArgs e)
  			{
! 				// HACK: Should this event fire if the test is ForcedIgnore?
! 				if (e.TestIteration.State != TestState.Ignore)
  				{
! 					TestResultSummary summary = new TestResultSummary();
! 					summary.TotalTests = this.testCount;
! 					summary.IsFailure = e.TestIteration.State == TestState.Fail;
! 					summary.IsSuccess = e.TestIteration.State == TestState.Pass;
! 					summary.IsExecuted = summary.IsFailure || summary.IsSuccess;
  
! 					// This is the correct code, but commented out
! 					// since the TextFormatter is currently in place
! //					if(summary.IsFailure)
! //					{
! //						summary.StackTrace = e.TestIteration.FullStackTrace;
! //						summary.Message =	e.TestIteration.Result +
! //											Environment.NewLine +
! //											e.TestIteration.ConsoleOutput; 
! //											// ConsoleOutput is a hack since 
! //											// I don't see a property in TestResultSummary.
! //											// Where should this go?
! //					}
! 					summary.Name = e.TestIteration.Name;
  					summary.TimeSpan = TimeSpan.FromSeconds(e.TestIteration.Duration);
- 					summary.TestRunner = GetType().FullName;
  					this.testListener.TestFinished(summary);
  				}
--- 82,125 ----
              }
  
  			private void dispatcher_TestIterationCompleted(object sender, TestIterationEventArgs e)
  			{
! 				// HACK: Should this event fire if ShouldRun == false?
! 				if (e.TestIteration.State != AUC.TestState.Ignore)
  				{
! 					string consoleError = e.TestIteration.ConsoleError;
! 					if(consoleError != null && consoleError.Length > 0)
! 					{
! 						// HACK: Console output is being redirected.
! 						Trace.Write(consoleError);
! 					}
  
! 					string consoleOutput = e.TestIteration.ConsoleOutput;
! 					if(consoleOutput != null && consoleOutput.Length > 0)
! 					{
! 						// HACK: Console output is being redirected.
! 						Trace.Write(consoleOutput);
! 					}
! 
! 					TDF.TestResult summary = new TDF.TestResult();
! 					summary.TotalTests = this.testCount;
! 					switch(e.TestIteration.State)
! 					{
! 						case AUC.TestState.Pass:
! 							summary.State = TDF.TestState.Passed;
! 							break;
! 						case AUC.TestState.Fail:
! 							summary.State = TDF.TestState.Failed;
! 							break;
! 						case AUC.TestState.Ignore:
! 						case AUC.TestState.Untested:
! 						case AUC.TestState.ForcedIgnore:
! 						default:
! 							summary.State = TDF.TestState.Ignored;
! 							break;
! 					}
! 					summary.StackTrace = e.TestIteration.FullStackTrace;
! 					summary.Message = e.TestIteration.Result;
! 					summary.Name = e.TestIteration.Name;  // HACK: Should be full test name.
  					summary.TimeSpan = TimeSpan.FromSeconds(e.TestIteration.Duration);
  					this.testListener.TestFinished(summary);
  				}
***************
*** 118,122 ****
  			private void dispatcher_TestSuiteCompleted(object sender, TestAssemblyResult[] tar)
  			{
! 				Console.WriteLine(new Adapdev.UnitTest.Core.TextFormatter(tar).GetText());
  			}
  		}
--- 129,133 ----
  			private void dispatcher_TestSuiteCompleted(object sender, TestAssemblyResult[] tar)
  			{
! 				//Console.WriteLine(new Adapdev.UnitTest.Core.TextFormatter(tar).GetText());
  			}
  		}

Index: Adapdev.UnitTest.TestRunner.csproj
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.TestRunner/Adapdev.UnitTest.TestRunner.csproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Adapdev.UnitTest.TestRunner.csproj	16 Nov 2005 07:01:59 -0000	1.3
--- Adapdev.UnitTest.TestRunner.csproj	28 Nov 2005 23:40:24 -0000	1.4
***************
*** 10,14 ****
                  ApplicationIcon = ""
                  AssemblyKeyContainerName = ""
!                 AssemblyName = "Adapdev.TestRunner"
                  AssemblyOriginatorKeyFile = ""
                  DefaultClientScript = "JScript"
--- 10,14 ----
                  ApplicationIcon = ""
                  AssemblyKeyContainerName = ""
!                 AssemblyName = "Adapdev.UnitTest.TestRunner"
                  AssemblyOriginatorKeyFile = ""
                  DefaultClientScript = "JScript"
***************
*** 19,23 ****
                  PreBuildEvent = ""
                  PostBuildEvent = ""
!                 RootNamespace = "Adapdev.TestRunner"
                  RunPostBuildEvent = "OnBuildSuccess"
                  StartupObject = ""
--- 19,23 ----
                  PreBuildEvent = ""
                  PostBuildEvent = ""
!                 RootNamespace = "Adapdev.UnitTest.TestRunner"
                  RunPostBuildEvent = "OnBuildSuccess"
                  StartupObject = ""