From 2c72d347f9f62ee7e76d62547ce6c7835ac5c959 Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Mon, 31 Aug 2009 12:43:51 +0000 Subject: [PATCH] Code coverage results now read from new PartCover 2.3's new results file format. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@4846 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/Src/CodeCoverageResults.cs | 97 ++++++++----------- .../Test/AddCodeCoverageMarkersTestFixture.cs | 19 ++-- .../Test/CodeCoverage.Tests.csproj | 1 + ...ageMarkersCoverMultipleLinesTestFixture.cs | 19 ++-- ...CoverageMarkersCoverTwoLinesTestFixture.cs | 17 ++-- ...erageMarkersInvalidEndColumnTestFixture.cs | 21 ++-- ...overageMarkersInvalidEndLineTestFixture.cs | 15 ++- ...ageMarkersInvalidStartColumnTestFixture.cs | 19 ++-- ...erageMarkersInvalidStartLineTestFixture.cs | 19 ++-- ...CoverageResultsMissingFileIdTestFixture.cs | 38 ++++---- ...CoverageResultsPropertyFlagsTestFixture.cs | 65 ++++++------- .../Test/CodeCoverageResultsTestFixture.cs | 21 ++-- ...esultsWithEmptyMethodElementTestFixture.cs | 43 ++++++++ ...GetSequencePointsForFileNameTestFixture.cs | 56 +++++------ .../InvalidSequencePointDataTestFixture.cs | 25 ++--- .../ModuleVisitedSequencePointsTestFixture.cs | 38 ++++---- .../RemoveCodeCoverageMarkersTestFixture.cs | 13 ++- 17 files changed, 259 insertions(+), 267 deletions(-) create mode 100644 src/AddIns/Misc/CodeCoverage/Test/CodeCoverageResultsWithEmptyMethodElementTestFixture.cs diff --git a/src/AddIns/Misc/CodeCoverage/Project/Src/CodeCoverageResults.cs b/src/AddIns/Misc/CodeCoverage/Project/Src/CodeCoverageResults.cs index 32988034a5..c4ba6a1a0d 100644 --- a/src/AddIns/Misc/CodeCoverage/Project/Src/CodeCoverageResults.cs +++ b/src/AddIns/Misc/CodeCoverage/Project/Src/CodeCoverageResults.cs @@ -20,6 +20,7 @@ namespace ICSharpCode.CodeCoverage { List modules = new List(); Dictionary fileNames = new Dictionary(); + Dictionary assemblies = new Dictionary(); public CodeCoverageResults(string fileName) : this(new StreamReader(fileName, true)) @@ -50,7 +51,7 @@ namespace ICSharpCode.CodeCoverage } void ReadResults(XmlReader reader) - { + { CodeCoverageModule currentModule = null; CodeCoverageMethod currentMethod = null; string currentClassName = String.Empty; @@ -58,19 +59,21 @@ namespace ICSharpCode.CodeCoverage while (reader.Read()) { switch (reader.NodeType) { case XmlNodeType.Element: - if (reader.Name == "type") { + if (reader.Name == "Type") { currentModule = AddModule(reader); currentClassName = reader.GetAttribute("name"); - } else if (reader.Name == "method" && currentModule != null) { + } else if ((reader.Name == "Method") && (currentModule != null) && (!reader.IsEmptyElement)) { currentMethod = AddMethod(currentModule, currentClassName, reader); - } else if (reader.Name == "pt" && currentMethod != null) { + } else if ((reader.Name == "pt") && (currentMethod != null)) { AddSequencePoint(currentMethod, reader); - } else if (reader.Name == "file") { + } else if (reader.Name == "File") { AddFileName(reader); + } else if (reader.Name == "Assembly") { + AddAssembly(reader); } break; case XmlNodeType.EndElement: - if (currentMethod != null && reader.Name == "method" && currentMethod.SequencePoints.Count == 0) { + if (currentMethod != null && reader.Name == "Method" && currentMethod.SequencePoints.Count == 0) { // Remove method that has no sequence points. currentModule.Methods.Remove(currentMethod); } @@ -80,9 +83,6 @@ namespace ICSharpCode.CodeCoverage reader.Close(); RemoveModulesWithNoMethods(); - -// RemoveExcludedModules(); -// RemoveExcludedMethods(); } /// @@ -90,14 +90,15 @@ namespace ICSharpCode.CodeCoverage /// CodeCoverageModule AddModule(XmlReader reader) { - string assembly = reader.GetAttribute("asm"); + string id = reader.GetAttribute("asmref"); + string assemblyName = GetAssembly(id); foreach (CodeCoverageModule existingModule in modules) { - if (existingModule.Name == assembly) { + if (existingModule.Name == assemblyName) { return existingModule; } } - CodeCoverageModule module = new CodeCoverageModule(assembly); + CodeCoverageModule module = new CodeCoverageModule(assemblyName); modules.Add(module); return module; } @@ -151,49 +152,6 @@ namespace ICSharpCode.CodeCoverage return 0; } -// void RemoveExcludedModules() -// { -// List excludedModules = new List(); -// -// foreach (CodeCoverageModule module in modules) { -// if (module.IsExcluded) { -// excludedModules.Add(module); -// } -// } -// -// foreach (CodeCoverageModule excludedModule in excludedModules) { -// modules.Remove(excludedModule); -// } -// } -// -// void RemoveExcludedMethods() -// { -// List excludedMethods = new List(); -// -// foreach (CodeCoverageModule module in modules) { -// foreach (CodeCoverageMethod method in module.Methods) { -// if (method.IsExcluded) { -// excludedMethods.Add(method); -// } -// } -// foreach (CodeCoverageMethod excludedMethod in excludedMethods) { -// module.Methods.Remove(excludedMethod); -// } -// } -// } -// -// bool IsExcluded(XmlReader reader) -// { -// string excludedValue = reader.GetAttribute("excluded"); -// if (excludedValue != null) { -// bool excluded; -// if (Boolean.TryParse(excludedValue, out excluded)) { -// return excluded; -// } -// } -// return false; -// } - /// /// Returns a filename based on the file id. The filenames are stored in the /// PartCover results xml at the start of the file each with its own @@ -201,8 +159,23 @@ namespace ICSharpCode.CodeCoverage /// string GetFileName(string id) { - if (fileNames.ContainsKey(id)) { - return fileNames[id]; + return GetDictionaryValue(fileNames, id); + } + + /// + /// Returns an assembly based on the id. The assemblies are stored in the + /// PartCover results xml at the start of the file each with its own + /// id. + /// + string GetAssembly(string id) + { + return GetDictionaryValue(assemblies, id); + } + + string GetDictionaryValue(Dictionary dictionary, string key) + { + if (dictionary.ContainsKey(key)) { + return dictionary[key]; } return String.Empty; } @@ -216,6 +189,16 @@ namespace ICSharpCode.CodeCoverage string fileName = reader.GetAttribute("url"); fileNames.Add(id, fileName); } + + /// + /// Saves the assembly and its associated id for reference. + /// + void AddAssembly(XmlReader reader) + { + string id = reader.GetAttribute("id"); + string name = reader.GetAttribute("name"); + assemblies.Add(id, name); + } /// /// Removes any modules that do not contain any methods. diff --git a/src/AddIns/Misc/CodeCoverage/Test/AddCodeCoverageMarkersTestFixture.cs b/src/AddIns/Misc/CodeCoverage/Test/AddCodeCoverageMarkersTestFixture.cs index 213e4dee6e..340bff74ca 100644 --- a/src/AddIns/Misc/CodeCoverage/Test/AddCodeCoverageMarkersTestFixture.cs +++ b/src/AddIns/Misc/CodeCoverage/Test/AddCodeCoverageMarkersTestFixture.cs @@ -40,16 +40,15 @@ namespace ICSharpCode.CodeCoverage.Tests markerStrategy = new MarkerStrategy(document); string xml = "\r\n" + - "\r\n" + - "\t\r\n" + - "\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\t\t\r\n" + - "\t\t\t\t\r\n" + - "\t\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\r\n" + - "\t\r\n" + + "\r\n" + + "\r\n" + + "\t\r\n" + + "\t\t\r\n" + + "\t\t\t\r\n" + + "\t\t\t\r\n" + + "\t\t\t\r\n" + + "\t\t\r\n" + + "\t\r\n" + ""; CodeCoverageResults results = new CodeCoverageResults(new StringReader(xml)); CodeCoverageMethod method = results.Modules[0].Methods[0]; diff --git a/src/AddIns/Misc/CodeCoverage/Test/CodeCoverage.Tests.csproj b/src/AddIns/Misc/CodeCoverage/Test/CodeCoverage.Tests.csproj index 6cc0905b20..ab1d31f273 100644 --- a/src/AddIns/Misc/CodeCoverage/Test/CodeCoverage.Tests.csproj +++ b/src/AddIns/Misc/CodeCoverage/Test/CodeCoverage.Tests.csproj @@ -55,6 +55,7 @@ + diff --git a/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersCoverMultipleLinesTestFixture.cs b/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersCoverMultipleLinesTestFixture.cs index e105572ebf..4a1b4b4770 100644 --- a/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersCoverMultipleLinesTestFixture.cs +++ b/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersCoverMultipleLinesTestFixture.cs @@ -43,16 +43,15 @@ namespace ICSharpCode.CodeCoverage.Tests MarkerStrategy markerStrategy = new MarkerStrategy(document); string xml = "\r\n" + - "\t\r\n" + - "\t\r\n" + - "\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\t\t\r\n" + - "\t\t\t\t\r\n" + - "\t\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\r\n" + - "\t\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\t\r\n" + + "\t\t\t\r\n" + + "\t\t\t\r\n" + + "\t\t\t\r\n" + + "\t\t\r\n" + + "\t\r\n" + ""; CodeCoverageResults results = new CodeCoverageResults(new StringReader(xml)); diff --git a/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersCoverTwoLinesTestFixture.cs b/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersCoverTwoLinesTestFixture.cs index 6d2a987548..bd7c6d2afb 100644 --- a/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersCoverTwoLinesTestFixture.cs +++ b/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersCoverTwoLinesTestFixture.cs @@ -41,15 +41,14 @@ namespace ICSharpCode.CodeCoverage.Tests string xml = "\r\n" + "\t\r\n" + - "\t\r\n" + - "\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\t\t\r\n" + - "\t\t\t\t\r\n" + - "\t\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\r\n" + - "\t\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\t\r\n" + + "\t\t\t\r\n" + + "\t\t\t\r\n" + + "\t\t\t\r\n" + + "\t\t\r\n" + + "\t\r\n" + ""; CodeCoverageResults results = new CodeCoverageResults(new StringReader(xml)); diff --git a/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersInvalidEndColumnTestFixture.cs b/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersInvalidEndColumnTestFixture.cs index afdb24e62d..0c958d7e29 100644 --- a/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersInvalidEndColumnTestFixture.cs +++ b/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersInvalidEndColumnTestFixture.cs @@ -33,17 +33,16 @@ namespace ICSharpCode.CodeCoverage.Tests MarkerStrategy markerStrategy = new MarkerStrategy(document); string xml = "\r\n" + - "\t\r\n" + - "\t\r\n" + - "\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\r\n" + - "\t\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\t\r\n" + + "\t\t\r\n" + + "\t\t\r\n" + + "\t\t\r\n" + + "\t\t\r\n" + + "\t\t\r\n" + + "\t\r\n" + ""; CodeCoverageResults results = new CodeCoverageResults(new StringReader(xml)); diff --git a/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersInvalidEndLineTestFixture.cs b/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersInvalidEndLineTestFixture.cs index b6e4096e61..36e25453aa 100644 --- a/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersInvalidEndLineTestFixture.cs +++ b/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersInvalidEndLineTestFixture.cs @@ -33,18 +33,17 @@ namespace ICSharpCode.CodeCoverage.Tests document.TextContent = "abc\r\ndef"; MarkerStrategy markerStrategy = new MarkerStrategy(document); - string xml = "\r\n" + - "\t\r\n" + - "\t\t\r\n" + - "\t\t\t\r\n" + + string xml = "\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\t\r\n" + "\t\t\t\r\n" + "\t\t\t\r\n" + "\t\t\t\r\n" + "\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\r\n" + - "\t\r\n" + - ""; + "\t\t\r\n" + + "\t\r\n" + + ""; CodeCoverageResults results = new CodeCoverageResults(new StringReader(xml)); CodeCoverageMethod method = results.Modules[0].Methods[0]; diff --git a/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersInvalidStartColumnTestFixture.cs b/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersInvalidStartColumnTestFixture.cs index 9b986e8c59..eb3d85ff38 100644 --- a/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersInvalidStartColumnTestFixture.cs +++ b/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersInvalidStartColumnTestFixture.cs @@ -33,16 +33,15 @@ namespace ICSharpCode.CodeCoverage.Tests MarkerStrategy markerStrategy = new MarkerStrategy(document); string xml = "\r\n" + - "\t\r\n" + - "\t\r\n" + - "\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\r\n" + - "\t\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\t\r\n" + + "\t\t\r\n" + + "\t\t\r\n" + + "\t\t\r\n" + + "\t\t\r\n" + + "\t\r\n" + ""; CodeCoverageResults results = new CodeCoverageResults(new StringReader(xml)); diff --git a/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersInvalidStartLineTestFixture.cs b/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersInvalidStartLineTestFixture.cs index 9a321aa2a7..44c4135c1c 100644 --- a/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersInvalidStartLineTestFixture.cs +++ b/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageMarkersInvalidStartLineTestFixture.cs @@ -32,16 +32,15 @@ namespace ICSharpCode.CodeCoverage.Tests MarkerStrategy markerStrategy = new MarkerStrategy(document); string xml = "\r\n" + - "\t\r\n" + - "\t\r\n" + - "\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\t\t\r\n" + - "\t\t\t\t\r\n" + - "\t\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\r\n" + - "\t\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\t\r\n" + + "\t\t\t\r\n" + + "\t\t\t\r\n" + + "\t\t\t\r\n" + + "\t\t\r\n" + + "\t\r\n" + ""; CodeCoverageResults results = new CodeCoverageResults(new StringReader(xml)); diff --git a/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageResultsMissingFileIdTestFixture.cs b/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageResultsMissingFileIdTestFixture.cs index f79d14b970..fbea1c94d4 100644 --- a/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageResultsMissingFileIdTestFixture.cs +++ b/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageResultsMissingFileIdTestFixture.cs @@ -27,26 +27,24 @@ namespace ICSharpCode.CodeCoverage.Tests public void SetUpFixture() { string xml = "\r\n" + - "\r\n" + - "\r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - "\r\n" + - "\r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - "\r\n" + + "\r\n" + + "\r\n" + + "\r\n" + + "\r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + "\r\n" + + "\r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + "\r\n" + ""; results = new CodeCoverageResults(new StringReader(xml)); diff --git a/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageResultsPropertyFlagsTestFixture.cs b/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageResultsPropertyFlagsTestFixture.cs index 5745fa9bb8..2959b4c00a 100644 --- a/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageResultsPropertyFlagsTestFixture.cs +++ b/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageResultsPropertyFlagsTestFixture.cs @@ -29,43 +29,34 @@ namespace ICSharpCode.CodeCoverage.Tests public void SetUpFixture() { string xml = "\r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + - " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + ""; results = new CodeCoverageResults(new StringReader(xml)); diff --git a/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageResultsTestFixture.cs b/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageResultsTestFixture.cs index 26dbad0919..a1d75df8cd 100644 --- a/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageResultsTestFixture.cs +++ b/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageResultsTestFixture.cs @@ -25,17 +25,16 @@ namespace ICSharpCode.CodeCoverage.Tests [TestFixtureSetUp] public void SetUpFixture() { - string xml = "\r\n" + - "\t\r\n" + - "\t\r\n" + - "\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\t\t\r\n" + - "\t\t\t\t\r\n" + - "\t\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\r\n" + - "\t\r\n" + + string xml = "\r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + ""; results = new CodeCoverageResults(new StringReader(xml)); if (results.Modules.Count > 0) { diff --git a/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageResultsWithEmptyMethodElementTestFixture.cs b/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageResultsWithEmptyMethodElementTestFixture.cs new file mode 100644 index 0000000000..b895d300c6 --- /dev/null +++ b/src/AddIns/Misc/CodeCoverage/Test/CodeCoverageResultsWithEmptyMethodElementTestFixture.cs @@ -0,0 +1,43 @@ +// +// +// +// +// $Revision$ +// + +using ICSharpCode.CodeCoverage; +using NUnit.Framework; +using System; +using System.IO; + +namespace ICSharpCode.CodeCoverage.Tests +{ + [TestFixture] + public class CodeCoverageResultsWithEmptyMethodElementTestFixture + { + CodeCoverageModule module; + CodeCoverageResults results; + + [TestFixtureSetUp] + public void SetUpFixture() + { + string xml = "\r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + ""; + results = new CodeCoverageResults(new StringReader(xml)); + if (results.Modules.Count > 0) { + module = results.Modules[0]; + } + } + + [Test] + public void NoModules() + { + Assert.AreEqual(0, results.Modules.Count); + } + } +} diff --git a/src/AddIns/Misc/CodeCoverage/Test/GetSequencePointsForFileNameTestFixture.cs b/src/AddIns/Misc/CodeCoverage/Test/GetSequencePointsForFileNameTestFixture.cs index 6f3b13dd9d..0895bcffff 100644 --- a/src/AddIns/Misc/CodeCoverage/Test/GetSequencePointsForFileNameTestFixture.cs +++ b/src/AddIns/Misc/CodeCoverage/Test/GetSequencePointsForFileNameTestFixture.cs @@ -26,37 +26,31 @@ namespace ICSharpCode.CodeCoverage.Tests public void SetUpFixture() { string xml = "\r\n" + - "\t\r\n" + - "\t\r\n" + - "\t\r\n" + - "\t\r\n" + - "\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\r\n" + - "\t\r\n" + - "\t\r\n" + - "\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\t\t\r\n" + - "\t\t\r\n" + - "\t\r\n" + - "\t\r\n" + - "\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\r\n" + - "\t\r\n" + - "\t\r\n" + - "\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\r\n" + - "\t\r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + + " \r\n" + ""; results = new CodeCoverageResults(new StringReader(xml)); diff --git a/src/AddIns/Misc/CodeCoverage/Test/InvalidSequencePointDataTestFixture.cs b/src/AddIns/Misc/CodeCoverage/Test/InvalidSequencePointDataTestFixture.cs index 008a9f06dd..e372e5acff 100644 --- a/src/AddIns/Misc/CodeCoverage/Test/InvalidSequencePointDataTestFixture.cs +++ b/src/AddIns/Misc/CodeCoverage/Test/InvalidSequencePointDataTestFixture.cs @@ -25,24 +25,19 @@ namespace ICSharpCode.CodeCoverage.Tests public void SetUpFixture() { string xml = "\r\n" + - "\t\r\n" + - "\t\r\n" + - "\t\t\r\n" + - "\t\t\t\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\t\r\n" + "\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\r\n" + - "\t\t\r\n" + - "\t\t\t\r\n" + + "\t\t\r\n" + + "\t\t\r\n" + "\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\r\n" + - "\t\t\r\n" + - "\t\t\t\r\n" + + "\t\t\r\n" + + "\t\t\r\n" + "\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\r\n" + - "\t\r\n" + + "\t\t\r\n" + + "\t\r\n" + ""; results = new CodeCoverageResults(new StringReader(xml)); diff --git a/src/AddIns/Misc/CodeCoverage/Test/ModuleVisitedSequencePointsTestFixture.cs b/src/AddIns/Misc/CodeCoverage/Test/ModuleVisitedSequencePointsTestFixture.cs index b3adad7da2..e770640fb6 100644 --- a/src/AddIns/Misc/CodeCoverage/Test/ModuleVisitedSequencePointsTestFixture.cs +++ b/src/AddIns/Misc/CodeCoverage/Test/ModuleVisitedSequencePointsTestFixture.cs @@ -23,36 +23,32 @@ namespace ICSharpCode.CodeCoverage.Tests public void SetUpFixture() { string xml = "\r\n" + - "\t\r\n" + - "\t\r\n" + - "\t\r\n" + - "\t\r\n" + - "\t\t\r\n" + - "\t\t\t\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\t\r\n" + "\t\t\t\r\n" + "\t\t\t\r\n" + "\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\r\n" + - "\t\r\n" + - "\t\r\n" + - "\t\t\r\n" + - "\t\t\t\r\n" + + "\t\t\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\t\r\n" + "\t\t\t\r\n" + "\t\t\t\r\n" + "\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\r\n" + - "\t\r\n" + - "\t\r\n" + - "\t\t\r\n" + - "\t\t\t\r\n" + + "\t\t\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\t\r\n" + "\t\t\t\r\n" + "\t\t\t\r\n" + "\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\r\n" + - "\t\r\n" + + "\t\t\r\n" + + "\t\r\n" + ""; results = new CodeCoverageResults(new StringReader(xml)); fooModule = results.Modules[0]; diff --git a/src/AddIns/Misc/CodeCoverage/Test/RemoveCodeCoverageMarkersTestFixture.cs b/src/AddIns/Misc/CodeCoverage/Test/RemoveCodeCoverageMarkersTestFixture.cs index cab692be96..67d5093a0d 100644 --- a/src/AddIns/Misc/CodeCoverage/Test/RemoveCodeCoverageMarkersTestFixture.cs +++ b/src/AddIns/Misc/CodeCoverage/Test/RemoveCodeCoverageMarkersTestFixture.cs @@ -36,16 +36,15 @@ namespace ICSharpCode.CodeCoverage.Tests markerStrategy = new MarkerStrategy(document); string xml = "\r\n" + - "\t\r\n" + - "\t\r\n" + - "\t\t\r\n" + - "\t\t\t\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\r\n" + + "\t\t\r\n" + "\t\t\t\r\n" + "\t\t\t\r\n" + "\t\t\t\r\n" + - "\t\t\t\r\n" + - "\t\t\r\n" + - "\t\r\n" + + "\t\t\r\n" + + "\t\r\n" + ""; CodeCoverageResults results = new CodeCoverageResults(new StringReader(xml)); CodeCoverageMethod method = results.Modules[0].Methods[0];