adapdev-commits

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

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

Modified Files:
	LocalSeparateTestEngine.cs LocalTestEngine.cs 
	TestEngineFactory.cs TestSuiteBuilder.cs 
Added Files:
	Adapdev.UnitTest.Core.csproj.user 
Log Message:
Several bug fixes for AbstractDAO
Added unit tests for NUnit support

Index: TestSuiteBuilder.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core/TestSuiteBuilder.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TestSuiteBuilder.cs	18 Sep 2005 03:04:45 -0000	1.6
--- TestSuiteBuilder.cs	21 Oct 2005 04:59:20 -0000	1.7
***************
*** 374,378 ****
  			Trace.Write("Not found.  Trying to resolve " + lostAssemblyFilename);
  			Assembly a = Assembly.LoadFile(lostAssemblyFilename);
! 			if(a != null) Trace.Write("Found.  Loaded " + a.GetName().Name + " - " + a.GetName().Version + " - " + a.Location);
  			
  			return a;
--- 374,378 ----
  			Trace.Write("Not found.  Trying to resolve " + lostAssemblyFilename);
  			Assembly a = Assembly.LoadFile(lostAssemblyFilename);
! 			if(a != null) Trace.WriteLine("Found.  Loaded " + a.GetName().Name + " - " + a.GetName().Version + " - " + a.Location);
  			
  			return a;
***************
*** 382,386 ****
  		{
  			AssemblyName assemblyName = assembly.GetName();
! 			Trace.Write("Probing for: " + assemblyName);
  			if (! dependencyList.Contains(assemblyName.FullName))
  			{
--- 382,386 ----
  		{
  			AssemblyName assemblyName = assembly.GetName();
! 			Trace.WriteLine("Probing for: " + assemblyName);
  			if (! dependencyList.Contains(assemblyName.FullName))
  			{
***************
*** 396,400 ****
  		public void CurrentDomain_AssemblyLoad(object sender, AssemblyLoadEventArgs args)
  		{
! 			Trace.Write("Loading: " + args.LoadedAssembly.FullName);
  		}
  	}
--- 396,400 ----
  		public void CurrentDomain_AssemblyLoad(object sender, AssemblyLoadEventArgs args)
  		{
! 			Trace.WriteLine("Loading: " + args.LoadedAssembly.FullName);
  		}
  	}

Index: LocalTestEngine.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core/LocalTestEngine.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LocalTestEngine.cs	23 Apr 2005 04:54:13 -0000	1.2
--- LocalTestEngine.cs	21 Oct 2005 04:59:20 -0000	1.3
***************
*** 19,23 ****
  		{
  			manager = new AppDomainManager();
! 			manager.AddAssemblies(this.assembly);
  			this.assembly = assembly;
  		}
--- 19,23 ----
  		{
  			manager = new AppDomainManager();
! 			manager.AddAssembly(assembly);
  			this.assembly = assembly;
  		}

Index: TestEngineFactory.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core/TestEngineFactory.cs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TestEngineFactory.cs	28 Feb 2005 01:32:21 -0000	1.1.1.1
--- TestEngineFactory.cs	21 Oct 2005 04:59:20 -0000	1.2
***************
*** 9,30 ****
  	public class TestEngineFactory
  	{
! 		public static LocalTestEngine CreateLocal(string assemblies)
  		{
! 			return new LocalTestEngine(assemblies);
  		}
  
! 		public static LocalSeparateTestEngine CreateLocalSeparate(string assemblies)
  		{
! 			return new LocalSeparateTestEngine(assemblies);
  		}
  
! 		public static LocalSeparateTestEngine CreateLocalSeparate(string basedir, string assemblies)
  		{
! 			return new LocalSeparateTestEngine(basedir, assemblies);
  		}
  
! 		public static LocalSeparateTestEngine CreateLocalSeparate(string basedir, string configfile, string assemblies)
  		{
! 			return new LocalSeparateTestEngine(basedir, configfile, assemblies);
  		}
  	}
--- 9,30 ----
  	public class TestEngineFactory
  	{
! 		public static LocalTestEngine CreateLocal(string assembly)
  		{
! 			return new LocalTestEngine(assembly);
  		}
  
! 		public static LocalSeparateTestEngine CreateLocalSeparate(string assembly)
  		{
! 			return new LocalSeparateTestEngine(assembly);
  		}
  
! 		public static LocalSeparateTestEngine CreateLocalSeparate(string basedir, string assembly)
  		{
! 			return new LocalSeparateTestEngine(basedir, assembly);
  		}
  
! 		public static LocalSeparateTestEngine CreateLocalSeparate(string basedir, string configfile, string assembly)
  		{
! 			return new LocalSeparateTestEngine(basedir, configfile, assembly);
  		}
  	}

Index: LocalSeparateTestEngine.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core/LocalSeparateTestEngine.cs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** LocalSeparateTestEngine.cs	28 Feb 2005 01:32:21 -0000	1.1.1.1
--- LocalSeparateTestEngine.cs	21 Oct 2005 04:59:20 -0000	1.2
***************
*** 95,99 ****
  		public void Dispose()
  		{
! 			if(!this.unloaded) Dispose(true);
  			GC.SuppressFinalize(this);
  		}
--- 95,103 ----
  		public void Dispose()
  		{
! 			if(!this.unloaded)
! 			{
! 				this.ShutDown();
! 				Dispose(true);
! 			}
  			GC.SuppressFinalize(this);
  		}

--- NEW FILE: Adapdev.UnitTest.Core.csproj.user ---
<VisualStudioProject>
    <CSHARP LastOpenVersion = "7.10.3077" >
        <Build>
            <Settings ReferencePath = "D:\projects\Adapdev\Adapdev\lib\" >
                <Config
                    Name = "Debug"
                    EnableASPDebugging = "false"
                    EnableASPXDebugging = "false"
                    EnableUnmanagedDebugging = "false"
                    EnableSQLServerDebugging = "false"
                    RemoteDebugEnabled = "false"
                    RemoteDebugMachine = ""
                    StartAction = "Project"
                    StartArguments = ""
                    StartPage = ""
                    StartProgram = ""
                    StartURL = ""
                    StartWorkingDirectory = ""
                    StartWithIE = "false"
                />
                <Config
                    Name = "Release"
                    EnableASPDebugging = "false"
                    EnableASPXDebugging = "false"
                    EnableUnmanagedDebugging = "false"
                    EnableSQLServerDebugging = "false"
                    RemoteDebugEnabled = "false"
                    RemoteDebugMachine = ""
                    StartAction = "Project"
                    StartArguments = ""
                    StartPage = ""
                    StartProgram = ""
                    StartURL = ""
                    StartWorkingDirectory = ""
                    StartWithIE = "false"
                />
            </Settings>
        </Build>
        <OtherProjectSettings
            CopyProjectDestinationFolder = ""
            CopyProjectUncPath = ""
            CopyProjectOption = "0"
            ProjectView = "ProjectFiles"
            ProjectTrust = "0"
        />
    </CSHARP>
</VisualStudioProject>