[Ccnet-checkins] ccnet/project/UnitTests/Core/Tasks MsBuildTaskTest.cs,1.1,1.2

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

Update of /cvsroot/ccnet/ccnet/project/UnitTests/Core/Tasks
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7685/project/UnitTests/Core/Tasks

Modified Files:
	MsBuildTaskTest.cs 
Log Message:
adding logger argument to msbuild task and enclosing arguments with spaces in quotes

Index: MsBuildTaskTest.cs
===================================================================
RCS file: /cvsroot/ccnet/ccnet/project/UnitTests/Core/Tasks/MsBuildTaskTest.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MsBuildTaskTest.cs	13 Jul 2005 11:42:08 -0000	1.1
--- MsBuildTaskTest.cs	28 Jul 2005 01:21:40 -0000	1.2
***************
*** 9,14 ****
  namespace ThoughtWorks.CruiseControl.UnitTests.Core.Tasks
  {
- 	// TODO: verbosity?, loggers, spaces in properties
- 
  	[TestFixture]
  	public class MsBuildTaskTest : ProcessExecutorTestFixtureBase
--- 9,12 ----
***************
*** 23,26 ****
--- 21,25 ----
  			result = IntegrationResult();
  			result.Label = "1.0";
+ 			result.ArtifactDirectory = @"c:\artifacts";
  			task = new MsBuildTask((ProcessExecutor) mockProcessExecutor.MockInstance);
  		}
***************
*** 35,39 ****
  		public void ExecuteSpecifiedProject()
  		{
! 			ExpectToExecuteArguments("/nologo /t:target1;target2 " + IntegrationProperties() + " /p:Configuration=Release myproject.sln");
  
  			task.ProjectFile = "myproject.sln";
--- 34,39 ----
  		public void ExecuteSpecifiedProject()
  		{
! 			string args = "/nologo /t:target1;target2 " + IntegrationProperties() + " /p:Configuration=Release myproject.sln" + DefaultLogger();
! 			ExpectToExecuteArguments(args);
  
  			task.ProjectFile = "myproject.sln";
***************
*** 48,54 ****
  		}
  
  		private string IntegrationProperties()
  		{
! 			return string.Format(@"/p:ccnet.buildcondition=NoBuild;ccnet.integration.status=Success;ccnet.label=1.0;ccnet.lastintegration.status=Unknown;ccnet.project=test;ccnet.working.directory=" + DefaultWorkingDirectory);
  		}
  
--- 48,59 ----
  		}
  
+ 		private string DefaultLogger()
+ 		{
+ 			return string.Format(@" /l:{0};c:\artifacts\msbuild-results.xml", MsBuildTask.DefaultLogger);
+ 		}
+ 
  		private string IntegrationProperties()
  		{
! 			return string.Format(@"/p:ccnet.artifact.directory=c:\artifacts;ccnet.buildcondition=NoBuild;ccnet.integration.status=Success;ccnet.label=1.0;ccnet.lastintegration.status=Unknown;ccnet.project=test;ccnet.working.directory=" + DefaultWorkingDirectory);
  		}
  
***************
*** 56,60 ****
  		public void AddQuotesAroundProjectsWithSpacesAndHandleNoSpecifiedTargets()
  		{
! 			ExpectToExecuteArguments(@"/nologo " + IntegrationProperties() + @" ""my project.proj""");
  			task.ProjectFile = "my project.proj";
  			task.Run(result);
--- 61,65 ----
  		public void AddQuotesAroundProjectsWithSpacesAndHandleNoSpecifiedTargets()
  		{
! 			ExpectToExecuteArguments(@"/nologo " + IntegrationProperties() + @" ""my project.proj""" + DefaultLogger());
  			task.ProjectFile = "my project.proj";
  			task.Run(result);
***************
*** 62,68 ****
  
  		[Test]
  		public void RebaseFromWorkingDirectory()
  		{
! 			ProcessInfo info = NewProcessInfo("/nologo " + IntegrationProperties());
  			info.WorkingDirectory = Path.Combine(DefaultWorkingDirectory, "src");
  			ExpectToExecute(info);
--- 67,81 ----
  
  		[Test]
+ 		public void AddQuotesAroundTargetsWithSpaces()
+ 		{
+ 			ExpectToExecuteArguments(@"/nologo ""/t:first;next task"" " + IntegrationProperties() + DefaultLogger());
+ 			task.Targets = "first;next task";
+ 			task.Run(result);
+ 		}
+ 
+ 		[Test]
  		public void RebaseFromWorkingDirectory()
  		{
! 			ProcessInfo info = NewProcessInfo("/nologo " + IntegrationProperties() + DefaultLogger());
  			info.WorkingDirectory = Path.Combine(DefaultWorkingDirectory, "src");
  			ExpectToExecute(info);
***************
*** 89,92 ****
--- 102,106 ----
  	<targets>Build;Test</targets>
  	<timeout>15</timeout>
+ 	<logger>Kobush.Build.Logging.XmlLogger,Kobush.MSBuild.dll;buildresult.xml</logger>
  </msbuild>";
  			task = (MsBuildTask) NetReflector.Read(xml);
***************
*** 97,100 ****
--- 111,115 ----
  			Assert.AreEqual("/p:Configuration=Debug /v:diag", task.BuildArgs);
  			Assert.AreEqual(15, task.Timeout);
+ 			Assert.AreEqual("Kobush.Build.Logging.XmlLogger,Kobush.MSBuild.dll;buildresult.xml", task.Logger);
  		}
  
***************
*** 105,108 ****
--- 120,124 ----
  			Assert.AreEqual(defaultExecutable, task.Executable);
  			Assert.AreEqual(MsBuildTask.DefaultTimeout, task.Timeout);
+ 			Assert.AreEqual(MsBuildTask.DefaultLogger, task.Logger);
  		}
  	}