Code coverage addin is now working again.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@6144 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Analysis/CodeCoverage/Project/CodeCoverage.csproj

@@ -67,15 +67,20 @@
     <Compile Include="Src\CodeCoverageResults.cs" />
     <Compile Include="Src\CodeCoverageMethod.cs" />
     <Compile Include="Src\CodeCoverageSequencePoint.cs" />
+    <Compile Include="Src\CodeCoverageTestRunner.cs" />
+    <Compile Include="Src\CodeCoverageTestRunnerFactory.cs" />
     <Compile Include="Src\CodeCoverageTreeView.cs" />
     <Compile Include="Src\CodeCoverageModuleTreeNode.cs" />
     <Compile Include="Src\CodeCoverageTreeNode.cs" />
     <Compile Include="Src\CodeCoverageMethodTreeNode.cs" />
     <Compile Include="Src\CodeCoverageClassTreeNode.cs" />
     <Compile Include="Src\CodeCoverageNamespaceTreeNode.cs" />
-    <Compile Include="Src\PartCoverExitEventArgs.cs" />
+    <Compile Include="Src\FileSystem.cs" />
-    <Compile Include="Src\PartCoverRunner.cs" />
+    <Compile Include="Src\ICodeCoverageTestRunnerFactory.cs" />
+    <Compile Include="Src\IFileSystem.cs" />
+    <Compile Include="Src\PartCoverApplication.cs" />
     <Compile Include="Src\PartCoverSettings.cs" />
+    <Compile Include="Src\PartCoverSettingsFactory.cs" />
     <Compile Include="Src\RunAllTestsWithCodeCoverageCommand.cs" />
     <Compile Include="Src\SequencePointListViewSorter.cs" />
     <Compile Include="Src\ToggleCodeCoverageCommand.cs" />

src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageHighlighter.cs

