fixed the test to be run sequentially

dansiegel · Mar 25, 2020 · a66cdc9 · a66cdc9
1 parent 2628cd4
commit a66cdc9
Show file tree

Hide file tree

Showing 7 changed files with 323 additions and 420 deletions.
diff --git a/src/Prism.DryIoc.Extensions/PrismContainerExtension.cs b/src/Prism.DryIoc.Extensions/PrismContainerExtension.cs
@@ -35,7 +35,8 @@ public static IContainerExtension<IContainer> Current
         internal static void Reset()
         {
             _current = null;
-            GC.Collect();
+            GC.Collect(Int32.MaxValue, GCCollectionMode.Forced);
+            GC.WaitForFullGCComplete();
         }
 
         public static IContainerExtension Create() =>

diff --git a/src/Prism.Unity.Extensions/PrismContainerExtension.cs b/src/Prism.Unity.Extensions/PrismContainerExtension.cs
@@ -49,6 +49,7 @@ public static IContainerExtension Create(IUnityContainer container)
 
             return new PrismContainerExtension(container);
         }
+
         private PrismContainerExtension()
            : this(new UnityContainer())
         {

diff --git a/...Prism.Container.Extensions.Shared.Tests/Prism.Container.Extensions.Shared.Tests.projitems b/...Prism.Container.Extensions.Shared.Tests/Prism.Container.Extensions.Shared.Tests.projitems
@@ -11,6 +11,7 @@
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)Mocks\GenericService.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Mocks\MockDbContext.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tests\SharedTestCollection.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tests\CommonAspNetServiceTests.cs" />
   </ItemGroup>
 </Project>
diff --git a/tests/Prism.Container.Extensions.Shared.Tests/Tests/CommonAspNetServiceTests.cs b/tests/Prism.Container.Extensions.Shared.Tests/Tests/CommonAspNetServiceTests.cs
@@ -17,8 +17,14 @@
 
 namespace Prism.Container.Extensions.Shared.Tests
 {
+    [Collection(nameof(SharedTests))]
     public class CommonAspNetServiceTests
     {
+        public CommonAspNetServiceTests()
+        {
+            PrismContainerExtension.Reset();
+        }
+
         [Fact]
         public void CreatingServicesDoesNotThrowException()
         {
@@ -91,7 +97,6 @@ public void ScopingProvidesNewInstance()
         [Fact]
         public void RegisterServicesExtensionsAddsServicesToContainer()
         {
-            PrismContainerExtension.Reset();
             PrismContainerExtension.Current.RegisterServices(s =>
             {
                 s.AddHttpClient();
@@ -102,7 +107,6 @@ public void RegisterServicesExtensionsAddsServicesToContainer()
 
         private void ConfigureServices()
         {
-            PrismContainerExtension.Reset();
             var services = new ServiceCollection();
             services.AddDbContext<MockDbContext>(o => o.UseInMemoryDatabase("test"));
             services.AddHttpClient();

diff --git a/tests/Prism.Container.Extensions.Shared.Tests/Tests/SharedTestCollection.cs b/tests/Prism.Container.Extensions.Shared.Tests/Tests/SharedTestCollection.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xunit;
+
+namespace Prism.Container.Extensions.Shared.Tests
+{
+    public class SharedTests { }
+
+    [Collection(nameof(SharedTests))]
+    public class SharedTestCollection : ICollectionFixture<SharedTests>
+    {
+    }
+}