From ba481365f6469d2d3379d2a5d648a3acf935b45e Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Fri, 15 Dec 2017 20:27:30 -0600
Subject: [PATCH] Enable turning off the setup check for appbuilder tests.

---
 src/Avalonia.Controls/AppBuilderBase.cs             | 13 ++++++++++++-
 .../Avalonia.Controls.UnitTests/AppBuilderTests.cs  |  6 +++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/AppBuilderBase.cs b/src/Avalonia.Controls/AppBuilderBase.cs
index ebbd682f28..7af3deef34 100644
--- a/src/Avalonia.Controls/AppBuilderBase.cs
+++ b/src/Avalonia.Controls/AppBuilderBase.cs
@@ -209,6 +209,17 @@ namespace Avalonia.Controls
 
         public TAppBuilder UseAvaloniaModules() => AfterSetup(builder => SetupAvaloniaModules());
 
+        private bool CheckSetup { get; set; } = true;
+
+        /// <summary>
+        /// Set this AppBuilder to ignore the setup check. Used for testing purposes.
+        /// </summary>
+        internal TAppBuilder IgnoreSetupCheck()
+        {
+            CheckSetup = false;
+            return Self;
+        }
+
         private void SetupAvaloniaModules()
         {
             var moduleInitializers = from assembly in AvaloniaLocator.Current.GetService<IRuntimePlatform>().GetLoadedAssemblies()
@@ -254,7 +265,7 @@ namespace Avalonia.Controls
                 throw new InvalidOperationException("No rendering system configured.");
             }
 
-            if (s_setupWasAlreadyCalled)
+            if (s_setupWasAlreadyCalled && CheckSetup)
             {
                 throw new InvalidOperationException("Setup was already called on one of AppBuilder instances");
             }
diff --git a/tests/Avalonia.Controls.UnitTests/AppBuilderTests.cs b/tests/Avalonia.Controls.UnitTests/AppBuilderTests.cs
index 867f740a3a..60c53d126c 100644
--- a/tests/Avalonia.Controls.UnitTests/AppBuilderTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/AppBuilderTests.cs
@@ -65,6 +65,7 @@ namespace Avalonia.Controls.UnitTests
             {
                 ResetModuleLoadStates();
                 AppBuilder.Configure<App>()
+                    .IgnoreSetupCheck()
                     .UseWindowingSubsystem(() => { })
                     .UseRenderingSubsystem(() => { })
                     .UseAvaloniaModules()
@@ -81,6 +82,7 @@ namespace Avalonia.Controls.UnitTests
             {
                 ResetModuleLoadStates();
                 var builder = AppBuilder.Configure<App>()
+                    .IgnoreSetupCheck()
                     .UseWindowingSubsystem(() => { })
                     .UseRenderingSubsystem(() => { }, "Direct2D1");
                 builder.UseAvaloniaModules().SetupWithoutStarting();
@@ -90,6 +92,7 @@ namespace Avalonia.Controls.UnitTests
 
                 ResetModuleLoadStates();
                 builder = AppBuilder.Configure<App>()
+                    .IgnoreSetupCheck()
                     .UseWindowingSubsystem(() => { })
                     .UseRenderingSubsystem(() => { }, "Skia");
                 builder.UseAvaloniaModules().SetupWithoutStarting();
@@ -99,13 +102,14 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-        [Fact (Skip = "We don't have rendering modules with dependencies right now")]
+        [Fact]
         public void LoadsRenderingModuleWithoutDependenciesWhenNoModuleMatches()
         {
             using (AvaloniaLocator.EnterScope())
             {
                 ResetModuleLoadStates();
                 var builder = AppBuilder.Configure<App>()
+                    .IgnoreSetupCheck()
                     .UseWindowingSubsystem(() => { })
                     .UseRenderingSubsystem(() => { }, "TBD");
                 builder.UseAvaloniaModules().SetupWithoutStarting();