[Ccnet-checkins] ccnet/project/core/builder/test CommandLineBuilderTest.cs,1.5,1.6 DevenvBuilderTest.cs,1.5,1.6 MockBuilder.cs,1.8,1.9 NAntBuilderTest.cs,1.20,1.21

[Owen R. <exo...@us...>]

Update of /cvsroot/ccnet/ccnet/project/core/builder/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4990/project/core/builder/test

Modified Files:
	CommandLineBuilderTest.cs DevenvBuilderTest.cs MockBuilder.cs 
	NAntBuilderTest.cs 
Log Message:
introduced IIntegrationResult interface
removed Project from the ITask interface
various small refactoring/reformattings and using optimisations

Index: DevenvBuilderTest.cs
===================================================================
RCS file: /cvsroot/ccnet/ccnet/project/core/builder/test/DevenvBuilderTest.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DevenvBuilderTest.cs	17 Aug 2004 10:00:18 -0000	1.5
--- DevenvBuilderTest.cs	23 Aug 2004 12:38:13 -0000	1.6
***************
*** 92,96 ****
  			builder.Configuration = "Debug";
  
! 			builder.Run(new IntegrationResult(), project);
  
  			ProcessInfo info = (ProcessInfo) constraint.Parameter;
--- 92,96 ----
  			builder.Configuration = "Debug";
  
! 			builder.Run(new IntegrationResult());
  
  			ProcessInfo info = (ProcessInfo) constraint.Parameter;
***************
*** 110,114 ****
  
  			IntegrationResult result = new IntegrationResult();
! 			builder.Run(result, project);
  
  			Assert.AreEqual(IntegrationStatus.Success, result.Status);
--- 110,114 ----
  
  			IntegrationResult result = new IntegrationResult();
! 			builder.Run(result);
  
  			Assert.AreEqual(IntegrationStatus.Success, result.Status);
***************
*** 127,131 ****
  
  			IntegrationResult result = new IntegrationResult();
! 			builder.Run(result, project);
  
  			Assert.AreEqual(IntegrationStatus.Failure, result.Status);
--- 127,131 ----
  
  			IntegrationResult result = new IntegrationResult();
! 			builder.Run(result);
  
  			Assert.AreEqual(IntegrationStatus.Failure, result.Status);
***************
*** 142,146 ****
  			builder.Configuration = "Debug";
  
! 			builder.Run(new IntegrationResult(), project);
  		}
  
--- 142,146 ----
  			builder.Configuration = "Debug";
  
! 			builder.Run(new IntegrationResult());
  		}
  
***************
*** 155,159 ****
  			builder.Configuration = CONFIGURATION;
  
! 			builder.Run(new IntegrationResult(), project);
  		}
  	}
--- 155,159 ----
  			builder.Configuration = CONFIGURATION;
  
! 			builder.Run(new IntegrationResult());
  		}
  	}

Index: CommandLineBuilderTest.cs
===================================================================
RCS file: /cvsroot/ccnet/ccnet/project/core/builder/test/CommandLineBuilderTest.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CommandLineBuilderTest.cs	16 Aug 2004 10:13:32 -0000	1.5
--- CommandLineBuilderTest.cs	23 Aug 2004 12:38:13 -0000	1.6
***************
*** 19,24 ****
  		private CommandLineBuilder _builder;
  		private IMock _mockExecutor;
- 		private IProject project;
- 		private DynamicMock projectMock;
  
  		[SetUp]
--- 19,22 ----
***************
*** 27,32 ****
  			_mockExecutor = new DynamicMock(typeof(ProcessExecutor));
  			_builder = new CommandLineBuilder((ProcessExecutor) _mockExecutor.MockInstance);
- 			projectMock = new DynamicMock(typeof(IProject));
- 			project = (IProject) projectMock.MockInstance;
  		}
  
--- 25,28 ----
***************
*** 34,38 ****
  		{
  			_mockExecutor.Verify();
- 			projectMock.Verify();
  		}
  
--- 30,33 ----
***************
*** 78,82 ****
  
  			IntegrationResult result = new IntegrationResult();
! 			_builder.Run(result, project);
  
  			Assert.IsTrue(result.Succeeded);
--- 73,77 ----
  
  			IntegrationResult result = new IntegrationResult();
! 			_builder.Run(result);
  
  			Assert.IsTrue(result.Succeeded);
