Add BuildRequestDataTest and fixed some .NET compatibility in tests.

2 files changed, 64 insertions, 4 deletions

diff --git a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildRequestDataTest.cs b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildRequestDataTest.cs
new file mode 100644
index 00000000000..fb1a8b41b14
--- /dev/null
+++ b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildRequestDataTest.cs
@@ -0,0 +1,60 @@
+//
+// BuildParametersTest.cs
+//
+// Author:
+//   Atsushi Enomoto (atsushi@xamarin.com)
+//
+// Copyright (C) 2013 Xamarin Inc. (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+using System;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using Microsoft.Build.Construction;
+using Microsoft.Build.Evaluation;
+using Microsoft.Build.Execution;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Logging;
+using NUnit.Framework;
+using System.Xml;
+
+namespace MonoTests.Microsoft.Build.Execution
+{
+	[TestFixture]
+	public class BuildRequestDataTest
+	{
+		[Test]
+		[ExpectedException (typeof (ArgumentNullException))]
+		public void NullTargetsToBuild ()
+		{
+			string project_xml = @"<Project DefaultTargets='Foo' xmlns='http://schemas.microsoft.com/developer/msbuild/2003' />";
+			var xml = XmlReader.Create (new StringReader (project_xml));
+			var root = ProjectRootElement.Create (xml);
+			root.FullPath = "BuildRequestDataTest.NullTargetsToBuild.proj";
+			var pc = new ProjectCollection ();
+			var sw = new StringWriter ();
+			pc.RegisterLogger (new ConsoleLogger (LoggerVerbosity.Diagnostic, sw.WriteLine, null, null));
+			var proj = new ProjectInstance (root);
+			new BuildRequestData (proj, null);
+		}
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildSubmissionTest.cs b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildSubmissionTest.cs
index a26cbd41e77..12d9d8263bb 100644
--- a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildSubmissionTest.cs
+++ b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildSubmissionTest.cs
@@ -115,7 +115,7 @@ namespace MonoTests.Microsoft.Build.Execution
 		public void BuildParameterLoggersExplicitlyRequired ()
 		{
             string project_xml = @"<Project DefaultTargets='Foo' xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
-  <Import Project='$(MSBuildToolsPath)\Microsoft.Common.targets' />
+  <Import Project='$(MSBuildToolsPath)\Microsoft.CSharp.targets' />
   <Target Name='Foo'>
     <ItemGroup>
       <Foo Condition='$(X)' Include='foo.txt' />
@@ -131,8 +131,8 @@ namespace MonoTests.Microsoft.Build.Execution
 			var proj = new ProjectInstance (root);
 			var bm = new BuildManager ();
 			var bp = new BuildParameters (pc);
-			var br = new BuildRequestData (proj, null);
-			Assert.IsFalse (bm.Build (bp, br).OverallResult == BuildResultCode.Failure, "#1");
+			var br = new BuildRequestData (proj, new string [] {"Foo"});
+			Assert.AreEqual (BuildResultCode.Failure, bm.Build (bp, br).OverallResult, "#1");
 			// the logger is *ignored*
 			Assert.IsFalse (sw.ToString ().Contains ("$(X)"), "#2");
 		}
@@ -141,7 +141,7 @@ namespace MonoTests.Microsoft.Build.Execution
 		public void ProjectInstanceBuildLoggersExplicitlyRequired ()
 		{
             string project_xml = @"<Project DefaultTargets='Foo' xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
-  <Import Project='$(MSBuildToolsPath)\Microsoft.Common.targets' />
+  <Import Project='$(MSBuildToolsPath)\Microsoft.CSharp.targets' />
   <Target Name='Foo'>
     <ItemGroup>
       <Foo Condition='$(X)' Include='foo.txt' />