@@ -19,10 +19,6 @@ namespace ICSharpCode.CodeCoverage
 	/// </summary>
 	public class CodeCoverageHighlighter
 	{
-		public CodeCoverageHighlighter()
-		{
-		}
-		
 		/// <summary>
 		/// Adds text markers for the code coverage sequence points.
 		/// </summary>
@@ -59,10 +55,16 @@ namespace ICSharpCode.CodeCoverage
 		{
 			ITextMarkerService markerService = document.GetService(typeof(ITextMarkerService)) as ITextMarkerService;
 			if (markerService != null) {
-				markerService.RemoveAll(marker => (Type)marker.Tag == typeof(CodeCoverageHighlighter));
+				markerService.RemoveAll(IsCodeCoverageTextMarker);
 			}
 		}
 		
+		bool IsCodeCoverageTextMarker(ITextMarker marker)
+		{
+			Type type = marker.Tag as Type;
+			return type == typeof(CodeCoverageHighlighter);
+		}
+		
 		/// <summary>
 		/// Checks whether the sequence point can be added to the document.
 		/// </summary>

src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageTestRunner.cs

@@ -0,0 +1,120 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
+//     <version>$Revision$</version>
+// </file>
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop.Project;
+using ICSharpCode.UnitTesting;
+
+namespace ICSharpCode.CodeCoverage
+{
+	public class CodeCoverageTestRunner : TestProcessRunnerBase
+	{
+		UnitTestingOptions options;
+		IFileSystem fileSystem;
+		PartCoverApplication partCoverApplication;
+		PartCoverSettingsFactory settingsFactory;
+		
+		public CodeCoverageTestRunner()
+			: this(new UnitTestProcessRunner(),
+				new TestResultsMonitor(),
+				new UnitTestingOptions(),
+				new FileSystem())
+		{
+		}
+		
+		public CodeCoverageTestRunner(IUnitTestProcessRunner processRunner,
+			ITestResultsMonitor testResultsMonitor,
+			UnitTestingOptions options,
+			IFileSystem fileSystem)
+			: base(processRunner, testResultsMonitor)
+		{
+			this.options = options;
+			this.fileSystem = fileSystem;
+			settingsFactory = new PartCoverSettingsFactory(fileSystem);
+		}
+		
+		public bool HasCodeCoverageResults()
+		{
+			return fileSystem.FileExists(CodeCoverageResultsFileName);
+		}
+		
+		public 	CodeCoverageResults ReadCodeCoverageResults()
+		{
+			TextReader reader = fileSystem.CreateTextReader(CodeCoverageResultsFileName);
+			return new CodeCoverageResults(reader);
+		}
+		
+		public string CodeCoverageResultsFileName {
+			get { return partCoverApplication.CodeCoverageResultsFileName; }
+		}
+		
+		public override void Start(SelectedTests selectedTests)
+		{
+			AddProfilerEnvironmentVariableToProcessRunner();
+			CreatePartCoverApplication(selectedTests);
+			RemoveExistingCodeCoverageResultsFile();
+			CreateDirectoryForCodeCoverageResultsFile();
+			AppendRunningCodeCoverageMessage();
+			
+			base.Start(selectedTests);
+		}
+		
+		void AddProfilerEnvironmentVariableToProcessRunner()
+		{
+			ProcessRunner.EnvironmentVariables.Add("COMPLUS_ProfAPI_ProfilerCompatibilitySetting", "EnableV2Profiler");
+		}
+		
+		void CreatePartCoverApplication(SelectedTests selectedTests)
+		{
+			NUnitConsoleApplication nunitConsoleApp = new NUnitConsoleApplication(selectedTests, options);
+			nunitConsoleApp.Results = base.TestResultsMonitor.FileName;
+			
+			PartCoverSettings settings = settingsFactory.CreatePartCoverSettings(selectedTests.Project);
+			partCoverApplication = new PartCoverApplication(nunitConsoleApp, settings);
+		}
+		
+		void RemoveExistingCodeCoverageResultsFile()
+		{
+			string fileName = CodeCoverageResultsFileName;
+			if (fileSystem.FileExists(fileName)) {
+				fileSystem.DeleteFile(fileName);
+			}
+		}
+		
+		void CreateDirectoryForCodeCoverageResultsFile()
+		{
+			string directory = Path.GetDirectoryName(CodeCoverageResultsFileName);
+			if (!fileSystem.DirectoryExists(directory)) {
+				fileSystem.CreateDirectory(directory);	
+			}
+		}
+		
+		void AppendRunningCodeCoverageMessage()
+		{
+			string message = ParseString("${res:ICSharpCode.CodeCoverage.RunningCodeCoverage}");
+			OnMessageReceived(message);
+		}
+		
+		protected virtual string ParseString(string text)
+		{
+			return StringParser.Parse(text);
+		}
+		
+		protected override ProcessStartInfo GetProcessStartInfo(SelectedTests selectedTests)
+		{
+			return partCoverApplication.GetProcessStartInfo();
+		}
+		
+		protected override TestResult CreateTestResultForTestFramework(TestResult testResult)
+		{
+			return new NUnitTestResult(testResult);
+		}
+	}
+}

src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageTestRunnerFactory.cs

@@ -0,0 +1,20 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
+//     <version>$Revision$</version>
+// </file>
+
+using System;
+using ICSharpCode.UnitTesting;
+
+namespace ICSharpCode.CodeCoverage
+{
+	public class CodeCoverageTestRunnerFactory : ICodeCoverageTestRunnerFactory
+	{	
+		public CodeCoverageTestRunner CreateCodeCoverageTestRunner()
+		{
+			return new CodeCoverageTestRunner();
+		}
+	}
+}

src/AddIns/Analysis/CodeCoverage/Project/Src/FileSystem.cs

@@ -0,0 +1,40 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
+//     <version>$Revision$</version>
+// </file>
+
+using System;
+using System.IO;
+
+namespace ICSharpCode.CodeCoverage
+{
+	public class FileSystem : IFileSystem
+	{
+		public bool FileExists(string path)
+		{
+			return File.Exists(path);
+		}
+		
+		public void DeleteFile(string path)
+		{
+			File.Delete(path);
+		}
+		
+		public bool DirectoryExists(string path)
+		{
+			return Directory.Exists(path);
+		}
+		
+		public void CreateDirectory(string path)
+		{
+			Directory.CreateDirectory(path);
+		}
+		
+		public TextReader CreateTextReader(string path)
+		{
+			return new StreamReader(path);
+		}
+	}
+}

src/AddIns/Analysis/CodeCoverage/Project/Src/ICodeCoverageTestRunnerFactory.cs

@@ -0,0 +1,16 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
+//     <version>$Revision$</version>
+// </file>
+
+using System;
+
+namespace ICSharpCode.CodeCoverage
+{
+	public interface ICodeCoverageTestRunnerFactory
+	{
+		CodeCoverageTestRunner CreateCodeCoverageTestRunner();
+	}
+}

src/AddIns/Analysis/CodeCoverage/Project/Src/IFileSystem.cs

@@ -0,0 +1,23 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
+//     <version>$Revision$</version>
+// </file>
+
+using System;
+using System.IO;
+
+namespace ICSharpCode.CodeCoverage
+{
+	public interface IFileSystem
+	{
+		bool FileExists(string path);
+		void DeleteFile(string path);
+		
+		bool DirectoryExists(string path);
+		void CreateDirectory(string path);
+		
+		TextReader CreateTextReader(string path);
+	}
+}

src/AddIns/Analysis/CodeCoverage/Project/Src/PartCoverApplication.cs

@@ -0,0 +1,164 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
+//     <version>$Revision$</version>
+// </file>
+
+using System;
+using System.Collections.Specialized;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop.Project;
+using ICSharpCode.UnitTesting;
+
+namespace ICSharpCode.CodeCoverage
+{
+	public class PartCoverApplication
+	{
+		string fileName = String.Empty;
+		NUnitConsoleApplication nunitConsoleApp;
+		PartCoverSettings settings;
+		StringBuilder arguments;
+		
+		public PartCoverApplication(string fileName, NUnitConsoleApplication nunitConsoleApp, PartCoverSettings settings)
+		{
+			this.fileName = fileName;
+			this.nunitConsoleApp = nunitConsoleApp;
+			this.settings = settings;
+			
+			if (String.IsNullOrEmpty(fileName)) {
+				GetPartCoverApplicationFileName();
+			}
+		}
+		
+		public PartCoverApplication(NUnitConsoleApplication nunitConsoleApp, PartCoverSettings settings)
+			: this(null, nunitConsoleApp, settings)
+		{
+		}
+		
+		void GetPartCoverApplicationFileName()
+		{
+			fileName = Path.Combine(FileUtility.ApplicationRootPath, @"bin\Tools\PartCover\PartCover.exe");
+			fileName = Path.GetFullPath(fileName);
+		}
+		
+		public PartCoverSettings Settings {
+			get { return settings; }
+		}
+		
+		public string FileName {
+			get { return fileName; }
+			set { fileName = value; }
+		}
+		
+		public string Target {
+			get { return nunitConsoleApp.FileName; }
+		}
+		
+		public string GetTargetArguments()
+		{
+			return nunitConsoleApp.GetArguments();
+		}
+		
+		public string GetTargetWorkingDirectory()
+		{
+			return Path.GetDirectoryName(nunitConsoleApp.Assemblies[0]);
+		}
+		
+		public string CodeCoverageResultsFileName {
+			get { return GetCodeCoverageResultsFileName(); }
+		}
+		
+		string GetCodeCoverageResultsFileName()
+		{
+			string  outputDirectory = GetOutputDirectory(nunitConsoleApp.Project);
+			return Path.Combine(outputDirectory, "coverage.xml");
+		}
+		
+		string GetOutputDirectory(IProject project)
+		{
+			return Path.Combine(project.Directory, "PartCover");
+		}
+		
+		public ProcessStartInfo GetProcessStartInfo()
+		{
+			ProcessStartInfo processStartInfo = new ProcessStartInfo();
+			processStartInfo.FileName = FileName;
+			processStartInfo.Arguments = GetArguments();
+			return processStartInfo;
+		}
+		
+		string GetArguments()
+		{
+			arguments = new StringBuilder();
+			
+			AppendTarget();
+			AppendTargetWorkingDirectory();
+			AppendTargetArguments();
+			AppendCodeCoverageResultsFileName();
+			AppendIncludedItems();
+			AppendExcludedItems();
+			
+			return arguments.ToString().Trim();
+		}
+		
+		void AppendTarget()
+		{
+			arguments.AppendFormat("--target \"{0}\" ", Target);
+		}
+		
+		void AppendTargetWorkingDirectory()
+		{
+			arguments.AppendFormat("--target-work-dir \"{0}\" ", GetTargetWorkingDirectory());
+		}
+		
+		void AppendTargetArguments()
+		{
+			string targetArguments = GetTargetArguments();
+			arguments.AppendFormat("--target-args \"{0}\" ", targetArguments.Replace("\"", "\\\""));
+		}
+		
+		void AppendCodeCoverageResultsFileName()
+		{
+			arguments.AppendFormat("--output \"{0}\" ", CodeCoverageResultsFileName);
+		}
+		
+		void AppendIncludedItems()
+		{
+			StringCollection includedItems = settings.Include;
+			if (includedItems.Count == 0) {
+				includedItems.Add("[*]*");
+			}
+			AppendItems("--include", includedItems);
+		}
+		
+		void AppendExcludedItems()
+		{
+			AppendEmptySpace();
+			AppendItems("--exclude", settings.Exclude);
+		}
+		
+		void AppendEmptySpace()
+		{
+			arguments.Append(' ');
+		}
+		
+		void AppendItems(string optionName, StringCollection items)
+		{
+			string itemArgs = GetItemArguments(optionName, items);
+			arguments.Append(itemArgs);
+		}
+		
+		string GetItemArguments(string optionName, StringCollection items)
+		{
+			StringBuilder itemArgs = new StringBuilder();
+			foreach (string item in items) {
+				itemArgs.AppendFormat("{0} {1} ", optionName, item);
+			}
+			return itemArgs.ToString().Trim();
+		}
+	}
+}

src/AddIns/Analysis/CodeCoverage/Project/Src/PartCoverExitEventArgs.cs

@@ -1,55 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-
-namespace ICSharpCode.CodeCoverage
-{
-	/// <summary>
-	/// Represents the method that will handle the 
-	/// <see cref="PartCoverRunner.Exited"/> event.
-	/// </summary>
-	public delegate void PartCoverExitEventHandler(object sender, PartCoverExitEventArgs e);
-	
-	/// <summary>
-	/// The <see cref="PartCoverRunner.Exited"/> event arguments.
-	/// </summary>
-	public class PartCoverExitEventArgs : EventArgs
-	{
-		string output;
-		int exitCode;
-		string error;
-		
-		public PartCoverExitEventArgs(string output, string error, int exitCode)
-		{
-			this.output = output;
-			this.error = error;
-			this.exitCode = exitCode;
-		}
-		
-		/// <summary>
-		/// Gets the command line output from PartCover.
-		/// </summary>
-		public string Output {
-			get { return output; }
-		}
-	
-		/// <summary>
-		/// Gets the standard error output from PartCover.
-		/// </summary>
-		public string Error {
-			get { return error; }
-		}
-		
-		/// <summary>
-		/// Gets the exit code.
-		/// </summary>
-		public int ExitCode {
-			get { return exitCode; }
-		}
-	}
-}

src/AddIns/Analysis/CodeCoverage/Project/Src/PartCoverRunner.cs

@@ -1,266 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Collections.Specialized;
-using System.Text;
-using ICSharpCode.SharpDevelop.Util;
-
-namespace ICSharpCode.CodeCoverage
-{
-	/// <summary>
-	/// Description of PartCoverRunner.
-	/// </summary>
-	public class PartCoverRunner
-	{
-		ProcessRunner runner;
-		string partCoverFileName = String.Empty;
-		string workingDirectory = String.Empty;
-		string target = String.Empty;
-		string targetWorkingDirectory = String.Empty;
-		string targetArguments = String.Empty;
-		StringCollection include = new StringCollection();
-		StringCollection exclude = new StringCollection();
-		string output = String.Empty;
-		
-		/// <summary>
-		/// Triggered when PartCover exits.
-		/// </summary>
-		public event PartCoverExitEventHandler Exited;
-		
-		/// <summary>
-		/// The PartCover runner was started.
-		/// </summary>
-		public event EventHandler Started;
-		
-		/// <summary>
-		/// The PartCover runner was stopped.  Being stopped is not the
-		/// same as PartCover exiting.
-		/// </summary>
-		public event EventHandler Stopped;
-		
-		/// <summary>
-		/// Triggered when an output line is received from PartCover.
-		/// </summary>
-		public event LineReceivedEventHandler OutputLineReceived;
-		
-		public PartCoverRunner()
-		{
-		}
-
-		/// <summary>
-		/// Gets or sets the full path to the PartCover
-		/// executable.
-		/// </summary>
-		public string PartCoverFileName {
-			get { return partCoverFileName; }
-			set { partCoverFileName = value; }
-		}
-
-		/// <summary>
-		/// Gets or sets the working directory to use when running
-		/// PartCover.
-		/// </summary>
-		public string WorkingDirectory {
-			get { return workingDirectory; }
-			set { workingDirectory = value; }
-		}
-
-		/// <summary>
-		/// Gets or sets the filename of the executable to profile with PartCover.
-		/// </summary>
-		public string Target {
-			get { return target; }
-			set { target = value; }
-		}
-
-		/// <summary>
-		/// Gets or sets the working directory for the target executable.
-		/// </summary>
-		public string TargetWorkingDirectory {
-			get { return targetWorkingDirectory; }
-			set { targetWorkingDirectory = value; }
-		}
-
-		/// <summary>
-		/// Gets or sets the arguments to pass to the target executable.
-		/// </summary>
-		public string TargetArguments {
-			get { return targetArguments; }
-			set { targetArguments = value; }
-		}
-
-		/// <summary>
-		/// Gets or sets the regular expressions which specify the items to
-		/// include in the report whilst profiling the target executable.
-		/// </summary>
-		public StringCollection Include {
-			get { return include; }
-		}
-
-		/// <summary>
-		/// Gets or sets the regular expressions which specify the items to
-		/// exclude in the report whilst profiling the target executable.
-		/// </summary>
-		public StringCollection Exclude {
-			get { return exclude; }
-		}
-		
-		/// <summary>
-		/// Gets or sets the filename for the code coverage results.
-		/// </summary>
-		public string Output {
-			get { return output; }
-			set { output = value; }
-		}
-		
-		/// <summary>
-		/// Returns the full path used to run PartCover.
-		/// Includes the path to the PartCover executable
-		/// and the command line arguments.
-		/// </summary>
-		public string CommandLine {
-			get {
-				string arguments = GetArguments();
-				if (arguments.Length > 0) {
-					return String.Concat(partCoverFileName, " ", arguments);
-				}
-				return partCoverFileName;
-			}
-		}
-		
-		/// <summary>
-		/// Returns the command line arguments used to run PartCover.
-		/// </summary>
-		/// <remarks>
-		/// Note that the target arguments may itself contain double quotes
-		/// so in order for this to be passed to PartCover as a single argument
-		/// we need to prefix each double quote by a backslash. For example:
-		/// 
-		/// Target args: "C:\Projects\My Tests\Test.dll" /output "C:\Projects\My Tests\Output.xml"
-		/// 
-		/// PartCover: --target-args "\"C:\Projects\My Tests\Test.dll\" /output \"C:\Projects\My Tests\Output.xml\""
-		/// </remarks>
-		public string GetArguments()
-		{
-			StringBuilder arguments = new StringBuilder();
-			
-			if (!String.IsNullOrEmpty(target)) {
-				arguments.AppendFormat("--target \"{0}\" ", target);
-			}
-			if (!String.IsNullOrEmpty(targetWorkingDirectory)) {
-				arguments.AppendFormat("--target-work-dir \"{0}\" ", targetWorkingDirectory);
-			}
-			if (!String.IsNullOrEmpty(targetArguments)) {
-				arguments.AppendFormat("--target-args \"{0}\" ", targetArguments.Replace("\"", "\\\""));
-			}
-			if (!String.IsNullOrEmpty(output)) {
-				arguments.AppendFormat("--output \"{0}\" ", output);
-			}
-			
-			arguments.Append(GetArguments("--include", include));
-			
-			if (include.Count > 0) {
-				// Add a space between include and exclude arguments.
-				arguments.Append(' ');
-			}
-			
-			arguments.Append(GetArguments("--exclude", exclude));
-			
-			return arguments.ToString().Trim();
-		}
-		
-		public void Start()
-		{
-			string arguments = GetArguments();
-			
-			runner = new ProcessRunner();
-			runner.EnvironmentVariables.Add("COMPLUS_ProfAPI_ProfilerCompatibilitySetting", "EnableV2Profiler");
-			runner.WorkingDirectory = workingDirectory;
-			runner.ProcessExited += ProcessExited;
-			
-			if (OutputLineReceived != null) {
-				runner.OutputLineReceived += OnOutputLineReceived;
-				runner.ErrorLineReceived += OnOutputLineReceived;
-			}
-			runner.Start(partCoverFileName, arguments);
-			OnStarted();
-		}
-		
-		/// <summary>
-		/// Stops the currently running PartCover instance.
-		/// </summary>
-		public void Stop()
-		{
-			if (runner != null) {
-				runner.Kill();
-				OnStopped();
-			}
-		}
-
-		protected void OnExited(string output, string error, int exitCode)
-		{
-			if (Exited != null) {
-				Exited(this, new PartCoverExitEventArgs(output, error, exitCode));
-			}
-		}
-		
-		protected void OnStarted()
-		{
-			if (Started != null) {
-				Started(this, new EventArgs());
-			}
-		}
-		
-		protected void OnStopped()
-		{
-			if (Stopped != null) {
-				Stopped(this, new EventArgs());
-			}
-		}
-		
-		/// <summary>
-		/// Raises the <see cref="OutputLineReceived"/> event.
-		/// </summary>
-		/// <param name="sender">The event source.</param>
-		/// <param name="e">The event arguments.</param>
-		protected void OnOutputLineReceived(object sender, LineReceivedEventArgs e)
-		{
-			if (OutputLineReceived != null) {
-				OutputLineReceived(this, e);
-			}
-		}
-		
-		/// <summary>
-		/// Handles the PartCover process exit event.
-		/// </summary>
-		/// <param name="sender">The event source.</param>
-		/// <param name="e">The event arguments.</param>
-		void ProcessExited(object sender, EventArgs e)
-		{
-			ProcessRunner runner = (ProcessRunner)sender;
-			OnExited(runner.StandardOutput, runner.StandardError, runner.ExitCode);
-		}
-		
-		/// <summary>
-		/// Gets the command line option that can have multiple items as specified
-		/// in the string array. Each array item will have a separate command line
-		/// argument (e.g. --include=A --include=B --include=B).
-		/// </summary>
-		static string GetArguments(string argumentName, StringCollection items)
-		{
-			StringBuilder arguments = new StringBuilder();
-			foreach (string item in items) {
-				arguments.Append(argumentName);
-				arguments.Append(" ");
-				arguments.Append(item);
-				arguments.Append(" ");
-			}
-			return arguments.ToString().Trim();
-		}
-	}
-}

src/AddIns/Analysis/CodeCoverage/Project/Src/PartCoverSettingsFactory.cs

@@ -0,0 +1,43 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
+//     <version>$Revision$</version>
+// </file>
+
+using System;
+using System.IO;
+using ICSharpCode.SharpDevelop.Project;
+
+namespace ICSharpCode.CodeCoverage
+{
+	public class PartCoverSettingsFactory
+	{
+		IFileSystem fileSystem;
+		
+		public PartCoverSettingsFactory(IFileSystem fileSystem)
+		{
+			this.fileSystem = fileSystem;
+		}
+		
+		public PartCoverSettingsFactory()
+			: this(new FileSystem())
+		{
+		}
+		
+		public PartCoverSettings CreatePartCoverSettings(IProject project)
+		{
+			string fileName = PartCoverSettings.GetFileName(project);
+			if (fileSystem.FileExists(fileName)) {
+				return CreatePartCoverSettingsFromFile(fileName);
+			}
+			return new PartCoverSettings();
+		}
+		
+		PartCoverSettings CreatePartCoverSettingsFromFile(string fileName)
+		{
+			TextReader reader = fileSystem.CreateTextReader(fileName);
+			return new PartCoverSettings(reader);
+		}
+	}
+}

src/AddIns/Analysis/CodeCoverage/Project/Src/RunTestWithCodeCoverageCommand.cs

@@ -25,162 +25,118 @@ namespace ICSharpCode.CodeCoverage
 	public class RunTestWithCodeCoverageCommand : AbstractRunTestCommand
 	{
 		static MessageViewCategory category;
-		PartCoverRunner runner;
+		ICodeCoverageTestRunnerFactory factory;
+		CodeCoverageTestRunner codeCoverageTestRunner;
 		
 		public RunTestWithCodeCoverageCommand()
+			: this(new RunTestCommandContext(), new CodeCoverageTestRunnerFactory())
 		{
-			runner = new PartCoverRunner();
-			runner.Exited += PartCoverExited;
-			runner.OutputLineReceived += OutputLineReceived;
 		}
 		
-		protected override void RunTests(NUnitConsoleApplication app)
+		public RunTestWithCodeCoverageCommand(IRunTestCommandContext context,
+			ICodeCoverageTestRunnerFactory factory)
+			: base(context)
 		{
-			SetPartCoverRunnerProperties(app);
+			this.factory = factory;
-			RunPartCover();
 		}
 		
-		protected override void OnStop()
-		{
-			runner.Stop();
-		}
-		
-		/// <summary>
-		/// Clears the code coverage results on display before running
-		/// a series of tests.
-		/// </summary>
 		protected override void OnBeforeRunTests()
 		{
-			WorkbenchSingleton.SafeThreadAsyncCall(Category.ClearText);
+			ClearCodeCoverageResults();
-			WorkbenchSingleton.SafeThreadAsyncCall(CodeCoverageService.ClearResults);
 		}
 		
-		/// <summary>
+		void ClearCodeCoverageResults()
-		/// Shows the code coverage results window only if there were no
-		/// test failures.
-		/// </summary>
-		protected override void OnAfterRunTests()
 		{
-			if (!TaskService.HasCriticalErrors(false)) {
+			Category.ClearText();
-				ShowPad(Context.Workbench.GetPad(typeof(CodeCoveragePad)));
+			Context.Workbench.SafeThreadAsyncCall(CodeCoverageService.ClearResults);
-			}
 		}
 		
 		/// <summary>
 		/// Gets the message view output window.
 		/// </summary>
-		MessageViewCategory Category {
+		protected MessageViewCategory Category {
 			get {
 				if (category == null) {
-					MessageViewCategory.Create(ref category, "CodeCoverage", StringParser.Parse("${res:ICSharpCode.UnitTesting.CodeCoverage}"));
+					CreateCodeCoverageMessageViewCategory();
 				}
 				return category;
 			}
+			set { category = value; }
 		}
 		
-		void SetPartCoverRunnerProperties(NUnitConsoleApplication app)
+		void CreateCodeCoverageMessageViewCategory()
 		{
-			string partCoverOutputDirectory = GetPartCoverOutputDirectory(app.Project);
+			string displayCategory = StringParse("${res:ICSharpCode.UnitTesting.CodeCoverage}");
-			PartCoverSettings settings = GetPartCoverSettings(app.Project);
+			category = CreateMessageViewCategory("CodeCoverage", displayCategory);
+		}
 		
-			// By default get the code coverage for everything if
+		protected virtual string StringParse(string text)
-			// no include or exclude regular expressions have been
+		{
-			// set for this project. Note that the CodeCoverageResults
+			return StringParser.Parse(text);
-			// will ignore any type that has no source code available
+		}
-			// for it even though the type may be in the Part Cover
-			// results file.
-			if (settings.Include.Count == 0) {
-				settings.Include.Add("[*]*");
-			}
 		
-			runner.PartCoverFileName = GetPartCoverFileName();
+		protected virtual MessageViewCategory CreateMessageViewCategory(string category, string displayCategory)
-			runner.Target = app.FileName;
+		{
-			runner.TargetArguments = app.GetArguments();
+			MessageViewCategory view = null;
-			runner.TargetWorkingDirectory = Path.GetDirectoryName(app.Assemblies[0]);
+			MessageViewCategory.Create(ref view, category, displayCategory);
-			runner.Output = Path.Combine(partCoverOutputDirectory, "Coverage.Xml");
+			return view;
-			AddStringsToCollection(settings.Include, runner.Include);
-			AddStringsToCollection(settings.Exclude, runner.Exclude);
 		}
 		
-		void RunPartCover()
+		protected override void OnAfterRunTests()
 		{
-			// Remove existing coverage results file.
+			ShowCodeCoverageResultsIfNoCriticalTestFailures();
-			if (File.Exists(runner.Output)) {
+		}
-				File.Delete(runner.Output);
-			}
 		
-			// Create PartCover output directory.
+		void ShowCodeCoverageResultsIfNoCriticalTestFailures()
-			if (!Directory.Exists(Path.GetDirectoryName(runner.Output))) {
+		{
-				Directory.CreateDirectory(Path.GetDirectoryName(runner.Output));
+			if (!Context.TaskService.HasCriticalErrors(false)) {
+				ShowPad(Context.Workbench.GetPad(typeof(CodeCoveragePad)));
 			}
-			
-			Category.AppendLine(StringParser.Parse("${res:ICSharpCode.CodeCoverage.RunningCodeCoverage}"));
-			Category.AppendLine(runner.CommandLine);
-			
-			runner.Start();
 		}
 		
-		/// <summary>
+		protected override void TestRunnerMessageReceived(object source, MessageReceivedEventArgs e)
-		/// Displays the output from PartCover after it has exited.
-		/// </summary>
-		/// <param name="sender">The event source.</param>
-		/// <param name="e">The PartCover exit event arguments.</param>
-		void PartCoverExited(object sender, PartCoverExitEventArgs e)
 		{
-			DisplayCoverageResults(runner.Output);
+			Category.AppendLine(e.Message);
-			WorkbenchSingleton.SafeThreadAsyncCall(TestRunCompleted);
 		}
 
-		void OutputLineReceived(object sender, LineReceivedEventArgs e)
+		protected override ITestRunner CreateTestRunner(IProject project)
 		{
-			Category.AppendLine(e.Line);
+			codeCoverageTestRunner = factory.CreateCodeCoverageTestRunner();
+			codeCoverageTestRunner.AllTestsFinished += CodeCoverageRunFinished;
+			return codeCoverageTestRunner;
 		}
 		
-		void DisplayCoverageResults(string fileName)
+		void CodeCoverageRunFinished(object source, EventArgs e)
 		{
-			if (!File.Exists(fileName)) {
+			if (codeCoverageTestRunner.HasCodeCoverageResults()) {
-				Task task = new Task(null, String.Concat(StringParser.Parse("${res:ICSharpCode.CodeCoverage.NoCodeCoverageResultsGenerated}"), " ", fileName), 0, 0, TaskType.Error);
+				CodeCoverageResults results = codeCoverageTestRunner.ReadCodeCoverageResults();
-				WorkbenchSingleton.SafeThreadAsyncCall(TaskService.Add, task);
+				DisplayCodeCoverageResults(results);
-				return;
+			} else {
+				DisplayNoCodeCoverageResultsGeneratedMessage();
 			}
-			
-			CodeCoverageResults results = new CodeCoverageResults(fileName);
-			WorkbenchSingleton.SafeThreadAsyncCall(CodeCoverageService.ShowResults, results);
 		}
 		
-		/// <summary>
+		void DisplayCodeCoverageResults(CodeCoverageResults results)
-		/// Returns the full path to the PartCover console application if it
-		/// exists.
-		/// </summary>
-		/// <remarks>
-		/// Use Path.GetFullPath otherwise we end up with a filename path like:
-		/// C:\Program Files\SharpDevelop\bin\..\bin\Tools\PartCover\PartCover.exe
-		/// </remarks>
-		string GetPartCoverFileName()
 		{
-			return Path.GetFullPath(Path.Combine(FileUtility.ApplicationRootPath, @"bin\Tools\PartCover\PartCover.exe"));
+			Context.Workbench.SafeThreadAsyncCall(CodeCoverageService.ShowResults, results);
 		}
 		
-		string GetPartCoverOutputDirectory(IProject project)
+		void DisplayNoCodeCoverageResultsGeneratedMessage()
 		{
-			return Path.Combine(project.Directory, "PartCover");
+			Task task = CreateNoCodeCoverageResultsGeneratedTask();
+			Context.Workbench.SafeThreadAsyncCall(Context.TaskService.Add, task);		
 		}
 		
-		PartCoverSettings GetPartCoverSettings(IProject project)
+		Task CreateNoCodeCoverageResultsGeneratedTask()
 		{
-			string fileName = PartCoverSettings.GetFileName(project);
+			string description = GetNoCodeCoverageResultsGeneratedTaskDescription();
-			if (File.Exists(fileName)) {
+			return new Task(null, description, 1, 1, TaskType.Error);
-				return new PartCoverSettings(fileName);
-			}
-			return new PartCoverSettings();
 		}
 		
-		void AddStringsToCollection(StringCollection source, StringCollection target)
+		string GetNoCodeCoverageResultsGeneratedTaskDescription()
 		{
-			target.Clear();
+			string message = StringParse("${res:ICSharpCode.CodeCoverage.NoCodeCoverageResultsGenerated}");
-			foreach (string item in source) {
+			return String.Format("{0} {1}", message, codeCoverageTestRunner.CodeCoverageResultsFileName);
-				target.Add(item);
-			}
 		}
 	}
 }

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

@@ -69,10 +69,10 @@
     <Compile Include="Coverage\InvalidSequencePointDataTestFixture.cs" />
     <Compile Include="Coverage\MethodHasNoNamespaceTestFixture.cs" />
     <Compile Include="Coverage\ModuleVisitedSequencePointsTestFixture.cs" />
-    <Compile Include="Coverage\PartCoverCommandLineTests.cs" />
+    <Compile Include="Coverage\PartCoverSettingsFactoryTests.cs" />
-    <Compile Include="Coverage\PartCoverExitEventArgsTestFixture.cs" />
     <Compile Include="Coverage\PartCoverSettingsMissingRulePrefixTestFixture.cs" />
     <Compile Include="Coverage\PartCoverSettingsTestFixture.cs" />
+    <Compile Include="Coverage\RemoveTaskMarkerTests.cs" />
     <Compile Include="Coverage\SimilarRootNamespaceTestFixture.cs" />
     <Compile Include="Gui\DisplayItemTestFixture.cs" />
     <Compile Include="Gui\PropertiesInCodeCoverageTreeView.cs" />
@@ -86,12 +86,18 @@
     <Compile Include="Highlighting\CodeCoverageMarkersInvalidStartColumnTestFixture.cs" />
     <Compile Include="Highlighting\CodeCoverageMarkersInvalidStartLineTestFixture.cs" />
     <Compile Include="Highlighting\RemoveCodeCoverageMarkersTestFixture.cs" />
-    <None Include="Strings.resources" />
+    <Compile Include="Testing\CodeCoverageTestRunnerTests.cs" />
+    <Compile Include="Testing\PartCoverApplicationTests.cs" />
+    <Compile Include="Testing\RunTestWithCodeCoverageCommandTests.cs" />
+    <Compile Include="Utils\DerivedCodeCoverageTestRunner.cs" />
+    <Compile Include="Utils\DerivedRunTestWithCodeCoverageCommand.cs" />
     <Compile Include="Gui\ClassWithNoNamespaceInTreeViewTestFixture.cs" />
     <Compile Include="Gui\CodeCoverageTreeViewTestFixture.cs" />
     <Compile Include="Gui\ListViewSortingTestFixture.cs" />
     <Compile Include="Gui\TreeViewAfterSelectTestFixture.cs" />
     <Compile Include="Utils\DerivedCodeCoverageTreeView.cs" />
+    <Compile Include="Utils\MockCodeCoverageTestRunnerFactory.cs" />
+    <Compile Include="Utils\MockFileSystem.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Libraries\NRefactory\Project\NRefactory.csproj">
@@ -111,6 +117,10 @@
       <Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
       <Name>ICSharpCode.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\UnitTesting\Test\UnitTesting.Tests.csproj">
+      <Project>{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}</Project>
+      <Name>UnitTesting.Tests</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Project\CodeCoverage.csproj">
       <Project>{08CE9972-283B-44F4-82FA-966F7DFA6B7A}</Project>
       <Name>CodeCoverage</Name>
@@ -119,10 +129,6 @@
       <Project>{1F261725-6318-4434-A1B1-6C70CE4CD324}</Project>
       <Name>UnitTesting</Name>
     </ProjectReference>
-    <Content Include="..\..\..\..\..\AddIns\AddIns\Misc\UnitTesting\UnitTesting.dll">
-      <Link>UnitTesting.dll</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <ProjectReference Include="..\..\..\..\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj">
       <Project>{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}</Project>
       <Name>ICSharpCode.SharpDevelop.Dom</Name>
@@ -131,8 +137,15 @@
   <ItemGroup>
     <Folder Include="Coverage" />
     <Folder Include="Highlighting" />
+    <Folder Include="Testing" />
     <Folder Include="Utils" />
     <Folder Include="Gui" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\..\..\AddIns\AddIns\Misc\UnitTesting\UnitTesting.dll">
+      <Link>UnitTesting.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>

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

@@ -1,176 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using NUnit.Framework;
-
-namespace ICSharpCode.CodeCoverage.Tests.Coverage
-{
-	/// <summary>
-	/// Tests the PartCoverRunner's command line argumentsests.
-	/// </summary>
-	[TestFixture]
-	public class PartCoverCommandLineTests
-	{
-		[Test]
-		public void PartCoverFileNameSpecified()
-		{
-			string partCoverFileName = @"C:\Program Files\PartCover\PartCover.exe";
-			PartCoverRunner runner = new PartCoverRunner();
-			runner.PartCoverFileName = partCoverFileName;
-			
-			Assert.AreEqual(partCoverFileName, runner.CommandLine);
-		}
-		
-		[Test]
-		public void ArgumentsStringIsEmptyWhenNothingSpecified()
-		{
-			PartCoverRunner runner = new PartCoverRunner();
-			Assert.AreEqual(String.Empty, runner.GetArguments());
-		}
-		
-		[Test]
-		public void WorkingDirectoryNotSet()
-		{
-			PartCoverRunner runner = new PartCoverRunner();
-			Assert.AreEqual(String.Empty, runner.WorkingDirectory);
-		}
-		
-		[Test]
-		public void WorkingDirectorySet()
-		{
-			PartCoverRunner runner = new PartCoverRunner();
-			string folder = @"C:\Program Files\PartCover";
-			runner.WorkingDirectory = folder;
-			Assert.AreEqual(folder, runner.WorkingDirectory);
-		}
-		
-		[Test]
-		public void TargetFileNameSpecified()
-		{
-			string targetFileName = @"C:\Program Files\SharpDevelop\bin\Tools\NUnit-console.exe";
-			string partCoverFileName = @"C:\Program Files\PartCover\PartCover.exe";
-			PartCoverRunner runner = new PartCoverRunner();
-			runner.PartCoverFileName = partCoverFileName;
-			runner.Target = targetFileName;
-			string expectedCommandLine = partCoverFileName + " --target \"" + targetFileName + "\"";
-			
-			Assert.AreEqual(expectedCommandLine, runner.CommandLine);
-		}		
-		
-		[Test]
-		public void TargetWorkingDirectorySpecified()
-		{
-			string targetWorkingDirectory = @"C:\Program Files\SharpDevelop\bin\Tools";
-			PartCoverRunner runner = new PartCoverRunner();
-			runner.TargetWorkingDirectory = targetWorkingDirectory;
-			string expectedArgs = "--target-work-dir \"" + targetWorkingDirectory + "\"";
-			
-			Assert.AreEqual(expectedArgs, runner.GetArguments());
-		}
-		
-		[Test]
-		public void TargetArguments()
-		{
-			string targetArgs = @"C:\Project\Test\MyTests.dll";
-			PartCoverRunner runner = new PartCoverRunner();
-			runner.TargetWorkingDirectory = null;
-			runner.TargetArguments = targetArgs;
-			string expectedArgs = "--target-args \"" + targetArgs + "\"";
-			
-			Assert.AreEqual(expectedArgs, runner.GetArguments());
-		}		
-
-		/// <summary>
-		/// In order for the target arguments to be successfully passed to
-		/// PartCover we need to prefix any double quote with a backslash.
-		/// </summary>
-		[Test]
-		public void TargetArgumentsIncludeDoubleQuotes()
-		{
-			string targetArgs = "\"C:\\Project\\My Tests\\MyTests.dll\" /output=\"C:\\Project\\My Tests\\Output.xml\"";
-			PartCoverRunner runner = new PartCoverRunner();
-			runner.TargetWorkingDirectory = null;
-			runner.TargetArguments = targetArgs;
-			string expectedArgs = "--target-args \"" + targetArgs.Replace("\"", "\\\"") + "\"";
-			
-			Assert.AreEqual(expectedArgs, runner.GetArguments());
-		}		
-		
-		[Test]
-		public void IncludeSpecified()
-		{
-			string include = @"[RootNamespace.MyTests]*";
-			PartCoverRunner runner = new PartCoverRunner();
-			runner.Include.Add(include);
-			string expectedArgs = "--include " + include;
-			
-			Assert.AreEqual(expectedArgs, runner.GetArguments());
-		}		
-
-		[Test]
-		public void TwoIncludeItemsSpecified()
-		{
-			string include1 = @"[RootNamespace.MyTests]*";
-			string include2 = @"[System]*";
-			PartCoverRunner runner = new PartCoverRunner();
-			runner.Include.Add(include1);
-			runner.Include.Add(include2);
-			string expectedArgs = "--include " + include1 + " --include " + include2;
-			
-			Assert.AreEqual(expectedArgs, runner.GetArguments());
-		}		
-		
-		[Test]
-		public void ExcludeSpecified()
-		{
-			string exclude = @"[RootNamespace.MyTests]*";
-			PartCoverRunner runner = new PartCoverRunner();
-			runner.Exclude.Add(exclude);
-			string expectedArgs = "--exclude " + exclude;
-			
-			Assert.AreEqual(expectedArgs, runner.GetArguments());
-		}		
-
-		[Test]
-		public void TwoExcludeItemsSpecified()
-		{
-			string exclude1 = @"[RootNamespace.MyTests]*";
-			string exclude2 = @"[System]*";
-			PartCoverRunner runner = new PartCoverRunner();
-			runner.Exclude.Add(exclude1);
-			runner.Exclude.Add(exclude2);
-			string expectedArgs = "--exclude " + exclude1 + " --exclude " + exclude2;
-			
-			Assert.AreEqual(expectedArgs, runner.GetArguments());
-		}		
-
-		[Test]
-		public void OneIncludeAndExcludeItemSpecified()
-		{
-			string exclude = @"[RootNamespace.MyTests]*";
-			string include = @"[System]*";
-			PartCoverRunner runner = new PartCoverRunner();
-			runner.Exclude.Add(exclude);
-			runner.Include.Add(include);
-			string expectedArgs = "--include " + include + " --exclude " + exclude;
-			
-			Assert.AreEqual(expectedArgs, runner.GetArguments());
-		}		
-		
-		[Test]
-		public void OutputSpecified()
-		{
-			string output = @"C:\Projects\MyTests\CodeCoverage.xml";
-			PartCoverRunner runner = new PartCoverRunner();
-			runner.Output = output;
-			string expectedArgs = "--output \"" + output + "\"";
-			
-			Assert.AreEqual(expectedArgs, runner.GetArguments());
-		}		
-	}
-}

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

@@ -1,49 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using ICSharpCode.CodeCoverage;
-using NUnit.Framework;
-
-namespace ICSharpCode.CodeCoverage.Tests.Coverage
-{
-	/// <summary>
-	/// Tests the PartCoverExitEventArgs class.
-	/// </summary>
-	[TestFixture]
-	public class PartCoverExitEventArgsTestFixture
-	{
-		PartCoverExitEventArgs eventArgs;
-		string output = "Test";
-		string error = "Error";
-		int exitCode = -1;
-		
-		[TestFixtureSetUp]
-		public void SetUpFixture()
-		{
-			eventArgs = new PartCoverExitEventArgs(output, error, exitCode);
-		}
-		
-		[Test]
-		public void OutputText()
-		{
-			Assert.AreEqual(output, eventArgs.Output);
-		}
-
-		[Test]
-		public void ErrorText()
-		{
-			Assert.AreEqual(error, eventArgs.Error);
-		}
-
-		[Test]
-		public void ExitCode()
-		{
-			Assert.AreEqual(exitCode, eventArgs.ExitCode);
-		}
-	}
-}

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

@@ -0,0 +1,64 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
+//     <version>$Revision$</version>
+// </file>
+
+using System;
+using System.IO;
+using System.Text;
+using ICSharpCode.CodeCoverage;
+using ICSharpCode.CodeCoverage.Tests.Utils;
+using NUnit.Framework;
+using UnitTesting.Tests.Utils;
+
+namespace ICSharpCode.CodeCoverage.Tests.Coverage
+{
+	[TestFixture]
+	public class PartCoverSettingsFactoryTests
+	{
+		PartCoverSettingsFactory factory;
+		PartCoverSettings partCoverSettings;
+		MockCSharpProject project;
+		MockFileSystem fileSystem;
+		
+		[SetUp]
+		public void Init()
+		{
+			fileSystem = new MockFileSystem();
+			factory = new PartCoverSettingsFactory(fileSystem);
+			project = new MockCSharpProject();
+		}
+		
+		[Test]
+		public void CreatePartCoverSettingsWhenFileDoesNotExistCreatesSettingsWithNoPartCoverIncludes()
+		{
+			fileSystem.FileExistsReturnValue = false;
+			CreatePartCoverSettingsFromFactory();
+			Assert.AreEqual(0, partCoverSettings.Include.Count);
+		}
+		
+		void CreatePartCoverSettingsFromFactory()
+		{
+			partCoverSettings = factory.CreatePartCoverSettings(project);
+		}
+		
+		[Test]
+		public void CreatePartCoverSettingsWhenFileExistsCreatesSettingsFromFile()
+		{
+			string partCoverSettingsXml =
+				"<PartCoverSettings>\r\n" +
+				"   <Rule>+test</Rule>\r\n" +
+				"</PartCoverSettings>";
+			
+			StringReader reader = new StringReader(partCoverSettingsXml);
+			fileSystem.CreateTextReaderReturnValue = reader;
+			
+			fileSystem.FileExistsReturnValue = true;
+			
+			CreatePartCoverSettingsFromFactory();
+			Assert.AreEqual("test", partCoverSettings.Include[0]);
+		}
+	}
+}

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

@@ -0,0 +1,47 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
+//     <version>$Revision$</version>
+// </file>
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using ICSharpCode.CodeCoverage;
+using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop;
+using ICSharpCode.SharpDevelop.Editor;
+using ICSharpCode.SharpDevelop.Tests.Utils;
+using NUnit.Framework;
+
+namespace ICSharpCode.CodeCoverage.Tests.Coverage
+{
+	[TestFixture]
+	public class RemoveTaskMarkerTests
+	{
+		ITextMarkerService markerService;
+		IDocument document;
+		
+		[SetUp]
+		public void Init()
+		{
+			document = MockTextMarkerService.CreateDocumentWithMockService();
+			markerService = document.GetService(typeof(ITextMarkerService)) as ITextMarkerService;
+			document.Text = 
+				"{\r\n" +
+				"    int count = 0;\r\n" +
+				"}\r\n";
+		}
+		
+		[Test]
+		public void CodeCoverageHighlighterRemoveMarkersDoesNotThrowInvalidCastExceptionWhenOneMarkerTagIsTask()
+		{
+			ITextMarker textMarker = markerService.Create(0, 2);
+			textMarker.Tag = new Task(null, String.Empty, 1, 1, TaskType.Error);
+			
+			CodeCoverageHighlighter highlighter = new CodeCoverageHighlighter();
+			Assert.DoesNotThrow(delegate { highlighter.RemoveMarkers(document); });
+		}
+	}
+}

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

@@ -0,0 +1,239 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
+//     <version>$Revision$</version>
+// </file>
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+using ICSharpCode.Core;
+using ICSharpCode.CodeCoverage;
+using ICSharpCode.CodeCoverage.Tests.Utils;
+using ICSharpCode.SharpDevelop;
+using ICSharpCode.UnitTesting;
+using NUnit.Framework;
+using UnitTesting.Tests.Utils;
+
+namespace ICSharpCode.CodeCoverage.Tests.Testing
+{
+	[TestFixture]
+	public class CodeCoverageTestRunnerTests
+	{
+		MockProcessRunner processRunner;
+		MockTestResultsMonitor testResultsMonitor;
+		UnitTestingOptions options;
+		DerivedCodeCoverageTestRunner testRunner;
+		MockFileSystem fileSystem;
+		
+		[SetUp]
+		public void Init()
+		{
+			processRunner = new MockProcessRunner();
+			testResultsMonitor = new MockTestResultsMonitor();
+			options = new UnitTestingOptions(new Properties());
+			fileSystem = new MockFileSystem();
+			testRunner = new DerivedCodeCoverageTestRunner(processRunner, testResultsMonitor, options, fileSystem);
+		}
+		
+		[Test]
+		public void CreateTestResultForTestFrameworkReturnsNUnitTestResult()
+		{
+			TestResult testResult = new TestResult("abc");
+			Assert.IsInstanceOf(typeof(NUnitTestResult), testRunner.CallCreateTestResultForTestFramework(testResult));
+		}
+		
+		[Test]
+		public void HasCodeCoverageResultsWhenCoverageFileExistsReturnsTrue()
+		{
+			StartTestRunner();
+			
+			fileSystem.FileExistsReturnValue = true;
+			
+			Assert.IsTrue(testRunner.HasCodeCoverageResults());
+		}
+		
+		void StartTestRunner()
+		{
+			FileUtility.ApplicationRootPath = @"d:\sharpdevelop";
+			MockCSharpProject project = new MockCSharpProject();
+			SelectedTests tests = new SelectedTests(project);
+			testRunner.Start(tests);
+		}
+		
+		[Test]
+		public void HasCodeCoverageResultsWhenCoverageFileDoesNotExistsReturnsFalse()
+		{
+			fileSystem.FileExistsReturnValue = false;
+			StartTestRunner();
+			Assert.IsFalse(testRunner.HasCodeCoverageResults());
+		}
+		
+		[Test]
+		public void HasCodeCoverageResultsAfterTestRunChecksPassesCodeCoverageFileToFileExistsMethod()
+		{
+			fileSystem.FileExistsReturnValue = false;
+			fileSystem.FileExistsPathParameter = null;
+			StartTestRunner();
+			testRunner.HasCodeCoverageResults();
+			
+			string expectedFileName = 
+				@"c:\projects\MyTests\PartCover\coverage.xml";
+			
+			Assert.AreEqual(expectedFileName, fileSystem.FileExistsPathParameter);
+		}
+		
+		[Test]
+		public void ReadCodeCoverageResultsAfterTestRunChecksPassesCodeCoverageFileToCreateTextReaderMethod()
+		{
+			StartTestRunner();
+			
+			fileSystem.FileExistsReturnValue = true;
+			fileSystem.CreateTextReaderPathParameter = null;
+			fileSystem.CreateTextReaderReturnValue = new StringReader("<abc/>");
+			
+			testRunner.ReadCodeCoverageResults();
+			
+			string expectedFileName = 
+				@"c:\projects\MyTests\PartCover\coverage.xml";
+			
+			Assert.AreEqual(expectedFileName, fileSystem.CreateTextReaderPathParameter);
+		}
+		
+		[Test]
+		public void GetProcessStartInfoWhenTestResultsFileNameSetReturnsCommandLineWithTestResultsFileName()
+		{
+			FileUtility.ApplicationRootPath = @"d:\sharpdevelop";
+			testResultsMonitor.FileName = @"d:\temp\results.txt";
+			
+			fileSystem.CreateTextReaderReturnValue = CreatePartCoverSettingsTextReader();
+			fileSystem.FileExistsReturnValue = true;
+			
+			MockCSharpProject project = new MockCSharpProject();
+			SelectedTests tests = new SelectedTests(project);
+			testRunner.Start(tests);
+			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\\\" /results=\\\"d:\\temp\\results.txt\\\"\" " +
+				"--output \"c:\\projects\\MyTests\\PartCover\\coverage.xml\" " +
+				"--include [MyTests]*";
+			
+			Assert.AreEqual(expectedCommandLine, processStartInfo.Arguments);
+		}
+		
+		TextReader CreatePartCoverSettingsTextReader()
+		{
+			PartCoverSettings settings = new PartCoverSettings();
+			settings.Include.Add("[MyTests]*");
+			StringBuilder text = new StringBuilder();
+			StringWriter writer = new StringWriter(text);
+			settings.Save(writer);
+			
+			return new StringReader(text.ToString());
+		}
+		
+		[Test]
+		public void StartSetsProfilerEnvironmentVariableInProcessRunner()
+		{
+			StartTestRunner();
+			string environmentVariableValue = processRunner.EnvironmentVariables["COMPLUS_ProfAPI_ProfilerCompatibilitySetting"];
+			Assert.AreEqual("EnableV2Profiler", environmentVariableValue);
+		}
+		
+		[Test]
+		public void StartWhenCodeCoverageResultsFileExistsDeletesExistingCodeCoverageResultsFile()
+		{
+			fileSystem.FileExistsReturnValue = true;
+			fileSystem.CreateTextReaderReturnValue = new StringReader("<abc/>");
+			StartTestRunner();
+			
+			string expectedFileName = @"c:\projects\MyTests\PartCover\coverage.xml";
+			Assert.AreEqual(expectedFileName, fileSystem.DeleteFilePathParameter);
+		}
+		
+		[Test]
+		public void StartWhenCodeCoverageResultsFileDoesNotExistsCodeCoverageResultsFileIsNotDeleted()
+		{
+			fileSystem.FileExistsReturnValue = false;
+			StartTestRunner();
+			
+			Assert.IsNull(fileSystem.DeleteFilePathParameter);
+		}
+		
+		[Test]
+		public void StartCreatesDirectoryCodeCoverageResultsFileIfDoesNotExist()
+		{
+			fileSystem.DirectoryExistsReturnValue = false;
+			StartTestRunner();
+			
+			string expectedDirectory = @"c:\projects\MyTests\PartCover";
+			Assert.AreEqual(expectedDirectory, fileSystem.CreateDirectoryPathParameter);
+		}
+		
+		[Test]
+		public void StartChecksDirectoryForCodeCoverageResultsExists()
+		{
+			fileSystem.DirectoryExistsReturnValue = true;
+			StartTestRunner();
+			
+			string expectedDirectory = @"c:\projects\MyTests\PartCover";
+			Assert.AreEqual(expectedDirectory, fileSystem.DirectoryExistsPathParameter);
+		}
+		
+		[Test]
+		public void StartDoesNotCreateDirectoryForCodeCoverageResultsFileIfItExists()
+		{
+			fileSystem.DirectoryExistsReturnValue = true;
+			StartTestRunner();
+			
+			Assert.IsNull(fileSystem.CreateDirectoryPathParameter);
+		}
+		
+		[Test]
+		public void StartFiresMessagesReceivedEventTwice()
+		{
+			List<string> messages = new List<string>();
+			testRunner.MessageReceived += delegate(object o, MessageReceivedEventArgs e) {
+				messages.Add(e.Message);
+			};
+			
+			testRunner.ParseStringReturnValue = "Running code coverage";
+			StartTestRunner();
+			
+			string[] expectedMessages = new string[] {
+				"Running code coverage",
+				GetCodeCoverageCommandLine()
+			};
+			
+			Assert.AreEqual(expectedMessages, messages.ToArray());
+		}
+		
+		string GetCodeCoverageCommandLine()
+		{
+			return 
+				"\"d:\\sharpdevelop\\bin\\Tools\\PartCover\\PartCover.exe\" " +
+				"--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\\\"\" " + 
+				"--output \"c:\\projects\\MyTests\\PartCover\\coverage.xml\" " +
+				"--include [*]*";
+		}
+		
+		[Test]
+		public void StartParsesTextForRunningCodeCoverageMessages()
+		{
+			testRunner.ParseStringReturnValue = "Running code coverage";
+			StartTestRunner();
+			
+			string expectedStringResource = "${res:ICSharpCode.CodeCoverage.RunningCodeCoverage}";
+			
+			Assert.AreEqual(expectedStringResource, testRunner.ParseStringParameter);
+		}
+	}
+}

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

@@ -0,0 +1,174 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
+//     <version>$Revision$</version>
+// </file>
+
+using System;
+using System.Diagnostics;
+using ICSharpCode.CodeCoverage;
+using ICSharpCode.Core;
+using ICSharpCode.UnitTesting;
+using NUnit.Framework;
+using UnitTesting.Tests.Utils;
+
+namespace ICSharpCode.CodeCoverage.Tests.Testing
+{
+	[TestFixture]
+	public class PartCoverApplicationTests
+	{
+		NUnitConsoleApplication nunitConsoleApp;
+		SelectedTests selectedTests;
+		UnitTestingOptions options;
+		PartCoverApplication partCoverApp;
+		PartCoverSettings partCoverSettings;
+		
+		[Test]
+		public void FileNameWhenPartCoverApplicationConstructedWithFileNameParameterMatchesFileNameParameter()
+		{
+			string expectedFileName = @"d:\projects\PartCover.exe";
+			CreatePartCoverApplication(expectedFileName);
+			Assert.AreEqual(expectedFileName, partCoverApp.FileName);
+		}
+		
+		void CreatePartCoverApplication(string fileName)
+		{
+			CreateNUnitConsoleApplication();
+			partCoverSettings = new PartCoverSettings();
+			partCoverApp = new PartCoverApplication(fileName, nunitConsoleApp, partCoverSettings);
+		}
+		
+		void CreateNUnitConsoleApplication()
+		{
+			MockCSharpProject project = new MockCSharpProject();
+			selectedTests = new SelectedTests(project);
+			
+			options = new UnitTestingOptions(new Properties());
+			nunitConsoleApp = new NUnitConsoleApplication(selectedTests, options);
+		}
+		
+		[Test]
+		public void FileNameWhenPartCoverApplicationConstructedWithNoParametersIsDeterminedFromFileUtilityAppRootPath()
+		{
+			FileUtility.ApplicationRootPath = @"d:\sharpdevelop";
+			CreatePartCoverApplicationWithoutFileName();
+			string expectedPath = @"d:\sharpdevelop\bin\Tools\PartCover\PartCover.exe";
+			Assert.AreEqual(expectedPath, partCoverApp.FileName);
+		}
+		
+		void CreatePartCoverApplicationWithoutFileName()
+		{
+			CreateNUnitConsoleApplication();
+			partCoverApp = new PartCoverApplication(nunitConsoleApp, new PartCoverSettings());
+		}
+		
+		[Test]
+		public void FileNameWhenTakenFromFileUtilityAppRootPathRemovesDotDotCharacters()
+		{
+			FileUtility.ApplicationRootPath = @"d:\sharpdevelop\..\sharpdevelop";
+			CreatePartCoverApplicationWithoutFileName();
+			string expectedPath = @"d:\sharpdevelop\bin\Tools\PartCover\PartCover.exe";
+			Assert.AreEqual(expectedPath, partCoverApp.FileName);
+		}
+		
+		[Test]
+		public void TargetIsNUnitConsoleApplicationFileName()
+		{
+			CreatePartCoverApplication();
+			Assert.AreEqual(nunitConsoleApp.FileName, partCoverApp.Target);
+		}
+		
+		void CreatePartCoverApplication()
+		{
+			string fileName = @"d:\partcover\PartCover.exe";
+			CreatePartCoverApplication(fileName);
+		}
+		
+		[Test]
+		public void GetTargetArgumentsReturnsNUnitConsoleApplicationCommandLineArguments()
+		{
+			CreatePartCoverApplication();
+			Assert.AreEqual(nunitConsoleApp.GetArguments(), partCoverApp.GetTargetArguments());
+		}
+		
+		[Test]
+		public void GetTargetWorkingDirectoryReturnsWorkingDirectoryForProjectOutput()
+		{
+			CreatePartCoverApplication();
+			string expectedTargetWorkingDirectory = @"c:\projects\MyTests\bin\Debug";
+			Assert.AreEqual(expectedTargetWorkingDirectory, partCoverApp.GetTargetWorkingDirectory());
+		}
+		
+		[Test]
+		public void CodeCoverageResultsFileNameReturnsCoverageXmlFileInsidePartCoverDirectoryInsideProjectDirectory()
+		{
+			CreatePartCoverApplication();
+			string expectedOutputDirectory = 
+				@"c:\projects\MyTests\PartCover\coverage.xml";
+			
+			Assert.AreEqual(expectedOutputDirectory, partCoverApp.CodeCoverageResultsFileName);
+		}
+		
+		[Test]
+		public void SettingsReturnsPartCoverSettingsPassedToConstructor()
+		{
+			CreatePartCoverApplication();
+			Assert.AreEqual(partCoverSettings, partCoverApp.Settings);
+		}
+		
+		[Test]
+		public void GetProcessStartInfoReturnsStartInfoWhereFileNameIsPartCoverAppFileName()
+		{
+			string partCoverAppFileName = @"d:\projects\partcover.exe";
+			CreatePartCoverApplication(partCoverAppFileName);
+			ProcessStartInfo processStartInfo = partCoverApp.GetProcessStartInfo();
+			
+			Assert.AreEqual(partCoverAppFileName, processStartInfo.FileName);
+		}
+		
+		[Test]
+		public void GetProcessStartInfoWhenNoIncludedItemsReturnsCommandLineWithIncludeForAllAssemblies()
+		{
+			FileUtility.ApplicationRootPath = @"d:\sharpdevelop";
+			CreatePartCoverApplication();
+			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\\\"\" " + 
+				"--output \"c:\\projects\\MyTests\\PartCover\\coverage.xml\" " +
+				"--include [*]*";
+
+			Assert.AreEqual(expectedCommandLine, processStartInfo.Arguments);
+		}
+		
+		[Test]
+		public void GetProcessStartInfoWhenHaveIncludedAndExcludedItemsReturnsCommandLineWithIncludeAndExcludeCommandLineArgs()
+		{
+			FileUtility.ApplicationRootPath = @"d:\sharpdevelop";
+			CreatePartCoverApplication();
+			
+			partCoverSettings.Include.Add("[MyTests]*");
+			partCoverSettings.Include.Add("[MoreTests]*");
+			
+			partCoverSettings.Exclude.Add("[NUnit.Framework]*");
+			partCoverSettings.Exclude.Add("[MyProject]*");
+			
+			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\\\"\" " + 
+				"--output \"c:\\projects\\MyTests\\PartCover\\coverage.xml\" " +
+				"--include [MyTests]* " +
+				"--include [MoreTests]* " +
+				"--exclude [NUnit.Framework]* " +
+				"--exclude [MyProject]*";
+
+			Assert.AreEqual(expectedCommandLine, processStartInfo.Arguments);
+		}
+	}
+}

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

@@ -0,0 +1,259 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
+//     <version>$Revision$</version>
+// </file>
+
+using System;
+using System.IO;
+using System.Text;
+using ICSharpCode.CodeCoverage;
+using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop;
+using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.UnitTesting;
+using NUnit.Framework;
+using ICSharpCode.CodeCoverage.Tests.Utils;
+using UnitTesting.Tests.Utils;
+
+namespace ICSharpCode.CodeCoverage.Tests.Testing
+{
+	[TestFixture]
+	public class RunTestWithCodeCoverageCommandTests
+	{
+		DerivedRunTestWithCodeCoverageCommand command;
+		MockRunTestCommandContext context;
+		MockCodeCoverageTestRunnerFactory mockCodeCoverageTestRunnerFactory;
+		
+		[SetUp]
+		public void Init()
+		{
+			context = new MockRunTestCommandContext();
+			mockCodeCoverageTestRunnerFactory = new MockCodeCoverageTestRunnerFactory();
+			command = new DerivedRunTestWithCodeCoverageCommand(context, mockCodeCoverageTestRunnerFactory);
+		}
+		
+		[Test]
+		public void OnBeforeRunTestsWhenNoCodeCoverageMessageViewCreatedCreatesNewMessageViewCategory()
+		{
+			command.CodeCoverageMessageViewCategory = null;
+			command.CallOnBeforeRunTests();
+			
+			Assert.AreEqual("CodeCoverage", command.CodeCoverageMessageViewCategory.Category);
+		}
+		
+		[Test]
+		public void OnBeforeRunTestsWhenNoCodeCoverageMessageViewCreatedCreatesNewMessageViewCategoryWithCodeCoverageDisplayCategoryName()
+		{
+			command.CodeCoverageMessageViewCategory = null;
+			command.ParsedStringToReturn = "Code Coverage";
+			command.CallOnBeforeRunTests();
+			
+			string expectedDisplayCategoryName = "Code Coverage";
+			Assert.AreEqual(expectedDisplayCategoryName, command.CodeCoverageMessageViewCategory.DisplayCategory);
+		}
+		
+		[Test]
+		public void OnBeforeRunTestsWhenNoCodeCoverageMessageViewCreatedPassedStringResourceToStringParser()
+		{
+			command.CodeCoverageMessageViewCategory = null;
+			command.ParsedString = null;
+			command.CallOnBeforeRunTests();
+			
+			string expectedStringResourceName = "${res:ICSharpCode.UnitTesting.CodeCoverage}";
+			Assert.AreEqual(expectedStringResourceName, command.ParsedString);
+		}
+		
+		[Test]
+		public void OnBeforeRunTestsWhenCodeCoverageMessageViewCreatedPreviouslyDoesNotCreateAnotherMessageView()
+		{
+			MessageViewCategory view = new MessageViewCategory("Test");
+			command.CodeCoverageMessageViewCategory = view;
+			command.CallOnBeforeRunTests();
+			Assert.AreEqual(view, command.CodeCoverageMessageViewCategory);
+		}
+		
+		[Test]
+		public void OnBeforeRunTestsClearsCodeCoverageMessageViewTextWithSafeAsyncCall()
+		{
+			MessageViewCategory view = new MessageViewCategory("Test");
+			view.AppendText("abc");
+			command.CodeCoverageMessageViewCategory = view;
+			command.CallOnBeforeRunTests();
+			
+			Assert.AreEqual(String.Empty, view.Text);
+		}
+		
+		[Test]
+		public void OnBeforeRunTestsClearsCodeCoverageResults()
+		{
+			command.CallOnBeforeRunTests();
+			
+			Action expectedAction = CodeCoverageService.ClearResults;
+			Assert.AreEqual(expectedAction, context.MockUnitTestWorkbench.SafeThreadAsyncMethodCalls[0]);
+		}
+		
+		[Test]
+		public void OnAfterRunTestsWhenNoCriticalTestErrorsCodeCoveragePadIsShown()
+		{
+			context.MockTaskService.HasCriticalErrorsReturnValue = false;
+			PadDescriptor padDescriptor = AddCodeCoveragePadToMockWorkbench();
+			command.CallOnAfterRunTests();
+			
+			Action expectedAction = padDescriptor.BringPadToFront;
+			Assert.AreEqual(expectedAction, context.MockUnitTestWorkbench.SafeThreadAsyncMethodCalls[0]);
+		}
+		
+		PadDescriptor AddCodeCoveragePadToMockWorkbench()
+		{
+			PadDescriptor padDescriptor = new PadDescriptor(typeof(CodeCoveragePad), "Code Coverage", String.Empty);
+			context.MockUnitTestWorkbench.AddPadDescriptor(padDescriptor);
+			return padDescriptor;
+		}
+		
+		[Test]
+		public void OnAfterRunTestsWhenCriticalErrorsCodeCoveragePadIsNotShown()
+		{
+			context.MockTaskService.HasCriticalErrorsReturnValue = true;
+			PadDescriptor padDescriptor = AddCodeCoveragePadToMockWorkbench();
+			command.CallOnAfterRunTests();
+			
+			Assert.AreEqual(0, context.MockUnitTestWorkbench.SafeThreadAsyncMethodCalls.Count);			
+		}
+		
+		[Test]
+		public void OnAfterRunTestsDoesNotTreatWarningsAsErrors()
+		{
+			context.MockTaskService.TreatWarningsAsErrorsParameterPassedToHasCriticalErrors = true;
+			AddCodeCoveragePadToMockWorkbench();
+			command.CallOnAfterRunTests();
+			
+			Assert.IsFalse(context.MockTaskService.TreatWarningsAsErrorsParameterPassedToHasCriticalErrors);			
+		}
+		
+		[Test]
+		public void MessageReceivedFromTestRunnerIsAddedToCodeCoverageMessageViewNotUnitTestsMessageView()
+		{
+			command.CodeCoverageMessageViewCategory = null;
+			MessageReceivedEventArgs e = new MessageReceivedEventArgs("test");
+			command.CallTestRunnerMessageReceived(this, e);
+			string expectedText = "test\r\n";
+			Assert.AreEqual(expectedText, command.CodeCoverageMessageViewCategory.Text);
+		}
+		
+		[Test]
+		public void CreateTestRunnerCreatesNewCodeCoverageTestRunner()
+		{
+			CodeCoverageTestRunner expectedTestRunner = mockCodeCoverageTestRunnerFactory.TestRunner;
+			Assert.AreEqual(expectedTestRunner, command.CallCreateTestRunner(null));
+		}
+		
+		[Test]
+		public void CodeCoverageProcessExitsAndCodeCoverageFileExistsCausesCodeCoverageResultsToBeDisplayed()
+		{
+			ActionArguments<CodeCoverageResults> actionArgs = 
+				CreateTestRunnerAndFireCodeCoverageProcessExitEvent();
+			
+			Action<CodeCoverageResults> expectedAction = CodeCoverageService.ShowResults;
+			Assert.AreEqual(expectedAction, actionArgs.Action);
+		}
+		
+		ActionArguments<CodeCoverageResults> CreateTestRunnerAndFireCodeCoverageProcessExitEvent()
+		{
+			command.CallCreateTestRunner(null);
+			MockCSharpProject project = new MockCSharpProject();
+			SelectedTests tests = new SelectedTests(project);
+			mockCodeCoverageTestRunnerFactory.TestRunner.Start(tests);
+			
+			mockCodeCoverageTestRunnerFactory.FileSystem.FileExistsReturnValue = true;
+			mockCodeCoverageTestRunnerFactory.FileSystem.CreateTextReaderReturnValue = CreateCodeCoverageResultsTextReader();
+			
+			mockCodeCoverageTestRunnerFactory.ProcessRunner.FireProcessExitedEvent();
+			
+			object actionArgsAsObject = context.MockUnitTestWorkbench.SafeThreadAsyncMethodCallsWithArguments[0];
+			return (ActionArguments<CodeCoverageResults>)actionArgsAsObject;
+		}
+		
+		[Test]
+		public void CodeCoverageResultsFromXmlHasModuleCalledMyTests()
+		{
+			CodeCoverageResults results = CreateCodeCoverageResults();
+			string expectedName = "MyTests";
+			Assert.AreEqual(expectedName, results.Modules[0].Name);
+		}
+		
+		CodeCoverageResults CreateCodeCoverageResults()
+		{
+			TextReader reader = CreateCodeCoverageResultsTextReader();
+			return new CodeCoverageResults(reader);
+		}
+		
+		TextReader CreateCodeCoverageResultsTextReader()
+		{
+			string xml =
+				"<PartCoverReport>\r\n" +
+				"    <File id='1' url='c:\\Projects\\MyTests\\MyTestFixture.cs'/>\r\n" +
+				"    <Assembly id='1' name='MyTests' module='C:\\Projects\\MyTests\\bin\\MyTests.DLL' domain='test-domain.Tests.dll' domainIdx='1' />\r\n" +
+				"    <Type name='MyTests.Tests.MyTestFixture' asmref='1'>\r\n" +
+				"        <Method name='SimpleTest1'>\r\n" +
+				"            <pt visit='12' sl='20' sc='3' el='20' ec='4' fid='1' />\r\n" +
+				"        </Method>\r\n" +
+				"    </Type>\r\n" +				
+				"</PartCoverReport>";
+			
+			return new StringReader(xml);
+		}
+		
+		[Test]
+		public void CodeCoverageProcessExitsAndCodeCoverageFileExistsCausesCodeCoverageResultsToBeReadFromFile()
+		{
+			ActionArguments<CodeCoverageResults> actionArgs = 
+				CreateTestRunnerAndFireCodeCoverageProcessExitEvent();
+			
+			CodeCoverageResults result = actionArgs.Arg;
+			Assert.AreEqual("MyTests", result.Modules[0].Name);
+		}
+		
+		[Test]
+		public void CodeCoverageProcessExitsAndCodeCoverageFileDoesNotExistsAddsTaskToTaskList()
+		{
+			ActionArguments<Task> args = CreateTestRunnerAndFirePartCoverProcessExitEventWhenNoCoverageFileProduced();
+			Action<Task> expectedAction = context.MockTaskService.Add;
+			Assert.AreEqual(expectedAction, args.Action);
+		}
+		
+		ActionArguments<Task> CreateTestRunnerAndFirePartCoverProcessExitEventWhenNoCoverageFileProduced()
+		{
+			mockCodeCoverageTestRunnerFactory.FileSystem.FileExistsReturnValue = false;
+			
+			command.CallCreateTestRunner(null);
+			
+			MockCSharpProject project = new MockCSharpProject();
+			SelectedTests tests = new SelectedTests(project);
+			
+			mockCodeCoverageTestRunnerFactory.TestRunner.Start(tests);
+			mockCodeCoverageTestRunnerFactory.ProcessRunner.FireProcessExitedEvent();
+			
+			object actionArgsAsObject = context.MockUnitTestWorkbench.SafeThreadAsyncMethodCallsWithArguments[0];
+			return (ActionArguments<Task>)actionArgsAsObject;
+		}
+		
+		[Test]
+		public void CodeCoverageProcessExitsAndCodeCoverageFileDoesNotExistsAddsErrorTaskToTaskList()
+		{
+			command.ParsedStringToReturn = "No code coverage results file generated.";
+			ActionArguments<Task> args = CreateTestRunnerAndFirePartCoverProcessExitEventWhenNoCoverageFileProduced();
+			Task task = args.Arg;
+			
+			string description = @"No code coverage results file generated. c:\projects\MyTests\PartCover\coverage.xml";
+			int column = 1;
+			int line = 1;
+			Task expectedTask = new Task(null, description, column, line, TaskType.Error);
+			
+			TaskComparison comparison = new TaskComparison(expectedTask, task);
+			
+			Assert.IsTrue(comparison.IsMatch, comparison.MismatchReason);
+		}
+	}
+}

src/AddIns/Analysis/CodeCoverage/Test/Utils/DerivedCodeCoverageTestRunner.cs

@@ -0,0 +1,44 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
+//     <version>$Revision$</version>
+// </file>
+
+using System;
+using System.Diagnostics;
+using ICSharpCode.CodeCoverage;
+using ICSharpCode.UnitTesting;
+
+namespace ICSharpCode.CodeCoverage.Tests.Utils
+{
+	public class DerivedCodeCoverageTestRunner : CodeCoverageTestRunner
+	{
+		public string ParseStringReturnValue;
+		public string ParseStringParameter;
+		
+		public DerivedCodeCoverageTestRunner(IUnitTestProcessRunner processRunner,
+			ITestResultsMonitor testResultsMonitor,
+			UnitTestingOptions options,
+			IFileSystem fileSystem)
+			: base(processRunner, testResultsMonitor, options, fileSystem)
+		{
+		}
+		
+		public ProcessStartInfo CallGetProcessStartInfo(SelectedTests selectedTests)
+		{
+			return base.GetProcessStartInfo(selectedTests);
+		}
+		
+		public TestResult CallCreateTestResultForTestFramework(TestResult testResult)
+		{
+			return base.CreateTestResultForTestFramework(testResult);
+		}
+		
+		protected override string ParseString(string text)
+		{
+			ParseStringParameter = text;
+			return ParseStringReturnValue;
+		}
+	}
+}

src/AddIns/Analysis/CodeCoverage/Test/Utils/DerivedRunTestWithCodeCoverageCommand.cs

@@ -0,0 +1,63 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
+//     <version>$Revision$</version>
+// </file>
+
+using System;
+using ICSharpCode.CodeCoverage;
+using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.Project;
+using ICSharpCode.UnitTesting;
+
+namespace ICSharpCode.CodeCoverage.Tests.Utils
+{
+	public class DerivedRunTestWithCodeCoverageCommand : RunTestWithCodeCoverageCommand
+	{	
+		public string ParsedStringToReturn = String.Empty;
+		public string ParsedString;
+		
+		public DerivedRunTestWithCodeCoverageCommand(IRunTestCommandContext context, 
+			ICodeCoverageTestRunnerFactory factory)
+			: base(context, factory)
+		{
+		}
+		
+		public void CallOnBeforeRunTests()
+		{
+			base.OnBeforeRunTests();
+		}
+		
+		public void CallOnAfterRunTests()
+		{
+			base.OnAfterRunTests();
+		}
+		
+		protected override MessageViewCategory CreateMessageViewCategory(string category, string displayCategory)
+		{
+			return new MessageViewCategory(category, displayCategory);
+		}
+		
+		public MessageViewCategory CodeCoverageMessageViewCategory {
+			get { return base.Category; }
+			set { base.Category = value;}
+		}
+		
+		protected override string StringParse(string text)
+		{
+			ParsedString = text;
+			return ParsedStringToReturn;
+		}
+		
+		public void CallTestRunnerMessageReceived(object source, MessageReceivedEventArgs e)
+		{
+			base.TestRunnerMessageReceived(source, e);
+		}
+		
+		public ITestRunner CallCreateTestRunner(IProject project)
+		{
+			return base.CreateTestRunner(project);
+		}
+	}
+}

src/AddIns/Analysis/CodeCoverage/Test/Utils/MockCodeCoverageTestRunnerFactory.cs

@@ -0,0 +1,38 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
+//     <version>$Revision$</version>
+// </file>
+
+using System;
+using ICSharpCode.CodeCoverage;
+using ICSharpCode.Core;
+using ICSharpCode.UnitTesting;
+using UnitTesting.Tests.Utils;
+
+namespace ICSharpCode.CodeCoverage.Tests.Utils
+{
+	public class MockCodeCoverageTestRunnerFactory : ICodeCoverageTestRunnerFactory
+	{
+		public MockProcessRunner ProcessRunner;
+		public MockTestResultsMonitor TestResultsMonitor;
+		public UnitTestingOptions Options;
+		public CodeCoverageTestRunner TestRunner;
+		public MockFileSystem FileSystem;
+		
+		public MockCodeCoverageTestRunnerFactory()
+		{
+			ProcessRunner = new MockProcessRunner();
+			TestResultsMonitor = new MockTestResultsMonitor();
+			Options = new UnitTestingOptions(new Properties());
+			FileSystem = new MockFileSystem();
+			TestRunner = new CodeCoverageTestRunner(ProcessRunner, TestResultsMonitor, Options, FileSystem);
+		}
+		
+		public CodeCoverageTestRunner CreateCodeCoverageTestRunner()
+		{
+			return TestRunner;
+		}
+	}
+}

src/AddIns/Analysis/CodeCoverage/Test/Utils/MockFileSystem.cs

@@ -0,0 +1,53 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
+//     <version>$Revision$</version>
+// </file>
+
+using System;
+using System.IO;
+using ICSharpCode.CodeCoverage;
+
+namespace ICSharpCode.CodeCoverage.Tests.Utils
+{
+	public class MockFileSystem : IFileSystem
+	{
+		public bool FileExistsReturnValue;
+		public string FileExistsPathParameter;
+		public string DeleteFilePathParameter;
+		public bool DirectoryExistsReturnValue;
+		public string DirectoryExistsPathParameter;
+		public string CreateDirectoryPathParameter;		
+		public TextReader CreateTextReaderReturnValue;
+		public string CreateTextReaderPathParameter;
+		
+		public bool FileExists(string path)
+		{
+			FileExistsPathParameter = path;
+			return FileExistsReturnValue;
+		}
+		
+		public void DeleteFile(string path)
+		{
+			DeleteFilePathParameter = path;
+		}
+		
+		public bool DirectoryExists(string path)
+		{
+			DirectoryExistsPathParameter = path;
+			return DirectoryExistsReturnValue;
+		}
+		
+		public void CreateDirectory(string path)
+		{
+			CreateDirectoryPathParameter = path;
+		}
+		
+		public TextReader CreateTextReader(string path)
+		{
+			CreateTextReaderPathParameter = path;
+			return CreateTextReaderReturnValue;
+		}
+	}
+}

src/AddIns/Analysis/UnitTesting/Src/AbstractRunTestCommand.cs

@@ -24,6 +24,8 @@ namespace ICSharpCode.UnitTesting
 		SelectedTests selectedTests;
 		IRunTestCommandContext context;
 		ITestRunner testRunner;
+		IProgressMonitor testProgressMonitor;
+		int totalProjectCount;
 		
 		public AbstractRunTestCommand()
 			: this(new RunTestCommandContext())
@@ -126,6 +128,14 @@ namespace ICSharpCode.UnitTesting
 			unitTestsPad.BringToFront();
 		}
 		
+		void StopProgressMonitor()
+		{
+			if (testProgressMonitor != null) {
+				testProgressMonitor.Dispose();
+				testProgressMonitor = null;
+			}
+		}
+		
 		void UpdateUnitTestsPadToolbar()
 		{
 			unitTestsPad.UpdateToolbar();
@@ -195,10 +205,6 @@ namespace ICSharpCode.UnitTesting
 		{
 		}
 		
-		protected virtual void RunTests(NUnitConsoleApplication helper)
-		{
-		}
-		
 		/// <summary>
 		/// Called by derived classes when a single test run
 		/// is finished.
@@ -210,10 +216,7 @@ namespace ICSharpCode.UnitTesting
 			if (selectedTests.HasProjects) {
 				RunTests(selectedTests);
 			} else {
-				if (testProgressMonitor != null) {
+				StopProgressMonitor();
-					testProgressMonitor.Dispose();
-					testProgressMonitor = null;
-				}
 				runningTestCommand = null;
 				UpdateUnitTestsPadToolbar();
 				ShowErrorList();
@@ -230,12 +233,7 @@ namespace ICSharpCode.UnitTesting
 		{
 			if (IsTestResultFailureOrIsIgnored(result)) {
 				AddTaskForTestResult(result);
-				if (testProgressMonitor != null) {
+				UpdateProgressMonitorStatus(result);
-					if (result.IsFailure)
-						testProgressMonitor.Status = OperationStatus.Error;
-					else if (result.IsIgnored && testProgressMonitor.Status == OperationStatus.Normal)
-						testProgressMonitor.Status = OperationStatus.Warning;
-				}
 			}
 			UpdateTestResult(result);
 		}
@@ -302,34 +300,47 @@ namespace ICSharpCode.UnitTesting
 			return (results.ErrorCount == 0) && IsRunningTest;
 		}
 		
-		IProgressMonitor testProgressMonitor;
-		int totalProjectCount;
-		
 		void RunTests(SelectedTests selectedTests)
 		{
 			if (testProgressMonitor == null) {
 				testProgressMonitor = context.StatusBarService.CreateProgressMonitor();
 				totalProjectCount = selectedTests.Projects.Count;
-				OnBeforeRunTests();
 			}
-			testProgressMonitor.TaskName = StringParser.Parse("${res:ICSharpCode.UnitTesting.StatusBarProgressLabel}", new StringTagPair("Name", selectedTests.Project.Name));
+			testProgressMonitor.TaskName = GetProgressMonitorLabel(selectedTests.Project);
-			testProgressMonitor.Progress = (double)(totalProjectCount-selectedTests.Projects.Count)/totalProjectCount;
+			testProgressMonitor.Progress = GetProgress(selectedTests.Projects);
 			
+			OnBeforeRunTests();
 			testRunner = CreateTestRunner(selectedTests.Project);
 			if (testRunner != null) {
-				testRunner.MessageReceived += TestRunnerMessageReceived;
+				StartTestRunner();
-				testRunner.AllTestsFinished += AllTestsFinished;
-				testRunner.TestFinished += TestFinished;
-				testRunner.Start(selectedTests);
 			}
 		}
 		
+		void StartTestRunner()
+		{
+			testRunner.MessageReceived += TestRunnerMessageReceived;
+			testRunner.AllTestsFinished += AllTestsFinished;
+			testRunner.TestFinished += TestFinished;
+			testRunner.Start(selectedTests);
+		}
+		
+		string GetProgressMonitorLabel(IProject project)
+		{
+			StringTagPair tagPair = new StringTagPair("Name", project.Name);
+			return StringParser.Parse("${res:ICSharpCode.UnitTesting.StatusBarProgressLabel}", tagPair);
+		}
+		
+		double GetProgress(IList<IProject> projectsLeftToRun)
+		{
+			return (double)(totalProjectCount - projectsLeftToRun.Count) / totalProjectCount;
+		}
+		
 		protected virtual ITestRunner CreateTestRunner(IProject project)
 		{
 			return null;
 		}
 		
-		void TestRunnerMessageReceived(object source, MessageReceivedEventArgs e)
+		protected virtual void TestRunnerMessageReceived(object source, MessageReceivedEventArgs e)
 		{
 			context.UnitTestCategory.AppendLine(e.Message);
 		}
@@ -360,5 +371,16 @@ namespace ICSharpCode.UnitTesting
 				testProject.UpdateTestResult(result);
 			}
 		}
+		
+		void UpdateProgressMonitorStatus(TestResult result)
+		{
+			if (testProgressMonitor != null) {
+				if (result.IsFailure) {
+					testProgressMonitor.Status = OperationStatus.Error;
+				} else if (result.IsIgnored && testProgressMonitor.Status == OperationStatus.Normal) {
+					testProgressMonitor.Status = OperationStatus.Warning;
+				}
+			}
+		}
 	}
 }

