Browse Source

Performed renaming.

pull/27/head
Lex Li 14 years ago
parent
commit
f64d62f97b
  1. 8
      src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageProjectOptionsPanel.cs
  2. 10
      src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageTestRunner.cs
  3. 17
      src/AddIns/Analysis/CodeCoverage/Project/Src/OpenCoverApplication.cs
  4. 10
      src/AddIns/Analysis/CodeCoverage/Project/Src/OpenCoverSettings.cs
  5. 16
      src/AddIns/Analysis/CodeCoverage/Project/Src/OpenCoverSettingsFactory.cs

8
src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageProjectOptionsPanel.cs

@ -52,17 +52,17 @@ namespace ICSharpCode.CodeCoverage
void SavePartCoverSettings() void SavePartCoverSettings()
{ {
PartCoverSettings settings = new PartCoverSettings(); OpenCoverSettings settings = new OpenCoverSettings();
settings.Include.AddRange(RemoveEmptyStrings(includeListTextBox.Lines)); settings.Include.AddRange(RemoveEmptyStrings(includeListTextBox.Lines));
settings.Exclude.AddRange(RemoveEmptyStrings(excludeListTextBox.Lines)); settings.Exclude.AddRange(RemoveEmptyStrings(excludeListTextBox.Lines));
settings.Save(PartCoverSettings.GetFileName(project)); settings.Save(OpenCoverSettings.GetFileName(project));
} }
void ReadPartCoverSettings() void ReadPartCoverSettings()
{ {
string settingsFileName = PartCoverSettings.GetFileName(project); string settingsFileName = OpenCoverSettings.GetFileName(project);
if (File.Exists(settingsFileName)) { if (File.Exists(settingsFileName)) {
PartCoverSettings settings = new PartCoverSettings(settingsFileName); OpenCoverSettings settings = new OpenCoverSettings(settingsFileName);
includeListTextBox.Text = ConvertToMultLineString(settings.Include); includeListTextBox.Text = ConvertToMultLineString(settings.Include);
excludeListTextBox.Text = ConvertToMultLineString(settings.Exclude); excludeListTextBox.Text = ConvertToMultLineString(settings.Exclude);
} }

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

@ -14,8 +14,8 @@ namespace ICSharpCode.CodeCoverage
{ {
UnitTestingOptions options; UnitTestingOptions options;
IFileSystem fileSystem; IFileSystem fileSystem;
PartCoverApplication partCoverApplication; OpenCoverApplication partCoverApplication;
PartCoverSettingsFactory settingsFactory; OpenCoverSettingsFactory settingsFactory;
public CodeCoverageTestRunner() public CodeCoverageTestRunner()
: this(new CodeCoverageTestRunnerContext()) : this(new CodeCoverageTestRunnerContext())
@ -27,7 +27,7 @@ namespace ICSharpCode.CodeCoverage
{ {
this.options = context.Options; this.options = context.Options;
this.fileSystem = context.CodeCoverageFileSystem; this.fileSystem = context.CodeCoverageFileSystem;
settingsFactory = new PartCoverSettingsFactory(fileSystem); settingsFactory = new OpenCoverSettingsFactory(fileSystem);
} }
public bool HasCodeCoverageResults() public bool HasCodeCoverageResults()
@ -66,8 +66,8 @@ namespace ICSharpCode.CodeCoverage
NUnitConsoleApplication nunitConsoleApp = new NUnitConsoleApplication(selectedTests, options); NUnitConsoleApplication nunitConsoleApp = new NUnitConsoleApplication(selectedTests, options);
nunitConsoleApp.Results = base.TestResultsMonitor.FileName; nunitConsoleApp.Results = base.TestResultsMonitor.FileName;
PartCoverSettings settings = settingsFactory.CreatePartCoverSettings(selectedTests.Project); OpenCoverSettings settings = settingsFactory.CreatePartCoverSettings(selectedTests.Project);
partCoverApplication = new PartCoverApplication(nunitConsoleApp, settings); partCoverApplication = new OpenCoverApplication(nunitConsoleApp, settings);
} }
void RemoveExistingCodeCoverageResultsFile() void RemoveExistingCodeCoverageResultsFile()

17
src/AddIns/Analysis/CodeCoverage/Project/Src/PartCoverApplication.cs → src/AddIns/Analysis/CodeCoverage/Project/Src/OpenCoverApplication.cs

@ -12,14 +12,14 @@ using ICSharpCode.UnitTesting;
namespace ICSharpCode.CodeCoverage namespace ICSharpCode.CodeCoverage
{ {
public class PartCoverApplication public class OpenCoverApplication
{ {
string fileName = String.Empty; string fileName = String.Empty;
NUnitConsoleApplication nunitConsoleApp; NUnitConsoleApplication nunitConsoleApp;
PartCoverSettings settings; OpenCoverSettings settings;
StringBuilder arguments; StringBuilder arguments;
public PartCoverApplication(string fileName, NUnitConsoleApplication nunitConsoleApp, PartCoverSettings settings) public OpenCoverApplication(string fileName, NUnitConsoleApplication nunitConsoleApp, OpenCoverSettings settings)
{ {
this.fileName = fileName; this.fileName = fileName;
this.nunitConsoleApp = nunitConsoleApp; this.nunitConsoleApp = nunitConsoleApp;
@ -30,7 +30,7 @@ namespace ICSharpCode.CodeCoverage
} }
} }
public PartCoverApplication(NUnitConsoleApplication nunitConsoleApp, PartCoverSettings settings) public OpenCoverApplication(NUnitConsoleApplication nunitConsoleApp, OpenCoverSettings settings)
: this(null, nunitConsoleApp, settings) : this(null, nunitConsoleApp, settings)
{ {
} }
@ -41,7 +41,7 @@ namespace ICSharpCode.CodeCoverage
fileName = Path.GetFullPath(fileName); fileName = Path.GetFullPath(fileName);
} }
public PartCoverSettings Settings { public OpenCoverSettings Settings {
get { return settings; } get { return settings; }
} }
@ -76,7 +76,7 @@ namespace ICSharpCode.CodeCoverage
string GetOutputDirectory(IProject project) string GetOutputDirectory(IProject project)
{ {
return Path.Combine(project.Directory, "PartCover"); return Path.Combine(project.Directory, "OpenCover");
} }
public ProcessStartInfo GetProcessStartInfo() public ProcessStartInfo GetProcessStartInfo()
@ -89,7 +89,8 @@ namespace ICSharpCode.CodeCoverage
string GetArguments() string GetArguments()
{ {
arguments = new StringBuilder(); // IMPORTANT: https://github.com/sawilde/opencover/wiki/Usage
arguments = new StringBuilder("-register:user ");
AppendTarget(); AppendTarget();
AppendTargetWorkingDirectory(); AppendTargetWorkingDirectory();
@ -101,7 +102,7 @@ namespace ICSharpCode.CodeCoverage
void AppendTarget() void AppendTarget()
{ {
arguments.AppendFormat("-register:user -target:\"{0}\" ", Target); arguments.AppendFormat("-target:\"{0}\" ", Target);
} }
void AppendTargetWorkingDirectory() void AppendTargetWorkingDirectory()

10
src/AddIns/Analysis/CodeCoverage/Project/Src/PartCoverSettings.cs → src/AddIns/Analysis/CodeCoverage/Project/Src/OpenCoverSettings.cs

@ -17,28 +17,28 @@ namespace ICSharpCode.CodeCoverage
/// as a place to store the include and exclude regular expressions that the /// as a place to store the include and exclude regular expressions that the
/// user may set up on a per project basis. /// user may set up on a per project basis.
/// </summary> /// </summary>
public class PartCoverSettings public class OpenCoverSettings
{ {
static readonly string RootElementName = "PartCoverSettings"; static readonly string RootElementName = "PartCoverSettings";
static readonly string RuleElementName = "Rule"; static readonly string RuleElementName = "Rule";
StringCollection include = new StringCollection(); StringCollection include = new StringCollection();
StringCollection exclude = new StringCollection(); StringCollection exclude = new StringCollection();
public PartCoverSettings() public OpenCoverSettings()
{ {
} }
public PartCoverSettings(string fileName) public OpenCoverSettings(string fileName)
: this(new StreamReader(fileName, true)) : this(new StreamReader(fileName, true))
{ {
} }
public PartCoverSettings(XmlReader reader) public OpenCoverSettings(XmlReader reader)
{ {
ReadSettings(reader); ReadSettings(reader);
} }
public PartCoverSettings(TextReader reader) public OpenCoverSettings(TextReader reader)
: this(new XmlTextReader(reader)) : this(new XmlTextReader(reader))
{ {
} }

16
src/AddIns/Analysis/CodeCoverage/Project/Src/PartCoverSettingsFactory.cs → src/AddIns/Analysis/CodeCoverage/Project/Src/OpenCoverSettingsFactory.cs

@ -7,33 +7,33 @@ using ICSharpCode.SharpDevelop.Project;
namespace ICSharpCode.CodeCoverage namespace ICSharpCode.CodeCoverage
{ {
public class PartCoverSettingsFactory public class OpenCoverSettingsFactory
{ {
IFileSystem fileSystem; IFileSystem fileSystem;
public PartCoverSettingsFactory(IFileSystem fileSystem) public OpenCoverSettingsFactory(IFileSystem fileSystem)
{ {
this.fileSystem = fileSystem; this.fileSystem = fileSystem;
} }
public PartCoverSettingsFactory() public OpenCoverSettingsFactory()
: this(new FileSystem()) : this(new FileSystem())
{ {
} }
public PartCoverSettings CreatePartCoverSettings(IProject project) public OpenCoverSettings CreatePartCoverSettings(IProject project)
{ {
string fileName = PartCoverSettings.GetFileName(project); string fileName = OpenCoverSettings.GetFileName(project);
if (fileSystem.FileExists(fileName)) { if (fileSystem.FileExists(fileName)) {
return CreatePartCoverSettingsFromFile(fileName); return CreatePartCoverSettingsFromFile(fileName);
} }
return new PartCoverSettings(); return new OpenCoverSettings();
} }
PartCoverSettings CreatePartCoverSettingsFromFile(string fileName) OpenCoverSettings CreatePartCoverSettingsFromFile(string fileName)
{ {
TextReader reader = fileSystem.CreateTextReader(fileName); TextReader reader = fileSystem.CreateTextReader(fileName);
return new PartCoverSettings(reader); return new OpenCoverSettings(reader);
} }
} }
} }
Loading…
Cancel
Save