[Adapdev-commits] Adapdev/src/Adapdev.UnitTest.Core LocalSeparateTestEngine.cs,1.6,1.7 LocalTestEngine.cs,1.6,1.7 TestRunner.cs,1.15,1.16 TestSuiteBuilder.cs,1.19,1.20

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

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

Modified Files:
	LocalSeparateTestEngine.cs LocalTestEngine.cs TestRunner.cs 
	TestSuiteBuilder.cs 
Log Message:


Index: TestSuiteBuilder.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core/TestSuiteBuilder.cs,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** TestSuiteBuilder.cs	1 Mar 2006 01:38:51 -0000	1.19
--- TestSuiteBuilder.cs	29 Mar 2006 05:30:53 -0000	1.20
***************
*** 1,4 ****
--- 1,5 ----
  using System.Collections.Specialized;
  using System.Diagnostics;
+ using System.Text;
  using Adapdev.Reflection;
  
***************
*** 55,58 ****
--- 56,60 ----
  		// create the logger
  		private static readonly ILog log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+ 		private StringBuilder sb = new StringBuilder();
  
  		public static string DependencyLog = String.Empty;
***************
*** 68,74 ****
  					ts.AddTestAssembly(this.BuildAssembly(assemblyName));
  				}
! 				catch(FileNotFoundException)
  				{
! 					log.Error("Assembly couldn't be found: " + assemblyName);
  				}
  			}
--- 70,76 ----
  					ts.AddTestAssembly(this.BuildAssembly(assemblyName));
  				}
! 				catch(FileNotFoundException ex)
  				{
! 					//sb.Append("Assembly couldn't be found: " + assemblyName + Environment.NewLine);
  				}
  			}
***************
*** 88,94 ****
  			string orig = Environment.CurrentDirectory;
  			Environment.CurrentDirectory = fi.DirectoryName;
! 			//Console.WriteLine("Building assembly: " + assemblyName);
! 			//Console.WriteLine("Environment Directory: " + orig);
! 			//Console.WriteLine("Assembly Directory: " + fi.DirectoryName);
  
  			// add the assembly to the AssemblyCache
--- 90,96 ----
  			string orig = Environment.CurrentDirectory;
  			Environment.CurrentDirectory = fi.DirectoryName;
! 			//sb.Append("Building assembly: " + assemblyName + Environment.NewLine);
! 			//sb.Append("Environment Directory: " + orig + Environment.NewLine);
! 			//sb.Append("Assembly Directory: " + fi.DirectoryName + Environment.NewLine);
  
  			// add the assembly to the AssemblyCache
***************
*** 117,121 ****
  				// restore the original environment
  				Environment.CurrentDirectory = orig;
! 				//Console.WriteLine(ta.ToString());
  			}
  			catch (Exception e)
--- 119,123 ----
  				// restore the original environment
  				Environment.CurrentDirectory = orig;
! 				//////sb.Append(ta.ToString());
  			}
  			catch (Exception e)
***************
*** 133,137 ****
  				try
  				{
! 					//Console.WriteLine("Building TestFixture " + t.FullName);
  
  					// Build the TestFixture
--- 135,139 ----
  				try
  				{
! 					//////sb.Append("Building TestFixture " + t.FullName);
  
  					// Build the TestFixture
***************
*** 158,162 ****
  							|| md.Contains("NUnit.Framework.TestAttribute"))
  						{
! 							//Console.WriteLine("Building Test " + mi.Name);
  							tf.AddTest(this.BuildTest(mi, tf));
  						}
--- 160,164 ----
  							|| md.Contains("NUnit.Framework.TestAttribute"))
  						{
! 							//////sb.Append("Building Test " + mi.Name);
  							tf.AddTest(this.BuildTest(mi, tf));
  						}
***************
*** 164,168 ****
  							|| md.Contains("NUnit.Framework.TestFixtureSetUpAttribute"))
  						{
! 							//Console.WriteLine("Building TestFixtureSetUp " + mi.Name);
  							tf.AddFixtureSetUp(this.BuildBaseTestHelper(mi, tf));
  						}
--- 166,170 ----
  							|| md.Contains("NUnit.Framework.TestFixtureSetUpAttribute"))
  						{
! 							//////sb.Append("Building TestFixtureSetUp " + mi.Name);
  							tf.AddFixtureSetUp(this.BuildBaseTestHelper(mi, tf));
  						}
***************
*** 170,174 ****
  							|| md.Contains("NUnit.Framework.TestFixtureTearDownAttribute"))
  						{
! 							//Console.WriteLine("Building TestFixtureTearDown " + mi.Name);
  							tf.AddFixtureTearDown(this.BuildBaseTestHelper(mi, tf));
  						}
--- 172,176 ----
  							|| md.Contains("NUnit.Framework.TestFixtureTearDownAttribute"))
  						{
! 							//////sb.Append("Building TestFixtureTearDown " + mi.Name);
  							tf.AddFixtureTearDown(this.BuildBaseTestHelper(mi, tf));
  						}