src/AddIns/Analysis/UnitTesting/Src/IUnitTestProcessRunner.cs

@@ -6,6 +6,7 @@
 // </file>
 
 using System;
+using System.Collections.Generic;
 using ICSharpCode.SharpDevelop.Util;
 
 namespace ICSharpCode.UnitTesting
@@ -15,6 +16,8 @@ namespace ICSharpCode.UnitTesting
 		bool LogStandardOutputAndError { get; set; }
 		string WorkingDirectory { get; set; }
 		
+		Dictionary<string, string> EnvironmentVariables { get; }
+		
 		void Start(string command, string arguments);
 		void Kill();
 		

src/AddIns/Analysis/UnitTesting/Src/IUnitTestTaskService.cs

@@ -19,5 +19,6 @@ namespace ICSharpCode.UnitTesting
 		void ClearExceptCommentTasks();
 		void Add(Task task);
 		bool SomethingWentWrong { get; }
+		bool HasCriticalErrors(bool treatWarningsAsErrors);
 	}
 }

src/AddIns/Analysis/UnitTesting/Src/TestProcessRunnerBase.cs

@@ -39,10 +39,9 @@ namespace ICSharpCode.UnitTesting
 			get { return testResultsMonitor; }
 		}
 		
-//		public override event EventHandler AllTestsFinished {
+		protected IUnitTestProcessRunner ProcessRunner {
-//			add { processRunner.ProcessExited += value; }
+			get { return processRunner; }
-//			remove { processRunner.ProcessExited -= value; }
+		}
-//		}
 		
 		void OutputLineReceived(object source, LineReceivedEventArgs e)
 		{

src/AddIns/Analysis/UnitTesting/Src/UnitTestProcessRunner.cs

@@ -6,6 +6,7 @@
 // </file>
 
 using System;
+using System.Collections.Generic;
 using ICSharpCode.SharpDevelop.Util;
 
 namespace ICSharpCode.UnitTesting
@@ -44,6 +45,10 @@ namespace ICSharpCode.UnitTesting
 			set { runner.WorkingDirectory = value; }
 		}
 		
