[Adapdev-commits] Adapdev/src/Adapdev.UnitTest.Core RunTestIterationCommand.cs,1.9,1.10 TestRunner.cs,1.14,1.15

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

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

Modified Files:
	RunTestIterationCommand.cs TestRunner.cs 
Log Message:


Index: RunTestIterationCommand.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core/RunTestIterationCommand.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** RunTestIterationCommand.cs	30 Dec 2005 20:42:11 -0000	1.9
--- RunTestIterationCommand.cs	3 Mar 2006 05:22:55 -0000	1.10
***************
*** 154,158 ****
  					}
  					ti.ExceptionType = e.InnerException.GetType().FullName;
! 					ti.FullStackTrace = e.InnerException.StackTrace;
  					ti.MemoryUsed = (kEnd - kStart)/1024;
  
--- 154,158 ----
  					}
  					ti.ExceptionType = e.InnerException.GetType().FullName;
! 					ti.FullStackTrace = this.FilterAdapdev(e.InnerException.StackTrace);
  					ti.MemoryUsed = (kEnd - kStart)/1024;
  
***************
*** 164,168 ****
  					ti.State = TestState.ForcedIgnore;
  					ti.ExceptionType = e.InnerException.GetType().FullName;
! 					ti.FullStackTrace = e.InnerException.StackTrace;
  				}
  				else
--- 164,168 ----
  					ti.State = TestState.ForcedIgnore;
  					ti.ExceptionType = e.InnerException.GetType().FullName;
! 					ti.FullStackTrace = this.FilterAdapdev(e.InnerException.StackTrace);
  				}
  				else
***************
*** 170,174 ****
  					ti.Result = e.InnerException.Message;
  					ti.ExceptionType = e.InnerException.GetType().FullName;
! 					ti.FullStackTrace = e.InnerException.StackTrace;
  					ti.State = TestState.Fail;
  				}
--- 170,174 ----
  					ti.Result = e.InnerException.Message;
  					ti.ExceptionType = e.InnerException.GetType().FullName;
! 					ti.FullStackTrace = this.FilterAdapdev(e.InnerException.StackTrace);
  					ti.State = TestState.Fail;
  				}
***************
*** 237,240 ****
--- 237,261 ----
  		}
  
+ 		private string FilterAdapdev(string exception)
+ 		{
+ 			int last = exception.LastIndexOf("Adapdev.UnitTest.Assert");
+ 			
+ 			// make sure it's present
+ 			if(last > -1)
+ 			{
+ 				int line = exception.IndexOf("at", last);
+ 
+ 				// make sure it's present
+ 				if(line > -1 && line > last && line < exception.Length)
+ 					return exception.Substring(line, exception.Length - line);
+ 				else
+ 					return exception;
+ 			}
+ 			else
+ 			{
+ 				return exception;
+ 			}
+ 		}
+ 
  
  		public object Execute(object o){this.Execute();return 1;}

Index: TestRunner.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core/TestRunner.cs,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** TestRunner.cs	21 Feb 2006 04:31:18 -0000	1.14
--- TestRunner.cs	3 Mar 2006 05:22:55 -0000	1.15
***************
*** 1,2 ****
--- 1,3 ----
+ using System.Text;
  using Adapdev.Reflection;