Merge pull request #89 from Umplify/issue_88

Exposed `IConfigurationBuilder` #88

Author: Arash-Sabet

src/Abstracts/TestBedFixture.cs

@@ -1,16 +1,16 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Xunit.Abstractions;
-using Xunit.Microsoft.DependencyInjection.Logging;
-
+using Xunit.Microsoft.DependencyInjection.Logging;
+
 namespace Xunit.Microsoft.DependencyInjection.Abstracts
-{
+{
     public abstract class TestBedFixture : IDisposable, IAsyncDisposable
 	{
 		private readonly IServiceCollection _services;
@@ -26,6 +26,7 @@ protected TestBedFixture()
 		}
 
 		public IConfigurationRoot Configuration { get; private set; }
+		public IConfigurationBuilder ConfigurationBuilder{ get; private set; }
 
 		public IServiceProvider GetServiceProvider(ITestOutputHelper testOutputHelper)
 		{
@@ -48,6 +49,7 @@ public T GetScopedService<T>(ITestOutputHelper testOutputHelper)
 		public T GetService<T>(ITestOutputHelper testOutputHelper)
 			=> GetServiceProvider(testOutputHelper).GetService<T>();
 
+		[Obsolete("GetConfigurationFile() method will be deprecated in the next release. Please start using GetConfigurationFiles() instead.")]
 		protected abstract string GetConfigurationFile();
 		protected abstract void AddServices(IServiceCollection services, IConfiguration configuration);
 
@@ -70,12 +72,12 @@ private IConfigurationRoot GetConfigurationRoot()
 
 		private IConfigurationRoot GetConfigurationRoot(IEnumerable<string> configurationFiles)
 		{
-			var builder = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory());
+			ConfigurationBuilder = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory());
 			foreach(var configurationFile in configurationFiles)
             {
-				builder.AddJsonFile(configurationFile);
+                ConfigurationBuilder.AddJsonFile(configurationFile);
             }
-			return builder.Build();
+			return ConfigurationBuilder.Build();
 		}
 
 		protected virtual void Dispose(bool disposing)
@@ -107,18 +109,18 @@ public void Dispose()
 			// Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
 			Dispose(disposing: true);
 			GC.SuppressFinalize(this);
-		}
-
-        public async ValueTask DisposeAsync()
-        {
-			if (!_disposedAsync)
-			{
-				await DisposeAsyncCore();
-				GC.SuppressFinalize(this);
-				_disposedAsync = true;
-			}
-        }
-
-		protected abstract ValueTask DisposeAsyncCore();
+		}
+
+        public async ValueTask DisposeAsync()
+        {
+			if (!_disposedAsync)
+			{
+				await DisposeAsyncCore();
+				GC.SuppressFinalize(this);
+				_disposedAsync = true;
+			}
+        }
+
+		protected abstract ValueTask DisposeAsyncCore();
 	}
 }