some code cleanup

tonerdo · tonerdo · commit eac4cfc2651d · 2018-12-20T11:46:33.000+01:00
diff --git a/src/coverlet.core/Coverage.cs b/src/coverlet.core/Coverage.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 
+using Coverlet.Core.Enums;
 using Coverlet.Core.Helpers;
 using Coverlet.Core.Instrumentation;
 using Coverlet.Core.Symbols;
@@ -48,7 +49,7 @@ public Coverage(string module, string[] includeFilters, string[] includeDirector
         public void PrepareModules()
         {
             string[] modules = InstrumentationHelper.GetCoverableModules(_module, _includeDirectories);
-            string[] excludes =  InstrumentationHelper.GetExcludedFiles(_excludedSourceFiles);
+            string[] excludes = InstrumentationHelper.GetExcludedFiles(_excludedSourceFiles);
             _excludeFilters = _excludeFilters?.Where(f => InstrumentationHelper.IsValidFilterExpression(f)).ToArray();
             _includeFilters = _includeFilters?.Where(f => InstrumentationHelper.IsValidFilterExpression(f)).ToArray();
 
@@ -131,14 +132,14 @@ public CoverageResult GetCoverageResult()
                                 if (methods.TryGetValue(branch.Method, out Method method))
                                 {
                                     method.Branches.Add(new BranchInfo
-                                        { Line = branch.Number, Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal }
+                                    { Line = branch.Number, Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal }
                                     );
                                 }
                                 else
                                 {
                                     documents[doc.Path][branch.Class].Add(branch.Method, new Method());
                                     documents[doc.Path][branch.Class][branch.Method].Branches.Add(new BranchInfo
-                                        { Line = branch.Number, Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal }
+                                    { Line = branch.Number, Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal }
                                     );
                                 }
                             }
@@ -147,7 +148,7 @@ public CoverageResult GetCoverageResult()
                                 documents[doc.Path].Add(branch.Class, new Methods());
                                 documents[doc.Path][branch.Class].Add(branch.Method, new Method());
                                 documents[doc.Path][branch.Class][branch.Method].Branches.Add(new BranchInfo
-                                    { Line = branch.Number, Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal }
+                                { Line = branch.Number, Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal }
                                 );
                             }
                         }
@@ -157,7 +158,7 @@ public CoverageResult GetCoverageResult()
                             documents[doc.Path].Add(branch.Class, new Methods());
                             documents[doc.Path][branch.Class].Add(branch.Method, new Method());
                             documents[doc.Path][branch.Class][branch.Method].Branches.Add(new BranchInfo
-                                { Line = branch.Number, Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal }
+                            { Line = branch.Number, Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal }
                             );
                         }
                     }
@@ -292,7 +293,7 @@ private string GetSourceLinkUrl(Dictionary<string, string> sourceLinkDocuments,
             }
 
             relativePathOfBestMatch = relativePathOfBestMatch == "." ? string.Empty : relativePathOfBestMatch;
-            
+
             string replacement = Path.Combine(relativePathOfBestMatch, Path.GetFileName(document));
             replacement = replacement.Replace('\\', '/');
 