+		public Dictionary<string, string> EnvironmentVariables {
+			get { return runner.EnvironmentVariables; }
+		}
+		
 		public void Start(string command, string arguments)
 		{
 			runner.Start(command, arguments);

src/AddIns/Analysis/UnitTesting/Src/UnitTestTaskService.cs

@@ -35,5 +35,10 @@ namespace ICSharpCode.UnitTesting
 		public bool SomethingWentWrong {
 			get { return TaskService.SomethingWentWrong; }
 		}
+		
+		public bool HasCriticalErrors(bool treatWarningsAsErrors)
+		{
+			return TaskService.HasCriticalErrors(treatWarningsAsErrors);
+		}
 	}
 }

src/AddIns/Analysis/UnitTesting/Test/Tree/BuildErrorWhenRunningTestsTestFixture.cs

@@ -43,9 +43,9 @@ namespace UnitTesting.Tests.Tree
 		}
 		
 		[Test]
-		public void RunTestMethodIsNotCalled()
+		public void NoTestRunnersCreated()
 		{
-			Assert.AreEqual(0, runTestCommand.Helpers.Count);
+			Assert.AreEqual(0, runTestCommand.TestRunnersCreated.Count);
 		}
 		
 		[Test]

src/AddIns/Analysis/UnitTesting/Test/Tree/RunTestCommandBeforeRunTestFixture.cs

