Started to fix unit test cases.

src/AddIns/Analysis/CodeCoverage/Test/CodeCoverage.Tests.csproj

@@ -51,6 +51,9 @@
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="Microsoft.Build.Engine" />
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="WindowsBase">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
     </Reference>

src/AddIns/Analysis/CodeCoverage/Test/Coverage/PartCoverSettingsFactoryTests.cs

@@ -12,10 +12,10 @@ using UnitTesting.Tests.Utils;
 namespace ICSharpCode.CodeCoverage.Tests.Coverage
 {
 	[TestFixture]
-	public class PartCoverSettingsFactoryTests
+	public class OpenCoverSettingsFactoryTests
 	{
-		PartCoverSettingsFactory factory;
-		PartCoverSettings partCoverSettings;
+		OpenCoverSettingsFactory factory;
+		OpenCoverSettings partCoverSettings;
 		MockCSharpProject project;
 		MockFileSystem fileSystem;
 		
@@ -23,7 +23,7 @@ namespace ICSharpCode.CodeCoverage.Tests.Coverage
 		public void Init()
 		{
 			fileSystem = new MockFileSystem();
-			factory = new PartCoverSettingsFactory(fileSystem);
+			factory = new OpenCoverSettingsFactory(fileSystem);
 			project = new MockCSharpProject();
 		}
 		

src/AddIns/Analysis/CodeCoverage/Test/Coverage/PartCoverSettingsMissingRulePrefixTestFixture.cs

@@ -13,9 +13,9 @@ namespace ICSharpCode.CodeCoverage.Tests.Coverage
 	/// range exception when the Rule elements are empty strings.
 	/// </summary>
 	[TestFixture]
-	public class PartCoverSettingsMissingRulePrefixTestFixture
+	public class OpenCoverSettingsMissingRulePrefixTestFixture
 	{
-		PartCoverSettings settings;
+		OpenCoverSettings settings;
 		
 		[TestFixtureSetUp]
 		public void SetUpFixture()
@@ -25,7 +25,7 @@ namespace ICSharpCode.CodeCoverage.Tests.Coverage
 						"   <Rule></Rule>\r\n" +
 						"</PartCoverSettings>";
 			
-			settings = new PartCoverSettings(new StringReader(xml));
+			settings = new OpenCoverSettings(new StringReader(xml));
 		}
 		
 		[Test]

src/AddIns/Analysis/CodeCoverage/Test/Coverage/PartCoverSettingsTestFixture.cs

@@ -21,24 +21,24 @@ namespace ICSharpCode.CodeCoverage.Tests.Coverage
 	/// that PartCover uses.
 	/// </summary>
 	[TestFixture]
-	public class PartCoverSettingsTestFixture
+	public class OpenCoverSettingsTestFixture
 	{
-		PartCoverSettings settings;
-		PartCoverSettings savedSettings;
+		OpenCoverSettings settings;
+		OpenCoverSettings savedSettings;
 		StringBuilder savedSettingsXml;
 		XmlDocument doc;
 		
 		[SetUp]
 		public void Init()
 		{
-			settings = new PartCoverSettings();
+			settings = new OpenCoverSettings();
 			settings.Include.Add("[a]*");
 			settings.Include.Add("[b]*");
 			settings.Exclude.Add("[c]*");
 			settings.Exclude.Add("[d]*");
 			savedSettingsXml = new StringBuilder();
 			settings.Save(new StringWriter(savedSettingsXml));
-			savedSettings = new PartCoverSettings(new StringReader(savedSettingsXml.ToString()));
+			savedSettings = new OpenCoverSettings(new StringReader(savedSettingsXml.ToString()));
 
 			doc = new XmlDocument();
 			doc.LoadXml(savedSettingsXml.ToString());
@@ -66,7 +66,7 @@ namespace ICSharpCode.CodeCoverage.Tests.Coverage
 					ProjectName = "test"
 				});
 			
-			Assert.AreEqual(@"C:\temp\test.PartCover.Settings", PartCoverSettings.GetFileName(project));
+			Assert.AreEqual(@"C:\temp\test.PartCover.Settings", OpenCoverSettings.GetFileName(project));
 		}
 		
 		[Test]

src/AddIns/Analysis/CodeCoverage/Test/Testing/CodeCoverageTestRunnerTests.cs

@@ -79,7 +79,7 @@ namespace ICSharpCode.CodeCoverage.Tests.Testing
 			testRunner.HasCodeCoverageResults();
 			
 			string expectedFileName = 
-				@"c:\projects\MyTests\PartCover\coverage.xml";
+				@"c:\projects\MyTests\OpenCover\coverage.xml";
 			
 			Assert.AreEqual(expectedFileName, fileSystem.FileExistsPathParameter);
 		}
