SystemIOFile Adapter

src/coverlet.collector/DataCollection/AttachmentManager.cs

@@ -5,6 +5,7 @@
 using coverlet.collector.Resources;
 using Coverlet.Collector.Utilities;
 using Coverlet.Collector.Utilities.Interfaces;
+using Coverlet.Core.Abstracts;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 
 namespace Coverlet.Collector.DataCollection
@@ -18,31 +19,31 @@ internal class AttachmentManager : IDisposable
         private readonly TestPlatformEqtTrace _eqtTrace;
         private readonly TestPlatformLogger _logger;
         private readonly DataCollectionContext _dataCollectionContext;
-        private readonly IFileHelper _fileHelper;
+        private readonly IFileSystem _fileSystem;
         private readonly IDirectoryHelper _directoryHelper;
         private readonly ICountDownEvent _countDownEvent;
         private readonly string _reportDirectory;
 
-        public AttachmentManager(DataCollectionSink dataSink, DataCollectionContext dataCollectionContext, TestPlatformLogger logger, TestPlatformEqtTrace eqtTrace, ICountDownEvent countDownEvent)
+        public AttachmentManager(DataCollectionSink dataSink, DataCollectionContext dataCollectionContext, TestPlatformLogger logger, TestPlatformEqtTrace eqtTrace, ICountDownEvent countDownEvent, IFileSystem fileSystem)
             : this(dataSink,
                   dataCollectionContext,
                   logger,
                   eqtTrace,
                   Guid.NewGuid().ToString(),
-                  new FileHelper(),
+                  fileSystem,
                   new DirectoryHelper(),
                   countDownEvent)
         {
         }
 
