[Adapdev-commits] Adapdev/src/Adapdev.UnitTest.Core TestFramework.cs,NONE,1.1 Adapdev.UnitTest.Core.
Status: Beta
Brought to you by:
intesar66
Menu
▾
▴
[Adapdev-commits] Adapdev/src/Adapdev.UnitTest.Core TestFramework.cs,NONE,1.1 Adapdev.UnitTest.Core.csproj,1.3,1.4 ITestEngine.cs,1.1.1.1,1.2 LocalSeparateTestEngine.cs,1.2,1.3 LocalTestEngine.cs,1.3,1.4 Test.cs,1.2,1.3 TestFixtureIteration.cs,1.1.1.1,1.2 TestResult.cs,1.1.1.1,1.2 TestSuiteBuilder.cs,1.8,1.9
|
From: Sean M. <int...@us...> - 2005-10-23 07:27:29
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25792/src/Adapdev.UnitTest.Core Modified Files: Adapdev.UnitTest.Core.csproj ITestEngine.cs LocalSeparateTestEngine.cs LocalTestEngine.cs Test.cs TestFixtureIteration.cs TestResult.cs TestSuiteBuilder.cs Added Files: TestFramework.cs Log Message: Index: TestSuiteBuilder.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core/TestSuiteBuilder.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** TestSuiteBuilder.cs 22 Oct 2005 17:15:38 -0000 1.8 --- TestSuiteBuilder.cs 23 Oct 2005 07:27:20 -0000 1.9 *************** *** 87,93 **** string orig = Environment.CurrentDirectory; Environment.CurrentDirectory = fi.DirectoryName; ! Trace.Write("Building assembly: " + assemblyName); ! Trace.Write("Environment Directory: " + orig); ! Trace.Write("Assembly Directory: " + fi.DirectoryName); // add the assembly to the AssemblyCache --- 87,93 ---- string orig = Environment.CurrentDirectory; Environment.CurrentDirectory = fi.DirectoryName; ! log.Debug("Building assembly: " + assemblyName); ! log.Debug("Environment Directory: " + orig); ! log.Debug("Assembly Directory: " + fi.DirectoryName); // add the assembly to the AssemblyCache *************** *** 318,321 **** --- 318,322 ---- t.Category = a.Category; t.Description = a.Description; + t.TestType = a.TestType; } else if (TypeHelper.HasCustomAttribute(m, typeof (NUnit.Framework.TestAttribute))) Index: TestResult.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core/TestResult.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** TestResult.cs 28 Feb 2005 01:32:22 -0000 1.1.1.1 --- TestResult.cs 23 Oct 2005 07:27:20 -0000 1.2 *************** *** 46,49 **** --- 46,50 ---- protected string _category = ""; protected string _description = ""; + protected TestType _testType = TestType.Unit; public TestResult(Test t) *************** *** 51,54 **** --- 52,62 ---- this.Name = t.Name; this.Category = t.Category; + this.TestType = t.TestType; + } + + public TestType TestType + { + get{return this._testType;} + set{this._testType = value;} } --- NEW FILE: TestFramework.cs --- using System; namespace Adapdev.UnitTest.Core { /// <summary> /// Summary description for TestFramework. /// </summary> /// [Serializable] public enum TestFramework { NUnit, Adapdev, MbUnit } } Index: Adapdev.UnitTest.Core.csproj =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core/Adapdev.UnitTest.Core.csproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Adapdev.UnitTest.Core.csproj 14 Apr 2005 03:32:05 -0000 1.3 --- Adapdev.UnitTest.Core.csproj 23 Oct 2005 07:27:20 -0000 1.4 *************** *** 262,265 **** --- 262,270 ---- /> <File + RelPath = "TestFramework.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "TestHelper.cs" SubType = "Code" Index: TestFixtureIteration.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core/TestFixtureIteration.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** TestFixtureIteration.cs 28 Feb 2005 01:32:22 -0000 1.1.1.1 --- TestFixtureIteration.cs 23 Oct 2005 07:27:20 -0000 1.2 *************** *** 41,45 **** public class TestFixtureIteration : CompositeAbstractTestIteration { - } } \ No newline at end of file --- 41,44 ---- Index: Test.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core/Test.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Test.cs 27 Apr 2005 04:36:02 -0000 1.2 --- Test.cs 23 Oct 2005 07:27:20 -0000 1.3 *************** *** 54,57 **** --- 54,58 ---- protected string _exceptionMessage = null; protected TestFixture _parent = null; + protected TestType _testType = TestType.Unit; public Test() *************** *** 65,68 **** --- 66,75 ---- } + public TestType TestType + { + get{return this._testType;} + set{this._testType = value;} + } + public string ExpectedExceptionType { Index: ITestEngine.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core/ITestEngine.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ITestEngine.cs 28 Feb 2005 01:32:21 -0000 1.1.1.1 --- ITestEngine.cs 23 Oct 2005 07:27:20 -0000 1.2 *************** *** 17,20 **** --- 17,21 ---- void SetTestEventDispatcher(TestEventDispatcher dispatcher); void ShutDown(); + string ConfigurationFile{get;} } } Index: LocalTestEngine.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core/LocalTestEngine.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** LocalTestEngine.cs 21 Oct 2005 04:59:20 -0000 1.3 --- LocalTestEngine.cs 23 Oct 2005 07:27:20 -0000 1.4 *************** *** 85,88 **** --- 85,94 ---- { } + + public string ConfigurationFile + { + get { return this.manager.Domain.SetupInformation.ConfigurationFile; } + } + } } Index: LocalSeparateTestEngine.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.UnitTest.Core/LocalSeparateTestEngine.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LocalSeparateTestEngine.cs 21 Oct 2005 04:59:20 -0000 1.2 --- LocalSeparateTestEngine.cs 23 Oct 2005 07:27:20 -0000 1.3 *************** *** 1,4 **** --- 1,5 ---- using System; using System.Collections; + using System.IO; using Adapdev; *************** *** 21,25 **** public LocalSeparateTestEngine(string basedir, string assembly) { ! manager = new AppDomainManager(basedir, String.Empty, new string[]{assembly}); manager.AddAssembly(assembly); this.assembly = assembly; --- 22,34 ---- public LocalSeparateTestEngine(string basedir, string assembly) { ! FileInfo file = new FileInfo(assembly); ! if(file.Directory.GetFiles(file.Name + ".config").Length > 0) ! { ! manager = new AppDomainManager(basedir, Path.Combine(file.Directory.FullName, file.Name + ".config"), new string[]{assembly}); ! } ! else ! { ! manager = new AppDomainManager(basedir, String.Empty, new string[]{assembly}); ! } manager.AddAssembly(assembly); this.assembly = assembly; *************** *** 93,96 **** --- 102,110 ---- } + public string ConfigurationFile + { + get { return this.manager.Domain.SetupInformation.ConfigurationFile; } + } + public void Dispose() { |