@@ -96,7 +96,7 @@ namespace ICSharpCode.CodeCoverage.Tests.Testing
 			testRunner.ReadCodeCoverageResults();
 			
 			string expectedFileName = 
-				@"c:\projects\MyTests\PartCover\coverage.xml";
+				@"c:\projects\MyTests\OpenCover\coverage.xml";
 			
 			Assert.AreEqual(expectedFileName, fileSystem.CreateTextReaderPathParameter);
 		}
@@ -116,18 +116,18 @@ namespace ICSharpCode.CodeCoverage.Tests.Testing
 			ProcessStartInfo processStartInfo = testRunner.CallGetProcessStartInfo(tests);
 			
 			string expectedCommandLine =
-				"--target \"d:\\sharpdevelop\\bin\\Tools\\NUnit\\nunit-console-x86.exe\" " +
-				"--target-work-dir \"c:\\projects\\MyTests\\bin\\Debug\" " +
-				"--target-args \"\\\"c:\\projects\\MyTests\\bin\\Debug\\MyTests.dll\\\" /noxml /results=\\\"d:\\temp\\results.txt\\\"\" " +
-				"--output \"c:\\projects\\MyTests\\PartCover\\coverage.xml\" " +
-				"--include [MyTests]*";
+				"-register:user -target:\"d:\\sharpdevelop\\bin\\Tools\\NUnit\\nunit-console-x86.exe\" " +
+				"-targetdir:\"c:\\projects\\MyTests\\bin\\Debug\" " +
+				"-targetargs \"\\\"c:\\projects\\MyTests\\bin\\Debug\\MyTests.dll\\\" /noxml /results=\\\"d:\\temp\\results.txt\\\"\" " +
+				"-output:\"c:\\projects\\MyTests\\OpenCover\\coverage.xml\" " +
+				"-filter:\"+[MyTests]* \"";
 			
 			Assert.AreEqual(expectedCommandLine, processStartInfo.Arguments);
 		}
 		
 		TextReader CreatePartCoverSettingsTextReader()
 		{
-			PartCoverSettings settings = new PartCoverSettings();
+			OpenCoverSettings settings = new OpenCoverSettings();
 			settings.Include.Add("[MyTests]*");
 			StringBuilder text = new StringBuilder();
 			StringWriter writer = new StringWriter(text);
@@ -151,7 +151,7 @@ namespace ICSharpCode.CodeCoverage.Tests.Testing
 			fileSystem.CreateTextReaderReturnValue = new StringReader("<abc/>");
 			StartTestRunner();
 			
-			string expectedFileName = @"c:\projects\MyTests\PartCover\coverage.xml";
+			string expectedFileName = @"c:\projects\MyTests\OpenCover\coverage.xml";
 			Assert.AreEqual(expectedFileName, fileSystem.DeleteFilePathParameter);
 		}
 		
@@ -170,7 +170,7 @@ namespace ICSharpCode.CodeCoverage.Tests.Testing
 			fileSystem.DirectoryExistsReturnValue = false;
 			StartTestRunner();
 			