***************
*** 178,182 ****
  							)
  						{
! 							//Console.WriteLine("Building TestSetUp " + mi.Name);
  							tf.AddTestSetUp(this.BuildTestHelper(md, mi, tf));
  						}
--- 180,184 ----
  							)
  						{
! 							//////sb.Append("Building TestSetUp " + mi.Name);
  							tf.AddTestSetUp(this.BuildTestHelper(md, mi, tf));
  						}
***************
*** 186,194 ****
  							)
  						{
! 							//Console.WriteLine("Building TestTearDown " + mi.Name);
  							tf.AddTestTearDown(this.BuildTestHelper(md, mi, tf));
  						}
  					}
! 					//Console.WriteLine(tf.ToString());
  				}
  				catch(Exception ex)
--- 188,196 ----
  							)
  						{
! 							//////sb.Append("Building TestTearDown " + mi.Name);
  							tf.AddTestTearDown(this.BuildTestHelper(md, mi, tf));
  						}
  					}
! 					//////sb.Append(tf.ToString());
  				}
  				catch(Exception ex)
***************
*** 218,222 ****
  			this.ProcessTransactionAttribute(md, m, t);
  
! 			//Console.WriteLine("Test built: " + t.ToString());
  			return t;
  		}
--- 220,224 ----
  			this.ProcessTransactionAttribute(md, m, t);
  
! 			//////sb.Append("Test built: " + t.ToString());
  			return t;
  		}
***************
*** 395,402 ****
  			string lostNamespace = args.Name.Split((",").ToCharArray())[0];
  			string lostAssemblyFilename = Path.Combine(Environment.CurrentDirectory, lostNamespace + ".dll");
  
! 			//Console.WriteLine("Not found.  Trying to resolve " + lostAssemblyFilename);
! 			Assembly a = Assembly.LoadFile(lostAssemblyFilename);
! 			//if(a != null) //Console.WriteLine("Found.  Loaded " + a.GetName().Name + " - " + a.GetName().Version + " - " + a.Location);
  			
  			return a;
--- 397,414 ----
  			string lostNamespace = args.Name.Split((",").ToCharArray())[0];
  			string lostAssemblyFilename = Path.Combine(Environment.CurrentDirectory, lostNamespace + ".dll");
+ 			Assembly a = null;
  
! 			//sb.Append("Not found.  Trying to resolve " + lostAssemblyFilename + Environment.NewLine);
! 			try
! 			{
! 				a = Assembly.LoadFile(lostAssemblyFilename);
! 				//if(a != null) 
! 					//sb.Append("Found.  Loaded " + a.GetName().Name + " - " + a.GetName().Version + " - " + a.Location + Environment.NewLine);
! 			}
! 			catch(Exception ex)
! 			{
! 				//sb.Append("Couldn't find: " + lostAssemblyFilename + Environment.NewLine);
! 				//sb.Append(ex.Message + Environment.NewLine);
! 			}
  			
  			return a;
***************
*** 406,410 ****
  		{
  			AssemblyName assemblyName = assembly.GetName();
! 			//Console.WriteLine("Probing for: " + assemblyName);
  			if (! dependencyList.Contains(assemblyName.FullName))
  			{
--- 418,422 ----
  		{
  			AssemblyName assemblyName = assembly.GetName();
! 			////sb.Append("Probing for: " + assemblyName + Environment.NewLine);
  			if (! dependencyList.Contains(assemblyName.FullName))
  			{
***************
*** 419,423 ****
  					catch (Exception ex)
  					{
! 						Console.Write(ex.Message);
  					}
  				}
--- 431,435 ----
  					catch (Exception ex)
  					{
! 						//sb.Append("Error: " + ex.Message + Environment.NewLine);
  					}
  				}
***************
*** 427,431 ****
  		public void CurrentDomain_AssemblyLoad(object sender, AssemblyLoadEventArgs args)
  		{
! 			//Console.WriteLine("Loading: " + args.LoadedAssembly.FullName);
  		}
  	}
--- 439,448 ----
  		public void CurrentDomain_AssemblyLoad(object sender, AssemblyLoadEventArgs args)
  		{
! 			//sb.Append("Loading: " + args.LoadedAssembly.FullName + Environment.NewLine);
! 		}
! 
! 		public string Log
! 		{
! 			get{return this.sb.ToString();}
  		}
  	}

Index: LocalTestEngine.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core/LocalTestEngine.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LocalTestEngine.cs	16 Nov 2005 07:01:53 -0000	1.6
--- LocalTestEngine.cs	29 Mar 2006 05:30:53 -0000	1.7
***************
*** 15,18 ****
--- 15,19 ----
  		private string assembly;
  		private TestEventDispatcher dispatcher = null;
+ 		private string _log = String.Empty;
  
  		public LocalTestEngine(string assembly)
***************
*** 48,52 ****
  		{
  			TestSuiteBuilder builder = new TestSuiteBuilder();
! 			return builder.BuildAssemblies(this.assembly);
  		}
  