***************
*** 93,97 ****
  
  			IntegrationResult result = new IntegrationResult();
! 			_builder.Run(result, project);
  
  			Assert.IsTrue(result.Failed);
--- 88,92 ----
  
  			IntegrationResult result = new IntegrationResult();
! 			_builder.Run(result);
  
  			Assert.IsTrue(result.Failed);
***************
*** 108,112 ****
  
  			IntegrationResult result = new IntegrationResult();
! 			_builder.Run(result, project);
  			VerifyAll();
  		}
--- 103,107 ----
  
  			IntegrationResult result = new IntegrationResult();
! 			_builder.Run(result);
  			VerifyAll();
  		}
***************
*** 125,129 ****
  			_builder.BuildArgs = "test-args";
  			_builder.BuildTimeoutSeconds = 222;
! 			_builder.Run(result, project);
  
  			ProcessInfo info = (ProcessInfo) constraint.Parameter;
--- 120,124 ----
  			_builder.BuildArgs = "test-args";
  			_builder.BuildTimeoutSeconds = 222;
! 			_builder.Run(result);
  
  			ProcessInfo info = (ProcessInfo) constraint.Parameter;
***************
*** 137,145 ****
  		public void ShouldRun()
  		{
! 			AssertFalse(_builder.ShouldRun(new IntegrationResult(), new Project()));
! 			Assert.IsTrue(_builder.ShouldRun(CreateIntegrationResultWithModifications(IntegrationStatus.Unknown), project));
! 			Assert.IsTrue(_builder.ShouldRun(CreateIntegrationResultWithModifications(IntegrationStatus.Success), project));
! 			AssertFalse(_builder.ShouldRun(CreateIntegrationResultWithModifications(IntegrationStatus.Failure), project));
! 			AssertFalse(_builder.ShouldRun(CreateIntegrationResultWithModifications(IntegrationStatus.Exception), project));
  		}
  
--- 132,140 ----
  		public void ShouldRun()
  		{
! 			AssertFalse(_builder.ShouldRun(new IntegrationResult()));
! 			Assert.IsTrue(_builder.ShouldRun(CreateIntegrationResultWithModifications(IntegrationStatus.Unknown)));
! 			Assert.IsTrue(_builder.ShouldRun(CreateIntegrationResultWithModifications(IntegrationStatus.Success)));
! 			AssertFalse(_builder.ShouldRun(CreateIntegrationResultWithModifications(IntegrationStatus.Failure)));
! 			AssertFalse(_builder.ShouldRun(CreateIntegrationResultWithModifications(IntegrationStatus.Exception)));
  		}
  
***************
*** 167,171 ****
  		private void CheckBaseDirectoryIsProjectDirectoryWithGivenRelativePart(string relativeDirectory)
  		{
- 			projectMock.ExpectAndReturn("WorkingDirectory", "projectWorkingDirectory");
  			string expectedBaseDirectory = "projectWorkingDirectory";
  			if (relativeDirectory != "")
--- 162,165 ----
***************
*** 173,177 ****
  				expectedBaseDirectory = Path.Combine(expectedBaseDirectory, relativeDirectory);
  			}
! 			CheckBaseDirectory(expectedBaseDirectory);
  			VerifyAll();
  		}
--- 167,171 ----
  				expectedBaseDirectory = Path.Combine(expectedBaseDirectory, relativeDirectory);
  			}
! 			CheckBaseDirectory(new IntegrationResult("project", "projectWorkingDirectory"), expectedBaseDirectory);
  			VerifyAll();
  		}
***************
*** 180,189 ****
  		public void IfConfiguredBaseDirectoryIsAbsoluteUseItAtBaseDirectory()
  		{
- 			projectMock.ExpectNoCall("WorkingDirectory");
  			_builder.ConfiguredBaseDirectory = @"c:\my\base\directory";
! 			CheckBaseDirectory(@"c:\my\base\directory");
  		}
  