diff --git a/src/coverlet.core/Reporters/ReporterFactory.cs b/src/coverlet.core/Reporters/ReporterFactory.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
-using coverlet.core.Reporters;
+using Coverlet.Core.Reporters;
 
 namespace Coverlet.Core.Reporters
 {
diff --git a/src/coverlet.core/Reporters/TeamCityReporter.cs b/src/coverlet.core/Reporters/TeamCityReporter.cs
@@ -3,7 +3,7 @@
 using Coverlet.Core.Reporters;
 using System.Text;
 
-namespace coverlet.core.Reporters
+namespace Coverlet.Core.Reporters
 {
     public class TeamCityReporter : IReporter
     {
diff --git a/test/coverlet.core.performancetest/PerformanceTest.cs b/test/coverlet.core.performancetest/PerformanceTest.cs
@@ -3,13 +3,13 @@
 using System.Collections.Generic;
 using Xunit;
 
-namespace coverlet.core.performancetest
+namespace Coverlet.Core.PerformanceTest
 {
     /// <summary>
     /// Test the performance of coverlet by running a unit test that calls a reasonably big and complex test class.
     /// Enable the test, compile, then run the test in the command line:
     /// <code>
-    /// dotnet test /p:CollectCoverage=true test/coverlet.core.performancetest/
+    /// dotnet test /p:CollectCoverage=true test/Coverlet.Core.PerformanceTest/
     /// </code>
     /// </summary>
     public class PerformanceTest
diff --git a/test/coverlet.core.tests/Instrumentation/ModuleTrackerTemplateTests.cs b/test/coverlet.core.tests/Instrumentation/ModuleTrackerTemplateTests.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using Xunit;
 
-namespace coverlet.core.tests.Instrumentation
+namespace Coverlet.Core.Tests.Instrumentation
 {
     public class ModuleTrackerTemplateTestsFixture : IDisposable
     {
diff --git a/test/coverlet.core.tests/Reporters/ReporterFactoryTests.cs b/test/coverlet.core.tests/Reporters/ReporterFactoryTests.cs
@@ -1,4 +1,4 @@
-using coverlet.core.Reporters;
+using Coverlet.Core.Reporters;
 using Xunit;
 
 namespace Coverlet.Core.Reporters.Tests
diff --git a/test/coverlet.core.tests/Reporters/TeamCityReporter.cs b/test/coverlet.core.tests/Reporters/TeamCityReporter.cs
@@ -1,5 +1,5 @@
-﻿using coverlet.core.Reporters;
-using System;
+﻿using System;
+using Coverlet.Core.Reporters;
 using Xunit;
 
 namespace Coverlet.Core.Reporters.Tests

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.IO;`
`4`	`4`	`using System.Linq;`
`5`	`5`
	`6`	`+using Coverlet.Core.Enums;`
`6`	`7`	`using Coverlet.Core.Helpers;`
`7`	`8`	`using Coverlet.Core.Instrumentation;`
`8`	`9`	`using Coverlet.Core.Symbols;`
`@@ -48,7 +49,7 @@ public Coverage(string module, string[] includeFilters, string[] includeDirector`
`48`	`49`	`public void PrepareModules()`
`49`	`50`	`{`
`50`	`51`	`string[] modules = InstrumentationHelper.GetCoverableModules(_module, _includeDirectories);`
`51`		`- string[] excludes = InstrumentationHelper.GetExcludedFiles(_excludedSourceFiles);`
	`52`	`+ string[] excludes = InstrumentationHelper.GetExcludedFiles(_excludedSourceFiles);`
`52`	`53`	`_excludeFilters = _excludeFilters?.Where(f => InstrumentationHelper.IsValidFilterExpression(f)).ToArray();`
`53`	`54`	`_includeFilters = _includeFilters?.Where(f => InstrumentationHelper.IsValidFilterExpression(f)).ToArray();`
`54`	`55`
`@@ -131,14 +132,14 @@ public CoverageResult GetCoverageResult()`
`131`	`132`	`if (methods.TryGetValue(branch.Method, out Method method))`
`132`	`133`	`{`
`133`	`134`	`method.Branches.Add(new BranchInfo`
`134`		`- { Line = branch.Number, Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal }`
	`135`	`+ { Line = branch.Number, Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal }`
`135`	`136`	`);`
`136`	`137`	`}`
`137`	`138`	`else`
`138`	`139`	`{`
`139`	`140`	`documents[doc.Path][branch.Class].Add(branch.Method, new Method());`
`140`	`141`	`documents[doc.Path][branch.Class][branch.Method].Branches.Add(new BranchInfo`
`141`		`- { Line = branch.Number, Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal }`
	`142`	`+ { Line = branch.Number, Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal }`
`142`	`143`	`);`
`143`	`144`	`}`
`144`	`145`	`}`
`@@ -147,7 +148,7 @@ public CoverageResult GetCoverageResult()`
`147`	`148`	`documents[doc.Path].Add(branch.Class, new Methods());`
`148`	`149`	`documents[doc.Path][branch.Class].Add(branch.Method, new Method());`
`149`	`150`	`documents[doc.Path][branch.Class][branch.Method].Branches.Add(new BranchInfo`
`150`		`- { Line = branch.Number, Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal }`
	`151`	`+ { Line = branch.Number, Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal }`
`151`	`152`	`);`
`152`	`153`	`}`
`153`	`154`	`}`
`@@ -157,7 +158,7 @@ public CoverageResult GetCoverageResult()`
`157`	`158`	`documents[doc.Path].Add(branch.Class, new Methods());`
`158`	`159`	`documents[doc.Path][branch.Class].Add(branch.Method, new Method());`
`159`	`160`	`documents[doc.Path][branch.Class][branch.Method].Branches.Add(new BranchInfo`
`160`		`- { Line = branch.Number, Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal }`
	`161`	`+ { Line = branch.Number, Hits = branch.Hits, Offset = branch.Offset, EndOffset = branch.EndOffset, Path = branch.Path, Ordinal = branch.Ordinal }`
`161`	`162`	`);`
`162`	`163`	`}`
`163`	`164`	`}`
`@@ -292,7 +293,7 @@ private string GetSourceLinkUrl(Dictionary<string, string> sourceLinkDocuments,`
`292`	`293`	`}`
`293`	`294`
`294`	`295`	`relativePathOfBestMatch = relativePathOfBestMatch == "." ? string.Empty : relativePathOfBestMatch;`
`295`		`-`
	`296`	`+`
`296`	`297`	`string replacement = Path.Combine(relativePathOfBestMatch, Path.GetFileName(document));`
`297`	`298`	`replacement = replacement.Replace('\\', '/');`
`298`	`299`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Linq;`
`3`	`3`	`using System.Collections.Generic;`
`4`		`-using coverlet.core.Reporters;`
	`4`	`+using Coverlet.Core.Reporters;`
`5`	`5`
`6`	`6`	`namespace Coverlet.Core.Reporters`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using Coverlet.Core.Reporters;`
`4`	`4`	`using System.Text;`
`5`	`5`
`6`		`-namespace coverlet.core.Reporters`
	`6`	`+namespace Coverlet.Core.Reporters`
`7`	`7`	`{`
`8`	`8`	`public class TeamCityReporter : IReporter`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using System.Threading.Tasks;`
`6`	`6`	`using Xunit;`
`7`	`7`
`8`		`-namespace coverlet.core.tests.Instrumentation`
	`8`	`+namespace Coverlet.Core.Tests.Instrumentation`
`9`	`9`	`{`
`10`	`10`	`public class ModuleTrackerTemplateTestsFixture : IDisposable`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using coverlet.core.Reporters;`
	`1`	`+using Coverlet.Core.Reporters;`
`2`	`2`	`using Xunit;`
`3`	`3`
`4`	`4`	`namespace Coverlet.Core.Reporters.Tests`