-        public AttachmentManager(DataCollectionSink dataSink, DataCollectionContext dataCollectionContext, TestPlatformLogger logger, TestPlatformEqtTrace eqtTrace, string reportDirectoryName, IFileHelper fileHelper, IDirectoryHelper directoryHelper, ICountDownEvent countDownEvent)
+        public AttachmentManager(DataCollectionSink dataSink, DataCollectionContext dataCollectionContext, TestPlatformLogger logger, TestPlatformEqtTrace eqtTrace, string reportDirectoryName, IFileSystem fileSystem, IDirectoryHelper directoryHelper, ICountDownEvent countDownEvent)
         {
             // Store input variabless
             _dataSink = dataSink;
             _dataCollectionContext = dataCollectionContext;
             _logger = logger;
             _eqtTrace = eqtTrace;
-            _fileHelper = fileHelper;
+            _fileSystem = fileSystem;
             _directoryHelper = directoryHelper;
             _countDownEvent = countDownEvent;
 
@@ -100,7 +101,7 @@ private string SaveCoverageReport(string report, string reportFileName)
             {
                 _directoryHelper.CreateDirectory(_reportDirectory);
                 string filePath = Path.Combine(_reportDirectory, reportFileName);
-                _fileHelper.WriteAllText(filePath, report);
+                _fileSystem.WriteAllText(filePath, report);
                 _eqtTrace.Info("{0}: Saved coverage report to path: '{1}'", CoverletConstants.DataCollectorName, filePath);
 
                 return filePath;
@@ -139,7 +140,7 @@ public void OnSendFileCompleted(object sender, AsyncCompletedEventArgs e)
         /// <param name="attachmentPath">Attachment file path</param>
         private void SendAttachment(string attachmentPath)
         {
-            if (_fileHelper.Exists(attachmentPath))
+            if (_fileSystem.Exists(attachmentPath))
             {
                 // Send coverage attachment to test platform.
                 _eqtTrace.Verbose("{0}: Sending attachment to test platform", CoverletConstants.DataCollectorName);

src/coverlet.collector/DataCollection/CoverageWrapper.cs

@@ -30,6 +30,7 @@ public Coverage CreateCoverage(CoverletSettings settings, ILogger coverletLogger
                 settings.MergeWith,
                 settings.UseSourceLink,
                 coverletLogger,
+                (IFileSystem)DependencyInjection.Current.GetService(typeof(IFileSystem)),
                 (IInstrumentationHelper)DependencyInjection.Current.GetService(typeof(IInstrumentationHelper)));
         }
 

src/coverlet.collector/DataCollection/CoverletCoverageCollector.cs

@@ -5,6 +5,9 @@
 using System.Xml;
 using Coverlet.Collector.Utilities;
 using Coverlet.Collector.Utilities.Interfaces;
+using Coverlet.Core;
+using Coverlet.Core.Abstracts;
+using Coverlet.Core.Helpers;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
 
 namespace Coverlet.Collector.DataCollection
@@ -132,13 +135,14 @@ private void OnSessionEnd(object sender, SessionEndEventArgs e)
             {
                 _eqtTrace.Verbose("{0}: SessionEnd received", CoverletConstants.DataCollectorName);
 
+                IFileSystem fileSystem = (IFileSystem)DependencyInjection.Current.GetService(typeof(IFileSystem));
                 // Get coverage reports
                 IEnumerable<(string report, string fileName)> coverageReports = _coverageManager?.GetCoverageReports();
 
                 if (coverageReports != null && coverageReports.Count() > 0)
                 {
                     // Send result attachments to test platform.
-                    using (var attachmentManager = new AttachmentManager(_dataSink, _dataCollectionContext, _logger, _eqtTrace, _countDownEventFactory.Create(coverageReports.Count(), TimeSpan.FromSeconds(30))))
+                    using (var attachmentManager = new AttachmentManager(_dataSink, _dataCollectionContext, _logger, _eqtTrace, _countDownEventFactory.Create(coverageReports.Count(), TimeSpan.FromSeconds(30)), fileSystem))
                     {
                         foreach ((string report, string fileName) in coverageReports)
                         {

src/coverlet.console/Program.cs

@@ -59,7 +59,7 @@ static int Main(string[] args)
                     // Adjust log level based on user input.
                     logger.Level = verbosity.ParsedValue;
                 }
-
+                var fileSystem = (IFileSystem)DependencyInjection.Current.GetService(typeof(IFileSystem));
                 Coverage coverage = new Coverage(module.Value,
                     includeFilters.Values.ToArray(),
                     includeDirectories.Values.ToArray(),
@@ -71,6 +71,7 @@ static int Main(string[] args)
                     mergeWith.Value(),
                     useSourceLink.HasValue(),
                     logger,
+                    fileSystem,
                     (IInstrumentationHelper)DependencyInjection.Current.GetService(typeof(IInstrumentationHelper)));
                 coverage.PrepareModules();
 
@@ -140,7 +141,7 @@ static int Main(string[] args)
 
                         var report = Path.Combine(directory, filename);
                         logger.LogInformation($"  Generating report '{report}'", important: true);
-                        File.WriteAllText(report, reporter.Report(result));
+                        fileSystem.WriteAllText(report, reporter.Report(result));
                     }
                 }
 

src/coverlet.core/Abstracts/IFileSystem.cs

@@ -1,7 +1,23 @@
-namespace Coverlet.Core.Abstracts
+using System.IO;
+
+namespace Coverlet.Core.Abstracts
 {
-    internal interface IFileSystem
+    public interface IFileSystem
     {
         bool Exists(string path);
+
+        void WriteAllText(string path, string contents);
+
+        string ReadAllText(string path);
+
+        FileStream OpenRead(string path);
+
+        void Copy(string sourceFileName, string destFileName);
+
+        void Copy(string sourceFileName, string destFileName, bool overwrite);
+
+        void Delete(string path);
+
+        void AppendAllText(string path, string contents);
     }
 }

src/coverlet.core/Coverage.cs

@@ -27,6 +27,7 @@ public class Coverage
         private bool _useSourceLink;
         private ILogger _logger;
         private IInstrumentationHelper _instrumentationHelper;
+        private IFileSystem _fileSystem;
         private List<InstrumenterResult> _results;
 
         public string Identifier
@@ -45,6 +46,7 @@ public Coverage(string module,
             string mergeWith,
             bool useSourceLink,
             ILogger logger,
+            IFileSystem fileSystem,
             IInstrumentationHelper instrumentationHelper)
         {
             _module = module;
@@ -58,20 +60,22 @@ public Coverage(string module,
             _mergeWith = mergeWith;
             _useSourceLink = useSourceLink;
             _logger = logger;
+            _fileSystem = fileSystem;
             _instrumentationHelper = instrumentationHelper;
 
             _identifier = Guid.NewGuid().ToString();
             _results = new List<InstrumenterResult>();
         }
 
-        public Coverage(CoveragePrepareResult prepareResult, ILogger logger, IInstrumentationHelper instrumentationHelper)
+        public Coverage(CoveragePrepareResult prepareResult, ILogger logger, IInstrumentationHelper instrumentationHelper, IFileSystem fileSystem)
         {
             _identifier = prepareResult.Identifier;
             _module = prepareResult.Module;
             _mergeWith = prepareResult.MergeWith;
             _useSourceLink = prepareResult.UseSourceLink;
             _results = new List<InstrumenterResult>(prepareResult.Results);
             _logger = logger;
+            _fileSystem = fileSystem;
             _instrumentationHelper = instrumentationHelper;
         }
 
@@ -215,9 +219,9 @@ public CoverageResult GetCoverageResult()
 
             var coverageResult = new CoverageResult { Identifier = _identifier, Modules = modules, InstrumentedResults = _results };
 
-            if (!string.IsNullOrEmpty(_mergeWith) && !string.IsNullOrWhiteSpace(_mergeWith) && File.Exists(_mergeWith))
+            if (!string.IsNullOrEmpty(_mergeWith) && !string.IsNullOrWhiteSpace(_mergeWith) && _fileSystem.Exists(_mergeWith))
             {
-                string json = File.ReadAllText(_mergeWith);
+                string json = _fileSystem.ReadAllText(_mergeWith);
                 coverageResult.Merge(JsonConvert.DeserializeObject<Modules>(json));
             }
 
@@ -228,7 +232,7 @@ private void CalculateCoverage()
         {
             foreach (var result in _results)
             {
-                if (!File.Exists(result.HitsFilePath))
+                if (!_fileSystem.Exists(result.HitsFilePath))
                 {
                     // Hits file could be missed mainly for two reason
                     // 1) Issue during module Unload()

src/coverlet.core/Helpers/FileSystem.cs

@@ -3,11 +3,46 @@
 
 namespace Coverlet.Core.Helpers
 {
-    internal class FileSystem : IFileSystem
+    public class FileSystem : IFileSystem
     {
         public bool Exists(string path)
         {
             return File.Exists(path);
         }
+
+        public void WriteAllText(string path, string contents)
+        {
+            File.WriteAllText(path, contents);
+        }
+
+        public string ReadAllText(string path)
+        {
+            return File.ReadAllText(path);
+        }
+
+        public FileStream OpenRead(string path)
+        {
+            return File.OpenRead(path);
+        }
+
+        public void Copy(string sourceFileName, string destFileName)
+        {
+            File.Copy(sourceFileName, destFileName);
+        }
+
+        public void Copy(string sourceFileName, string destFileName, bool overwrite)
+        {
+            File.Copy(sourceFileName, destFileName, overwrite);
+        }
+
+        public void Delete(string path)
+        {
+            File.Delete(path);
+        }
+
+        public void AppendAllText(string path, string contents)
+        {
+            File.AppendAllText(path, contents);
+        }
     }
 }