! 		private void CheckBaseDirectory(string expectedBaseDirectory)
  		{
  			ProcessResult returnVal = CreateSuccessfulProcessResult();
--- 174,182 ----
  		public void IfConfiguredBaseDirectoryIsAbsoluteUseItAtBaseDirectory()
  		{
  			_builder.ConfiguredBaseDirectory = @"c:\my\base\directory";
! 			CheckBaseDirectory(new IntegrationResult(), @"c:\my\base\directory");
  		}
  
! 		private void CheckBaseDirectory(IntegrationResult result, string expectedBaseDirectory)
  		{
  			ProcessResult returnVal = CreateSuccessfulProcessResult();
***************
*** 191,195 ****
  			_mockExecutor.ExpectAndReturn("Execute", returnVal, constraint);
  
! 			_builder.Run(new IntegrationResult(), project);
  
  			ProcessInfo info = (ProcessInfo) constraint.Parameter;
--- 184,188 ----
  			_mockExecutor.ExpectAndReturn("Execute", returnVal, constraint);
  
! 			_builder.Run(result);
  
  			ProcessInfo info = (ProcessInfo) constraint.Parameter;

Index: NAntBuilderTest.cs
===================================================================
RCS file: /cvsroot/ccnet/ccnet/project/core/builder/test/NAntBuilderTest.cs,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** NAntBuilderTest.cs	16 Aug 2004 10:13:32 -0000	1.20
--- NAntBuilderTest.cs	23 Aug 2004 12:38:13 -0000	1.21
***************
*** 1,2 ****
--- 1,4 ----
+ using System;
+ using System.ComponentModel;
  using System.IO;
  using Exortech.NetReflector;
***************
*** 4,9 ****
  using NMock.Constraints;
  using NUnit.Framework;
- using System;
- using System.ComponentModel;
  using ThoughtWorks.CruiseControl.Core.Util;
  using ThoughtWorks.CruiseControl.Remote;
--- 6,9 ----
***************
*** 19,32 ****
  		private NAntBuilder _builder;
  		private IMock _mockExecutor;
- 		private DynamicMock projectMock;
- 		private IProject project;
  
  		[SetUp]
  		public void SetUp()
  		{
! 			_mockExecutor = new DynamicMock(typeof(ProcessExecutor));
  			_builder = new NAntBuilder((ProcessExecutor) _mockExecutor.MockInstance);
- 			projectMock = new DynamicMock(typeof(IProject));
- 			project = (IProject) projectMock.MockInstance;
  		}
  
--- 19,28 ----
  		private NAntBuilder _builder;
  		private IMock _mockExecutor;
  
  		[SetUp]
  		public void SetUp()
  		{
! 			_mockExecutor = new DynamicMock(typeof (ProcessExecutor));
  			_builder = new NAntBuilder((ProcessExecutor) _mockExecutor.MockInstance);
  		}
  
***************
*** 34,38 ****
  		{
  			_mockExecutor.Verify();
- 			projectMock.Verify();
  		}
  
--- 30,33 ----
***************
*** 88,92 ****
  
  			IntegrationResult result = new IntegrationResult();
! 			_builder.Run(result, project);
  
  			Assert.IsTrue(result.Succeeded);
--- 83,87 ----
  
  			IntegrationResult result = new IntegrationResult();
! 			_builder.Run(result);
  
  			Assert.IsTrue(result.Succeeded);
***************
*** 102,106 ****
  
  			IntegrationResult result = new IntegrationResult();
! 			_builder.Run(result, project);
  
  			Assert.IsTrue(result.Failed);
--- 97,101 ----
  
  			IntegrationResult result = new IntegrationResult();
! 			_builder.Run(result);
  
  			Assert.IsTrue(result.Failed);
***************
*** 109,113 ****
  		}
  
! 		[Test, ExpectedException(typeof(BuilderException))]
  		public void ShouldThrowBuilderExceptionIfProcessTimesOut()
  		{
--- 104,108 ----
  		}
  
! 		[Test, ExpectedException(typeof (BuilderException))]
  		public void ShouldThrowBuilderExceptionIfProcessTimesOut()
  		{
***************
*** 116,123 ****
  
  			IntegrationResult result = new IntegrationResult();
! 			_builder.Run(result, project);
  		}
  
! 		[Test, ExpectedException(typeof(BuilderException))]
  		public void ShouldThrowBuilderExceptionIfProcessThrowsException()
  		{
--- 111,118 ----
  
  			IntegrationResult result = new IntegrationResult();
! 			_builder.Run(result);
  		}
  
! 		[Test, ExpectedException(typeof (BuilderException))]
  		public void ShouldThrowBuilderExceptionIfProcessThrowsException()
  		{
***************
*** 125,129 ****
  
  			IntegrationResult result = new IntegrationResult();
! 			_builder.Run(result, project);
  		}
  
--- 120,124 ----
  
  			IntegrationResult result = new IntegrationResult();
! 			_builder.Run(result);
  		}
  