--- 49,55 ----
  		{
  			TestSuiteBuilder builder = new TestSuiteBuilder();
! 			TestSuite ts = builder.BuildAssemblies(this.assembly);
! 			this._log = builder.Log;
! 			return ts;
  		}
  
***************
*** 54,58 ****
  		{
  			TestSuiteBuilder builder = new TestSuiteBuilder();
! 			return builder.BuildAssembly(this.assembly);
  		}
  
--- 57,63 ----
  		{
  			TestSuiteBuilder builder = new TestSuiteBuilder();
! 			TestAssembly ta = builder.BuildAssembly(this.assembly);
! 			this._log = builder.Log;
! 			return ta;
  		}
  
***************
*** 91,94 ****
--- 96,104 ----
  		}
  
+ 		public string Log
+ 		{
+ 			get { return this._log; }
+ 		}
+ 
  	}
  }

Index: LocalSeparateTestEngine.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core/LocalSeparateTestEngine.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LocalSeparateTestEngine.cs	26 Nov 2005 08:09:23 -0000	1.6
--- LocalSeparateTestEngine.cs	29 Mar 2006 05:30:53 -0000	1.7
***************
*** 17,20 ****
--- 17,21 ----
  		private bool unloaded = false;
  		private readonly string testlib = Assembly.GetExecutingAssembly().GetName().FullName;
+ 		private string _log = String.Empty;
  
  		public LocalSeparateTestEngine(string assembly) : this(AppDomain.CurrentDomain.BaseDirectory, assembly){}

Index: TestRunner.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core/TestRunner.cs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** TestRunner.cs	3 Mar 2006 05:22:55 -0000	1.15
--- TestRunner.cs	29 Mar 2006 05:30:53 -0000	1.16
***************
*** 135,140 ****
  			tar.Location = ta.Location;
  
- 			if(this._debugMode) log.Debug("Running TA " + ta.Name);
- 
  			if(_dispatcher != null) _dispatcher.OnTestAssemblyStarted(new TestAssemblyEventArgs(ta));
  			for (int i = 1; i <= ta.RepeatCount; i++)
--- 135,138 ----
***************
*** 142,160 ****
  				if (ta.RepeatDelay > 0) Thread.Sleep(ta.RepeatDelay);
  				TestAssemblyIteration tai = new TestAssemblyIteration();
  				if(_dispatcher != null)this._dispatcher.OnTestAssemblyIterationStarted(new TestAssemblyEventArgs(ta));
  
  				foreach (TestFixture tf in ta.GetTestFixtures())
  				{
! 					if (tf.ShouldRun && !tf.Ignore)
  					{
! 						TestFixtureResult tfr = this.Run(tf);
! 						tai.AddTestResult(tfr);
  					}
  				}
  				if(_dispatcher != null)_dispatcher.OnTestAssemblyIterationCompleted(new TestAssemblyIterationEventArgs(tai));
  				tai.Iteration = i;
  				tar.AddIteration(tai);
  			}
! 			if(_dispatcher != null)_dispatcher.OnTestAssemblyCompleted(new TestAssemblyResultEventArgs(tar));
  			Environment.CurrentDirectory = orig;
  			return tar;
--- 140,165 ----
  				if (ta.RepeatDelay > 0) Thread.Sleep(ta.RepeatDelay);
  				TestAssemblyIteration tai = new TestAssemblyIteration();
+ 				
  				if(_dispatcher != null)this._dispatcher.OnTestAssemblyIterationStarted(new TestAssemblyEventArgs(ta));
  
  				foreach (TestFixture tf in ta.GetTestFixtures())
  				{
! 					if (tf != null && tf.ShouldRun && !tf.Ignore)
  					{
! 							TestFixtureResult tfr = this.Run(tf);
! 							tai.AddTestResult(tfr);
  					}
  				}
+ 				
  				if(_dispatcher != null)_dispatcher.OnTestAssemblyIterationCompleted(new TestAssemblyIterationEventArgs(tai));
+ 				
+ 
  				tai.Iteration = i;
  				tar.AddIteration(tai);
  			}
! 
! 			try{if(_dispatcher != null)_dispatcher.OnTestAssemblyCompleted(new TestAssemblyResultEventArgs(tar));}
! 			catch(Exception){}
! 
  			Environment.CurrentDirectory = orig;
  			return tar;
***************
*** 173,183 ****
  				Assembly a = AssemblyCache.Get(tf.Parent.OriginalPath);
  
- 				if(this._debugMode) log.Debug("Running TF " + tf.Name);
- 
  				RunTestFixture(tf, a, classname, testFixtureResult);
  			}
  			catch (Exception e)
  			{
! 				Console.Write(e);
  			}
  			return testFixtureResult;
--- 178,186 ----
  				Assembly a = AssemblyCache.Get(tf.Parent.OriginalPath);
  
  				RunTestFixture(tf, a, classname, testFixtureResult);
  			}
  			catch (Exception e)
  			{
! 				testFixtureResult.State = TestState.Fail;
  			}
  			return testFixtureResult;