@@ -139,7 +139,7 @@ namespace UnitTesting.Tests.Tree
 		public void IsRunningTestPropertyReturnsTrueWhenOnBeforeRunIsCalled()
 		{
 			runTestCommand.Run();
-			Assert.IsTrue(runTestCommand.IsRunningTestPropertyWhenOnBeforeBuildCalled);
+			Assert.IsTrue(runTestCommand.IsRunningTestWhenOnBeforeBuildCalled);
 		}
 		
 		[Test]

src/AddIns/Analysis/UnitTesting/Test/Tree/StopRunningTestsTestFixture.cs

@@ -77,7 +77,7 @@ namespace UnitTesting.Tests.Tree
 		public void BuildCompleteEventFiringDoesNotCauseTestsToRunAfterStopMethodCalled()
 		{
 			buildProjectBeforeTestRun.FireBuildCompleteEvent();
-			Assert.AreEqual(0, runTestCommand.Helpers.Count);
+			Assert.AreEqual(0, runTestCommand.TestRunnersCreated.Count);
 		}
 		
 		[Test]

src/AddIns/Analysis/UnitTesting/Test/Utils/DerivedRunTestCommand.cs

@@ -15,23 +15,18 @@ namespace UnitTesting.Tests.Utils
 {
 	public class DerivedRunTestCommand : AbstractRunTestCommand
 	{
-		bool onBeforeBuildMethodCalled;
+		public bool IsOnBeforeBuildMethodCalled;
-		bool onAfterRunTestsMethodCalled;
+		public bool IsOnAfterRunTestsMethodCalled;
-		AbstractRunTestCommand runningTestCommandWhenOnBeforeBuildCalled;
+		public AbstractRunTestCommand RunningTestCommandPropertyWhenOnBeforeBuildCalled;
-		bool runningTestWhenOnBeforeBuildCalled;
+		public bool IsRunningTestWhenOnBeforeBuildCalled;
-		bool onStopMethodCalled;
+		public bool IsOnStopMethodCalled;
-		List<NUnitConsoleApplication> helpers = new List<NUnitConsoleApplication>();
+		public List<MockTestRunner> TestRunnersCreated = new List<MockTestRunner>();
-		List<MockTestRunner> testRunnersCreated = new List<MockTestRunner>();
 		
 		public DerivedRunTestCommand(IRunTestCommandContext context)
 			: base(context)
 		{
 		}
 
-		public bool IsOnBeforeBuildMethodCalled {
-			get { return onBeforeBuildMethodCalled; }
-		}
-
 		public void CallOnBeforeBuildMethod()
 		{
 			OnBeforeBuild();
@@ -39,46 +34,21 @@ namespace UnitTesting.Tests.Utils
 		
 		protected override void OnBeforeBuild()
 		{
-			onBeforeBuildMethodCalled = true;
+			IsOnBeforeBuildMethodCalled = true;
-			runningTestCommandWhenOnBeforeBuildCalled = AbstractRunTestCommand.RunningTestCommand;
+			RunningTestCommandPropertyWhenOnBeforeBuildCalled = AbstractRunTestCommand.RunningTestCommand;
-			runningTestWhenOnBeforeBuildCalled = AbstractRunTestCommand.IsRunningTest;
+			IsRunningTestWhenOnBeforeBuildCalled = AbstractRunTestCommand.IsRunningTest;
 		}
 		
 		protected override ITestRunner CreateTestRunner(IProject project)
 		{
 			MockTestRunner testRunner = new MockTestRunner();
-			testRunnersCreated.Add(testRunner);
+			TestRunnersCreated.Add(testRunner);
 			return testRunner;
 		}
 		
-		public List<MockTestRunner> TestRunnersCreated {
-			get { return testRunnersCreated; }
-		}
-		
-		protected override void RunTests(NUnitConsoleApplication helper)
-		{
-			helpers.Add(helper);
-		}
-		
-		public List<NUnitConsoleApplication> Helpers {
-			get { return helpers; }
-		}
-		
-		public AbstractRunTestCommand RunningTestCommandPropertyWhenOnBeforeBuildCalled {
-			get { return runningTestCommandWhenOnBeforeBuildCalled; }
-		}
-		
-		public bool IsRunningTestPropertyWhenOnBeforeBuildCalled {
-			get { return runningTestWhenOnBeforeBuildCalled; }
-		}
-		
-		public bool IsOnStopMethodCalled {
-			get { return onStopMethodCalled; }
-		}
-		
 		protected override void OnStop()
 		{
-			onStopMethodCalled = true;
+			IsOnStopMethodCalled = true;
 		}
 		
 		public Action<TestResult> ShowResultAction {
@@ -90,10 +60,6 @@ namespace UnitTesting.Tests.Utils
 			base.TestRunCompleted();
 		}
 
-		public bool IsOnAfterRunTestsMethodCalled {
-			get { return onAfterRunTestsMethodCalled; }
-		}
-
 		public void CallOnAfterRunTestsMethod()
 		{
 			OnAfterRunTests();
@@ -101,7 +67,7 @@ namespace UnitTesting.Tests.Utils
 		
 		protected override void OnAfterRunTests()
 		{
-			onAfterRunTestsMethodCalled = true;
+			IsOnAfterRunTestsMethodCalled = true;
 		}
 		
 		public ITestRunner CallCreateTestRunner(IProject project)

src/AddIns/Analysis/UnitTesting/Test/Utils/MockProcessRunner.cs

@@ -6,6 +6,7 @@
 // </file>
 
 using System;
+using System.Collections.Generic;
 using ICSharpCode.SharpDevelop.Util;
 using ICSharpCode.UnitTesting;
 
@@ -18,6 +19,8 @@ namespace UnitTesting.Tests.Utils
 		string commandPassedToStartMethod;
 		string commandArgumentsPassedToStartMethod;
 		bool killMethodCalled;
+		Dictionary<string, string> environmentVariables = 
+			new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 		
 		public event EventHandler ProcessExited;
 		public event LineReceivedEventHandler OutputLineReceived;
@@ -33,6 +36,10 @@ namespace UnitTesting.Tests.Utils
 			set { workingDirectory = value; }
 		}
 		
+		public Dictionary<string, string> EnvironmentVariables {
+			get { return environmentVariables; }
+		}
+		
 		public void Start(string command, string arguments)
 		{
 			commandPassedToStartMethod = command;

src/AddIns/Analysis/UnitTesting/Test/Utils/MockTaskService.cs

@@ -15,25 +15,19 @@ namespace UnitTesting.Tests.Utils
 {
 	public class MockTaskService : IUnitTestTaskService
 	{
-		MessageViewCategory buildMessageViewCategory = new MessageViewCategory("Build");
+		public bool IsClearExceptCommentTasksMethodCalled;
-		bool clearExceptCommentTasksMethodCalled;
+		public bool IsInUpdateWhilstClearExceptCommentTasksMethodCalled;
-		bool isInUpdateWhilstClearExceptCommentTasksMethodCalled;
+		public List<Task> Tasks = new List<Task>();
-		bool inUpdate;
+		public bool HasCriticalErrorsReturnValue;
-		bool somethingWentWrong;
+		public bool TreatWarningsAsErrorsParameterPassedToHasCriticalErrors;
-		List<Task> tasks = new List<Task>();
 		
-		public bool IsClearExceptCommentTasksMethodCalled {
+		bool somethingWentWrong;
-			get { return clearExceptCommentTasksMethodCalled; }
+		bool inUpdate;
-		}
+		MessageViewCategory buildMessageViewCategory = new MessageViewCategory("Build");
-		
-		public void ClearExceptCommentTasks()
-		{
-			clearExceptCommentTasksMethodCalled = true;
-			isInUpdateWhilstClearExceptCommentTasksMethodCalled = inUpdate;
-		}
 		
-		public bool IsInUpdateWhilstClearExceptCommentTasksMethodCalled {
+		public bool SomethingWentWrong {
-			get { return isInUpdateWhilstClearExceptCommentTasksMethodCalled; }
+			get { return somethingWentWrong; }
+			set { somethingWentWrong = value; }
 		}
 		
 		public bool InUpdate {
@@ -45,20 +39,24 @@ namespace UnitTesting.Tests.Utils
 			get { return buildMessageViewCategory; }
 		}
 		
-		public bool SomethingWentWrong {
+		public void ClearExceptCommentTasks()
-			get { return somethingWentWrong; }
+		{
-		}
+			IsClearExceptCommentTasksMethodCalled = true;
-		
+			IsInUpdateWhilstClearExceptCommentTasksMethodCalled = inUpdate;
-		public List<Task> Tasks {
-			get { return tasks; }
 		}
 		
 		public void Add(Task task)
 		{
 			if ((task.TaskType == TaskType.Error) || (task.TaskType == TaskType.Warning))  {
-				somethingWentWrong = true; 
+				SomethingWentWrong = true; 
 			}
-			tasks.Add(task);
+			Tasks.Add(task);
+		}
+						
+		public bool HasCriticalErrors(bool treatWarningsAsErrors)
+		{
+			TreatWarningsAsErrorsParameterPassedToHasCriticalErrors = treatWarningsAsErrors;
+			return HasCriticalErrorsReturnValue;
 		}
 	}
 }

src/AddIns/Analysis/UnitTesting/Test/Utils/MockUnitTestWorkbench.cs

@@ -22,31 +22,24 @@ namespace UnitTesting.Tests.Utils
 	
 	public class MockUnitTestWorkbench : IUnitTestWorkbench
 	{
-		List<PadDescriptor> padDescriptors = new List<PadDescriptor>();
+		public List<Action> SafeThreadAsyncMethodCalls = new List<Action>();
-		List<Action> safeThreadAsyncMethodCalls = new List<Action>();
+		public List<object> SafeThreadAsyncMethodCallsWithArguments = 
-		List<object> safeThreadAsyncMethodCallsWithArguments = 
 			new List<object>();
-		bool makeSafeThreadAsyncMethodCallsWithArguments;
+		public bool MakeSafeThreadAsyncMethodCallsWithArguments;
-		bool makeNonGenericSafeThreadAsyncMethodCalls;
+		public bool MakeNonGenericSafeThreadAsyncMethodCalls;
-		List<Type> typesPassedToGetPadMethod = new List<Type>();
+		public List<Type> TypesPassedToGetPadMethod = new List<Type>();
-		PadDescriptor compilerMessageViewPadDescriptor;
+		public PadDescriptor CompilerMessageViewPadDescriptor;
-		PadDescriptor errorListPadDescriptor;
+		public PadDescriptor ErrorListPadDescriptor;
+		
+		List<PadDescriptor> padDescriptors = new List<PadDescriptor>();
 		
 		public MockUnitTestWorkbench()
 		{
-			compilerMessageViewPadDescriptor = new PadDescriptor(typeof(CompilerMessageView), "Output", String.Empty);
+			CompilerMessageViewPadDescriptor = new PadDescriptor(typeof(CompilerMessageView), "Output", String.Empty);
-			AddPadDescriptor(compilerMessageViewPadDescriptor);
+			AddPadDescriptor(CompilerMessageViewPadDescriptor);
-			
-			errorListPadDescriptor = new PadDescriptor(typeof(ErrorListPad), "Errors", String.Empty);
-			AddPadDescriptor(errorListPadDescriptor);
-		}
 			
-		public PadDescriptor CompilerMessageViewPadDescriptor {
+			ErrorListPadDescriptor = new PadDescriptor(typeof(ErrorListPad), "Errors", String.Empty);
-			get { return compilerMessageViewPadDescriptor; }
+			AddPadDescriptor(ErrorListPadDescriptor);
-		}
-		
-		public PadDescriptor ErrorListPadDescriptor {
-			get { return errorListPadDescriptor; }
 		}
 
 		public void AddPadDescriptor(PadDescriptor padDescriptor)
@@ -56,7 +49,7 @@ namespace UnitTesting.Tests.Utils
 		
 		public PadDescriptor GetPad(Type type)
 		{
-			typesPassedToGetPadMethod.Add(type);
+			TypesPassedToGetPadMethod.Add(type);
 			
 			foreach (PadDescriptor padDescriptor in padDescriptors) {
 				if (padDescriptor.Class == type.FullName) {
@@ -66,48 +59,26 @@ namespace UnitTesting.Tests.Utils
 			return null;
 		}
 		
-		public List<Type> TypesPassedToGetPadMethod {
-			get { return typesPassedToGetPadMethod; }
-		}
-		
-		public List<Action> SafeThreadAsyncMethodCalls {
-			get { return safeThreadAsyncMethodCalls; }
-		}
-		
-		public bool MakeNonGenericSafeThreadAsyncMethodCalls {
-			get { return makeNonGenericSafeThreadAsyncMethodCalls; }
-			set { makeNonGenericSafeThreadAsyncMethodCalls = value; }
-		}
-		
 		public void SafeThreadAsyncCall(Action method)
 		{
-			safeThreadAsyncMethodCalls.Add(method);
+			SafeThreadAsyncMethodCalls.Add(method);
 			
-			if (makeNonGenericSafeThreadAsyncMethodCalls) {
+			if (MakeNonGenericSafeThreadAsyncMethodCalls) {
 				method();
 			}
 		}
 		
-		public bool MakeSafeThreadAsyncMethodCallsWithArguments {
-			get { return makeSafeThreadAsyncMethodCallsWithArguments; }
-			set { makeSafeThreadAsyncMethodCallsWithArguments = value; }
-		}
-		
 		public void SafeThreadAsyncCall<T>(Action<T> method, T arg)
 		{
 			ActionArguments<T> actionArgs = new ActionArguments<T>();
 			actionArgs.Action = method;
 			actionArgs.Arg = arg;
 			
-			safeThreadAsyncMethodCallsWithArguments.Add(actionArgs);
+			SafeThreadAsyncMethodCallsWithArguments.Add(actionArgs);
 			
-			if (makeSafeThreadAsyncMethodCallsWithArguments) {
+			if (MakeSafeThreadAsyncMethodCallsWithArguments) {
 				method(arg);
 			}
 		}
-		
-		public List<object> SafeThreadAsyncMethodCallsWithArguments {
-			get { return safeThreadAsyncMethodCallsWithArguments; }
-		}
 	}
 }

src/AddIns/Analysis/UnitTesting/Test/Utils/Tests/DerivedRunTestCommandTestFixture.cs

@@ -49,7 +49,7 @@ namespace UnitTesting.Tests.Utils.Tests
 		{
 			AbstractRunTestCommand.RunningTestCommand = null;
 			runTestCommand.CallOnBeforeBuildMethod();
-			Assert.IsFalse(runTestCommand.IsRunningTestPropertyWhenOnBeforeBuildCalled);
+			Assert.IsFalse(runTestCommand.IsRunningTestWhenOnBeforeBuildCalled);
 		}
 		
 		[Test]
@@ -57,7 +57,7 @@ namespace UnitTesting.Tests.Utils.Tests
 		{
 			AbstractRunTestCommand.RunningTestCommand = runTestCommand;
 			runTestCommand.CallOnBeforeBuildMethod();
-			Assert.IsTrue(runTestCommand.IsRunningTestPropertyWhenOnBeforeBuildCalled);
+			Assert.IsTrue(runTestCommand.IsRunningTestWhenOnBeforeBuildCalled);
 		}
 		
 		[Test]

src/AddIns/Analysis/UnitTesting/Test/Utils/Tests/MockTaskServiceTestFixture.cs

@@ -98,5 +98,33 @@ namespace UnitTesting.Tests.Utils.Tests
 			
 			Assert.AreEqual(tasks, taskService.Tasks.ToArray());
 		}
+		
+		[Test]
+		public void HasCriticalErrorsWhenReturnValueSetToTrueReturnsTrue()
+		{
+			taskService.HasCriticalErrorsReturnValue = true;
+			Assert.IsTrue(taskService.HasCriticalErrors(false));
+		}
+		
+		[Test]
+		public void HasCriticalErrorsWhenReturnValueSetToFalseReturnsFalse()
+		{
+			taskService.HasCriticalErrorsReturnValue = false;
+			Assert.IsFalse(taskService.HasCriticalErrors(false));
+		}
+		
+		[Test]
+		public void HasCriticalErrorsWhenTreatWarningsAsErrorsParameterSetToFalseRecordsParameterValue()
+		{
+			taskService.HasCriticalErrors(false);
+			Assert.IsFalse(taskService.TreatWarningsAsErrorsParameterPassedToHasCriticalErrors);
+		}
+		
+		[Test]
+		public void HasCriticalErrorsWhenTreatWarningsAsErrorsParameterSetToTrueRecordsParameterValue()
+		{
+			taskService.HasCriticalErrors(true);
+			Assert.IsTrue(taskService.TreatWarningsAsErrorsParameterPassedToHasCriticalErrors);
+		}
 	}
 }

src/AddIns/Analysis/UnitTesting/UnitTesting.csproj

@@ -117,7 +117,7 @@
     <Compile Include="Src\RunningTestsCondition.cs" />
     <Compile Include="Src\TestTreeView.cs" />
     <Compile Include="Src\NUnitConsoleCommandLine.cs" />
-    <Compile Include="Src\AbstractRunTestCommands.cs" />
+    <Compile Include="Src\AbstractRunTestCommand.cs" />
     <Compile Include="Configuration\AssemblyInfo.cs" />
     <Compile Include="..\..\..\Main\GlobalAssemblyInfo.cs">
       <Link>Configuration\GlobalAssemblyInfo.cs</Link>