***************
*** 134,138 ****
  			CollectingConstraint constraint = new CollectingConstraint();
  			_mockExecutor.ExpectAndReturn("Execute", returnVal, constraint);
! 			
  			IntegrationResult result = new IntegrationResult();
  			result.Label = "1.0";
--- 129,133 ----
  			CollectingConstraint constraint = new CollectingConstraint();
  			_mockExecutor.ExpectAndReturn("Execute", returnVal, constraint);
! 
  			IntegrationResult result = new IntegrationResult();
  			result.Label = "1.0";
***************
*** 142,148 ****
  			_builder.BuildFile = "mybuild.build";
  			_builder.BuildArgs = "myArgs";
! 			_builder.Targets = new string[] { "target1", "target2"};
  			_builder.BuildTimeoutSeconds = 2;
! 			_builder.Run(result, project);
  
  			ProcessInfo info = (ProcessInfo) constraint.Parameter;
--- 137,143 ----
  			_builder.BuildFile = "mybuild.build";
  			_builder.BuildArgs = "myArgs";
! 			_builder.Targets = new string[] {"target1", "target2"};
  			_builder.BuildTimeoutSeconds = 2;
! 			_builder.Run(result);
  
  			ProcessInfo info = (ProcessInfo) constraint.Parameter;
***************
*** 159,168 ****
  			CollectingConstraint constraint = new CollectingConstraint();
  			_mockExecutor.ExpectAndReturn("Execute", returnVal, constraint);
! 			
! 			_builder.Run(new IntegrationResult(), project);
  
  			ProcessInfo info = (ProcessInfo) constraint.Parameter;
  			Assert.AreEqual(_builder.Executable, NAntBuilder.DEFAULT_EXECUTABLE);
! 			Assert.AreEqual(NAntBuilder.DEFAULT_BUILD_TIMEOUT * 1000, info.TimeOut);
  			Assert.AreEqual("-logger:" + NAntBuilder.DEFAULT_LOGGER + "  -D:label-to-apply=NO-LABEL", info.Arguments);
  		}
--- 154,163 ----
  			CollectingConstraint constraint = new CollectingConstraint();
  			_mockExecutor.ExpectAndReturn("Execute", returnVal, constraint);
! 
! 			_builder.Run(new IntegrationResult());
  
  			ProcessInfo info = (ProcessInfo) constraint.Parameter;
  			Assert.AreEqual(_builder.Executable, NAntBuilder.DEFAULT_EXECUTABLE);
! 			Assert.AreEqual(NAntBuilder.DEFAULT_BUILD_TIMEOUT*1000, info.TimeOut);
  			Assert.AreEqual("-logger:" + NAntBuilder.DEFAULT_LOGGER + "  -D:label-to-apply=NO-LABEL", info.Arguments);
  		}
***************
*** 191,195 ****
  		private void CheckBaseDirectoryIsProjectDirectoryWithGivenRelativePart(string relativeDirectory)
  		{
- 			projectMock.ExpectAndReturn("WorkingDirectory", "projectWorkingDirectory");
  			string expectedBaseDirectory = "projectWorkingDirectory";
  			if (relativeDirectory != "")
--- 186,189 ----
***************
*** 197,201 ****
  				expectedBaseDirectory = Path.Combine(expectedBaseDirectory, relativeDirectory);
  			}
! 			CheckBaseDirectory(expectedBaseDirectory);
  		}
  
--- 191,195 ----
  				expectedBaseDirectory = Path.Combine(expectedBaseDirectory, relativeDirectory);
  			}
! 			CheckBaseDirectory(new IntegrationResult("project", "projectWorkingDirectory"), expectedBaseDirectory);
  		}
  
***************
*** 203,212 ****
  		public void IfConfiguredBaseDirectoryIsAbsoluteUseItAtBaseDirectory()
  		{
- 			projectMock.ExpectNoCall("WorkingDirectory");
  			_builder.ConfiguredBaseDirectory = @"c:\my\base\directory";
! 			CheckBaseDirectory(@"c:\my\base\directory");
  		}
  
