Ported UnitTesting.Tests to MSBuild 4.0.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/dotnet4@4299 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/UnitTesting/Test/Tree/GetProjectsTestFixture.cs

@@ -31,15 +31,13 @@ namespace UnitTesting.Tests.Tree
 		public void Init()
 		{
 			solution = new Solution();
-			project1 = new MockCSharpProject(solution);
-			project1.Name = "A";
+			project1 = new MockCSharpProject(solution, "A");
 			ReferenceProjectItem refProjectItem = new ReferenceProjectItem(project1);
 			refProjectItem.Include = "NUnit.Framework";
 			ProjectService.AddProjectItem(project1, refProjectItem);
 			solution.Folders.Add(project1);
 			
-			project2 = new MockCSharpProject(solution);
-			project2.Name = "Z";
+			project2 = new MockCSharpProject(solution, "Z");
 			refProjectItem = new ReferenceProjectItem(project2);
 			refProjectItem.Include = "NUnit.Framework";
 			ProjectService.AddProjectItem(project2, refProjectItem);

src/AddIns/Misc/UnitTesting/Test/Tree/MultipleTestProjectsTestFixture.cs

@@ -38,15 +38,13 @@ namespace UnitTesting.Tests.Tree
 			solution = new Solution();
 			
 			// Create the first test project.
-			firstProject = new MockCSharpProject(solution);
-			firstProject.Name = "FirstTestProject";
+			firstProject = new MockCSharpProject(solution, "FirstTestProject");
 			ReferenceProjectItem nunitFrameworkReferenceItem = new ReferenceProjectItem(firstProject);
 			nunitFrameworkReferenceItem.Include = "NUnit.Framework";
 			ProjectService.AddProjectItem(firstProject, nunitFrameworkReferenceItem);
 
 			// Create the second test project.
-			secondProject = new MockCSharpProject(solution);
-			secondProject.Name = "SecondTestProject";
+			secondProject = new MockCSharpProject(solution, "SecondTestProject");
 			nunitFrameworkReferenceItem = new ReferenceProjectItem(secondProject);
 			nunitFrameworkReferenceItem.Include = "NUnit.Framework";
 			ProjectService.AddProjectItem(secondProject, nunitFrameworkReferenceItem);
@@ -133,8 +131,7 @@ namespace UnitTesting.Tests.Tree
 		{
 			// Add an extra project so when we remove one the All Tests node
 			// is not removed.
-			MockCSharpProject project = new MockCSharpProject(solution);
-			project.Name = "ThirdTestProject";
+			MockCSharpProject project = new MockCSharpProject(solution, "ThirdTestProject");
 			ReferenceProjectItem nunitFrameworkReferenceItem = new ReferenceProjectItem(project);
 			nunitFrameworkReferenceItem.Include = "NUnit.Framework";
 			ProjectService.AddProjectItem(project, nunitFrameworkReferenceItem);

src/AddIns/Misc/UnitTesting/Test/Tree/TwoTestClassesInDifferentNamespacesTestFixture.cs

@@ -44,8 +44,7 @@ namespace UnitTesting.Tests.Tree
 			solution = new Solution();
 			
 			// Create a project to display in the test tree view.
-			project = new MockCSharpProject(solution);
-			project.Name = "TestProject";
+			project = new MockCSharpProject(solution, "TestProject");
 			ReferenceProjectItem nunitFrameworkReferenceItem = new ReferenceProjectItem(project);
 			nunitFrameworkReferenceItem.Include = "NUnit.Framework";
 			ProjectService.AddProjectItem(project, nunitFrameworkReferenceItem);

src/AddIns/Misc/UnitTesting/Test/UnitTestCommandLineTests.cs

@@ -27,6 +27,7 @@ namespace UnitTesting.Tests
 			project.FileName = @"C:\Projects\MyTests\MyTests.csproj";
 			project.AssemblyName = "MyTests";
 			project.OutputType = OutputType.Library;
+			project.SetProperty("OutputPath", "."); // don't create bin/Debug
 			helper = new UnitTestApplicationStartHelper();
 		}
 		

src/AddIns/Misc/UnitTesting/Test/Utils/MockCSharpProject.cs

@@ -14,9 +14,15 @@ namespace UnitTesting.Tests.Utils
 	public class MockCSharpProject : CompilableProject
 	{
 		public MockCSharpProject()
+			: this(new Solution(), "Dummy")
+		{
+		}
+		
+		public MockCSharpProject(Solution solution, string name)
 			: base(new ProjectCreateInformation {
-			       	Solution = new Solution(),
-			       	ProjectName = "DummyName"
+			       	Solution = solution,
+			       	ProjectName = name,
+			       	OutputProjectFileName = "c:\\temp\\" + name + ".csproj"
 			       })
 		{
 		}

src/Main/Base/Project/Src/Project/AbstractProject.cs

@@ -114,6 +114,8 @@ namespace ICSharpCode.SharpDevelop.Project
 				return fileName ?? "";
 			}
 			set {
+				if (value == null)
+					throw new ArgumentNullException();
 				WorkbenchSingleton.AssertMainThread();
 				Debug.Assert(FileUtility.IsUrl(value) || Path.IsPathRooted(value));
 				

src/Main/Base/Project/Src/Project/CompilableProject.cs

@@ -165,7 +165,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		public override string OutputAssemblyFullPath {
 			get {
 				string outputPath = GetEvaluatedProperty("OutputPath") ?? "";
-				return Path.Combine(Path.Combine(Directory, outputPath), AssemblyName + GetExtension(OutputType));
+				return FileUtility.NormalizePath(Path.Combine(Path.Combine(Directory, outputPath), AssemblyName + GetExtension(OutputType)));
 			}
 		}
 		
@@ -175,9 +175,9 @@ namespace ICSharpCode.SharpDevelop.Project
 		public string OutputFullPath {
 			get {
 				string outputPath = GetEvaluatedProperty("OutputPath");
-				// Path.GetFullPath() cleans up any back references.
+				// FileUtility.NormalizePath() cleans up any back references.
 				// e.g. C:\windows\system32\..\system becomes C:\windows\system
-				return Path.GetFullPath(Path.Combine(Directory, outputPath));
+				return FileUtility.NormalizePath(Path.Combine(Directory, outputPath));
 			}
 		}
 		

src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs

@@ -148,6 +148,8 @@ namespace ICSharpCode.Core
 		
 		public static bool IsUrl(string path)
 		{
+			if (path == null)
+				throw new ArgumentNullException("path");
 			return path.IndexOf("://", StringComparison.Ordinal) > 0;
 		}