-			string expectedDirectory = @"c:\projects\MyTests\PartCover";
+			string expectedDirectory = @"c:\projects\MyTests\OpenCover";
 			Assert.AreEqual(expectedDirectory, fileSystem.CreateDirectoryPathParameter);
 		}
 		
@@ -180,7 +180,7 @@ namespace ICSharpCode.CodeCoverage.Tests.Testing
 			fileSystem.DirectoryExistsReturnValue = true;
 			StartTestRunner();
 			
-			string expectedDirectory = @"c:\projects\MyTests\PartCover";
+			string expectedDirectory = @"c:\projects\MyTests\OpenCover";
 			Assert.AreEqual(expectedDirectory, fileSystem.DirectoryExistsPathParameter);
 		}
 		

src/AddIns/Analysis/CodeCoverage/Test/Testing/PartCoverApplicationTests.cs

@@ -12,13 +12,13 @@ using UnitTesting.Tests.Utils;
 namespace ICSharpCode.CodeCoverage.Tests.Testing
 {
 	[TestFixture]
-	public class PartCoverApplicationTests
+	public class OpenCoverApplicationTests
 	{
 		NUnitConsoleApplication nunitConsoleApp;
 		SelectedTests selectedTests;
 		UnitTestingOptions options;
-		PartCoverApplication partCoverApp;
-		PartCoverSettings partCoverSettings;
+		OpenCoverApplication partCoverApp;
+		OpenCoverSettings partCoverSettings;
 		
 		[Test]
 		public void FileNameWhenPartCoverApplicationConstructedWithFileNameParameterMatchesFileNameParameter()
@@ -31,8 +31,8 @@ namespace ICSharpCode.CodeCoverage.Tests.Testing
 		void CreatePartCoverApplication(string fileName)
 		{
 			CreateNUnitConsoleApplication();
-			partCoverSettings = new PartCoverSettings();
-			partCoverApp = new PartCoverApplication(fileName, nunitConsoleApp, partCoverSettings);
+			partCoverSettings = new OpenCoverSettings();
+			partCoverApp = new OpenCoverApplication(fileName, nunitConsoleApp, partCoverSettings);
 		}
 		
 		void CreateNUnitConsoleApplication()
@@ -49,14 +49,14 @@ namespace ICSharpCode.CodeCoverage.Tests.Testing
 		{
 			FileUtility.ApplicationRootPath = @"d:\sharpdevelop";
 			CreatePartCoverApplicationWithoutFileName();
-			string expectedPath = @"d:\sharpdevelop\bin\Tools\PartCover\PartCover.exe";
+			string expectedPath = @"d:\sharpdevelop\bin\Tools\OpenCover\OpenCover.Console.exe";
 			Assert.AreEqual(expectedPath, partCoverApp.FileName);
 		}
 		
 		void CreatePartCoverApplicationWithoutFileName()
 		{
 			CreateNUnitConsoleApplication();
-			partCoverApp = new PartCoverApplication(nunitConsoleApp, new PartCoverSettings());
+			partCoverApp = new OpenCoverApplication(nunitConsoleApp, new OpenCoverSettings());
 		}
 		
 		[Test]
@@ -64,7 +64,7 @@ namespace ICSharpCode.CodeCoverage.Tests.Testing
 		{
 			FileUtility.ApplicationRootPath = @"d:\sharpdevelop\..\sharpdevelop";
 			CreatePartCoverApplicationWithoutFileName();
-			string expectedPath = @"d:\sharpdevelop\bin\Tools\PartCover\PartCover.exe";
+			string expectedPath = @"d:\sharpdevelop\bin\Tools\OpenCover\OpenCover.Console.exe";
 			Assert.AreEqual(expectedPath, partCoverApp.FileName);
 		}
 		
@@ -101,7 +101,7 @@ namespace ICSharpCode.CodeCoverage.Tests.Testing
 		{
 			CreatePartCoverApplication();
 			string expectedOutputDirectory = 
-				@"c:\projects\MyTests\PartCover\coverage.xml";
+				@"c:\projects\MyTests\OpenCover\coverage.xml";
 			
 			Assert.AreEqual(expectedOutputDirectory, partCoverApp.CodeCoverageResultsFileName);
 		}
@@ -131,11 +131,11 @@ namespace ICSharpCode.CodeCoverage.Tests.Testing
 			ProcessStartInfo processStartInfo = partCoverApp.GetProcessStartInfo();
 			
 			string expectedCommandLine =
-				"--target \"d:\\sharpdevelop\\bin\\Tools\\NUnit\\nunit-console-x86.exe\" " +
-				"--target-work-dir \"c:\\projects\\MyTests\\bin\\Debug\" " +
-				"--target-args \"\\\"c:\\projects\\MyTests\\bin\\Debug\\MyTests.dll\\\" /noxml\" " + 
-				"--output \"c:\\projects\\MyTests\\PartCover\\coverage.xml\" " +
-				"--include [*]*";
+				"-register:user -target:\"d:\\sharpdevelop\\bin\\Tools\\NUnit\\nunit-console-x86.exe\" " +
+				"-targetdir:\"c:\\projects\\MyTests\\bin\\Debug\" " +
+				"-targetargs:\"\\\"c:\\projects\\MyTests\\bin\\Debug\\MyTests.dll\\\" /noxml\" " + 
+				"-output:\"c:\\projects\\MyTests\\OpenCover\\coverage.xml\" " +
+				"-filter:\"+[*]* \"";
 
 			Assert.AreEqual(expectedCommandLine, processStartInfo.Arguments);
 		}
@@ -155,14 +155,14 @@ namespace ICSharpCode.CodeCoverage.Tests.Testing
 			ProcessStartInfo processStartInfo = partCoverApp.GetProcessStartInfo();
 			
 			string expectedCommandLine =
-				"--target \"d:\\sharpdevelop\\bin\\Tools\\NUnit\\nunit-console-x86.exe\" " +
-				"--target-work-dir \"c:\\projects\\MyTests\\bin\\Debug\" " +
-				"--target-args \"\\\"c:\\projects\\MyTests\\bin\\Debug\\MyTests.dll\\\" /noxml\" " + 
-				"--output \"c:\\projects\\MyTests\\PartCover\\coverage.xml\" " +
-				"--include [MyTests]* " +
-				"--include [MoreTests]* " +
-				"--exclude [NUnit.Framework]* " +
-				"--exclude [MyProject]*";
+				"-register:user -target:\"d:\\sharpdevelop\\bin\\Tools\\NUnit\\nunit-console-x86.exe\" " +
+				"-targetdir:\"c:\\projects\\MyTests\\bin\\Debug\" " +
+				"-targetargs:\"\\\"c:\\projects\\MyTests\\bin\\Debug\\MyTests.dll\\\" /noxml\" " + 
+				"-output:\"c:\\projects\\MyTests\\OpenCover\\coverage.xml\" " +
+				"-filter:\"+[MyTests]* " +
+				"+[MoreTests]* " +
+				"-[NUnit.Framework]* " +
+				"-[MyProject]*\"";
 
 			Assert.AreEqual(expectedCommandLine, processStartInfo.Arguments);
 		}

src/AddIns/Analysis/CodeCoverage/Test/Testing/RunTestWithCodeCoverageCommandTests.cs

@@ -245,7 +245,7 @@ namespace ICSharpCode.CodeCoverage.Tests.Testing
 			ActionArguments<Task> args = CreateTestRunnerAndFirePartCoverProcessExitEventWhenNoCoverageFileProduced();
 			Task task = args.Arg;
 			
-			string description = @"No code coverage results file generated. c:\projects\MyTests\PartCover\coverage.xml";
+			string description = @"No code coverage results file generated. c:\projects\MyTests\OpenCover\coverage.xml";
 			int column = 1;
 			int line = 1;
 			Task expectedTask = new Task(null, description, column, line, TaskType.Error);