! 		private void CheckBaseDirectory(string expectedBaseDirectory)
  		{
  			ProcessResult returnVal = CreateSuccessfulProcessResult();
--- 197,205 ----
  		public void IfConfiguredBaseDirectoryIsAbsoluteUseItAtBaseDirectory()
  		{
  			_builder.ConfiguredBaseDirectory = @"c:\my\base\directory";
! 			CheckBaseDirectory(new IntegrationResult(), @"c:\my\base\directory");
  		}
  
! 		private void CheckBaseDirectory(IntegrationResult result, string expectedBaseDirectory)
  		{
  			ProcessResult returnVal = CreateSuccessfulProcessResult();
***************
*** 214,218 ****
  			_mockExecutor.ExpectAndReturn("Execute", returnVal, constraint);
  
! 			_builder.Run(new IntegrationResult(), project);
  
  			ProcessInfo info = (ProcessInfo) constraint.Parameter;
--- 207,211 ----
  			_mockExecutor.ExpectAndReturn("Execute", returnVal, constraint);
  
! 			_builder.Run(result);
  
  			ProcessInfo info = (ProcessInfo) constraint.Parameter;
***************
*** 224,232 ****
  		public void ShouldRun()
  		{
! 			AssertFalse(_builder.ShouldRun(new IntegrationResult(), project));
! 			Assert.IsTrue(_builder.ShouldRun(CreateIntegrationResultWithModifications(IntegrationStatus.Unknown), project));
! 			Assert.IsTrue(_builder.ShouldRun(CreateIntegrationResultWithModifications(IntegrationStatus.Success), project));
! 			AssertFalse(_builder.ShouldRun(CreateIntegrationResultWithModifications(IntegrationStatus.Failure), project));
! 			AssertFalse(_builder.ShouldRun(CreateIntegrationResultWithModifications(IntegrationStatus.Exception), project));
  		}
  
--- 217,225 ----
  		public void ShouldRun()
  		{
! 			AssertFalse(_builder.ShouldRun(new IntegrationResult()));
! 			Assert.IsTrue(_builder.ShouldRun(CreateIntegrationResultWithModifications(IntegrationStatus.Unknown)));
! 			Assert.IsTrue(_builder.ShouldRun(CreateIntegrationResultWithModifications(IntegrationStatus.Success)));
! 			AssertFalse(_builder.ShouldRun(CreateIntegrationResultWithModifications(IntegrationStatus.Failure)));
! 			AssertFalse(_builder.ShouldRun(CreateIntegrationResultWithModifications(IntegrationStatus.Exception)));
  		}
  
***************
*** 235,239 ****
  		{
  			_builder.Targets = new string[] {"target1", "target2"};
! 			Assert.AreEqual ("target1" + Environment.NewLine + "target2", _builder.TargetsForPresentation);
  		}
  
--- 228,232 ----
  		{
  			_builder.Targets = new string[] {"target1", "target2"};
! 			Assert.AreEqual("target1" + Environment.NewLine + "target2", _builder.TargetsForPresentation);
  		}
  
***************
*** 270,278 ****
  		}
  
! 		private IntegrationResult CreateIntegrationResultWithModifications (IntegrationStatus status)
  		{
! 			IntegrationResult result = new IntegrationResult ();
  			result.Status = status;
! 			result.Modifications = new Modification[] { new Modification () };
  			return result;
  		}
--- 263,271 ----
  		}
  
! 		private IntegrationResult CreateIntegrationResultWithModifications(IntegrationStatus status)
  		{
! 			IntegrationResult result = new IntegrationResult();
  			result.Status = status;
! 			result.Modifications = new Modification[] {new Modification()};
  			return result;
  		}

Index: MockBuilder.cs
===================================================================
RCS file: /cvsroot/ccnet/ccnet/project/core/builder/test/MockBuilder.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MockBuilder.cs	6 Aug 2004 12:29:21 -0000	1.8
--- MockBuilder.cs	23 Aug 2004 12:38:13 -0000	1.9
***************
*** 13,22 ****
  		public bool HasRun = false;
  
! 		public bool ShouldRun(IntegrationResult result, IProject project)
  		{
  			return true;
  		}
  
! 		public void Run(IntegrationResult result, IProject project)
  		{
  			result.Status = IntegrationStatus.Success;
--- 13,22 ----
  		public bool HasRun = false;
  
! 		public bool ShouldRun(IIntegrationResult result)
  		{
  			return true;
  		}
  
! 		public void Run(IIntegrationResult result)
  		{
  			result.Status = IntegrationStatus.Success;