Add ITestContextFacade

Author: C0nquistadore

src/Dibix.Testing/Http/WebApiTestBase.cs

@@ -17,12 +17,12 @@ namespace Dibix.Testing.Http
         private protected async Task ExecuteTest<TTestContext>(Func<TTestContext, Task> testFlow, Func<IHttpClientFactory, HttpClientOptions, IHttpAuthorizationProvider, TTestContext> contextCreator) where TTestContext : HttpTestContext
         {
             IHttpClientFactory httpClientFactory = TestHttpClientFactoryBuilder.Create(TestContext, Out)
-                                                                               .Configure(x => ConfigureClient(Configuration, x))
+                                                                               .Configure(ConfigureClient)
                                                                                .Build();
             HttpClientOptions httpClientOptions = new HttpClientOptions();
             ConfigureOptions(httpClientOptions);
             ITestAuthorizationContext authorizationContext = new TestAuthorizationContext(httpClientFactory, httpClientOptions);
-            IHttpAuthorizationProvider authorizationProvider = await Authorize(authorizationContext, Configuration).ConfigureAwait(false);
+            IHttpAuthorizationProvider authorizationProvider = await Authorize(authorizationContext).ConfigureAwait(false);
             TTestContext testContext = contextCreator(httpClientFactory, httpClientOptions, authorizationProvider);
             await testFlow(testContext).ConfigureAwait(false);
         }
@@ -62,9 +62,9 @@ protected async Task<TResponseContent> InvokeApiAndAssertResponse<TService, TRes
             return responseContent;
         }
 
-        protected virtual void ConfigureClient(TConfiguration configuration, IHttpClientBuilder builder) { }
+        protected virtual void ConfigureClient(IHttpClientBuilder builder) { }
 
-        protected virtual Task<IHttpAuthorizationProvider> Authorize(ITestAuthorizationContext context, TConfiguration configuration) => Task.FromResult<IHttpAuthorizationProvider>(null);
+        protected virtual Task<IHttpAuthorizationProvider> Authorize(ITestAuthorizationContext context) => Task.FromResult<IHttpAuthorizationProvider>(null);
         #endregion
 
         #region Private Methods

src/Dibix.Testing/ITestContextFacade.cs

@@ -0,0 +1,21 @@
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Dibix.Testing
+{
+    public interface ITestContextFacade
+    {
+        TestContext TestContext { get; }
+        TextWriter Out { get; }
+        TestClassInstanceScope Scope { get; }
+
+        string AddTestFile(string fileName, string content);
+        string AddTestRunFile(string fileName);
+        string ImportTestRunFile(string filePath);
+    }
+
+    public interface ITestContextFacade<out TConfiguration> : ITestContextFacade
+    {
+        TConfiguration Configuration { get; }
+    }
+}

src/Dibix.Testing/TestBase.cs

@@ -17,7 +17,7 @@
 
 namespace Dibix.Testing
 {
-    public abstract class TestBase : IDisposable
+    public abstract class TestBase : ITestContextFacade, IDisposable
     {
         #region Fields
         private readonly Assembly _assembly;
@@ -265,6 +265,17 @@ private static T SafeGetProperty<T>(ref T field, [CallerMemberName] string prope
         }
         #endregion
 
+        #region ITestContextFacade Members
+        TestContext ITestContextFacade.TestContext => TestContext;
+        TextWriter ITestContextFacade.Out => Out;
+        TestClassInstanceScope ITestContextFacade.Scope => Scope;
+
+        string ITestContextFacade.AddTestFile(string fileName, string content) => AddTestFile(fileName, content);
+        string ITestContextFacade.AddTestRunFile(string fileName) => AddTestRunFile(fileName);
+
+        string ITestContextFacade.ImportTestRunFile(string filePath) => ImportTestRunFile(filePath);
+        #endregion
+
         #region IDisposable Members
         public void Dispose()
         {
@@ -287,7 +298,7 @@ protected virtual void Dispose(bool disposing)
         }
         #endregion
     }
-    public abstract class TestBase<TConfiguration> : TestBase where TConfiguration : class, new()
+    public abstract class TestBase<TConfiguration> : TestBase, ITestContextFacade<TConfiguration> where TConfiguration : class, new()
     {
         private TConfiguration _configuration;
 
@@ -318,5 +329,7 @@ private void AddConfigurationToOutput(TConfiguration configuration)
             if (Scope == TestClassInstanceScope.TestInitialize)
                 _ = AddTestFile("appsettings.json", JsonConvert.SerializeObject(configuration, Formatting.Indented));
         }
+
+        TConfiguration ITestContextFacade<TConfiguration>.Configuration => Configuration;
     }
 }