Speeding up integration tests

DevTeam · Jan 24, 2024 · 98b18b9 · 98b18b9
1 parent ad027e7
commit 98b18b9
Show file tree

Hide file tree

Showing 27 changed files with 9 additions and 28 deletions.
diff --git a/build/PackTarget.cs b/build/PackTarget.cs
@@ -377,7 +377,8 @@ private string CreateGeneratorPackage(NuGetVersion packageVersion, CodeAnalysis
             ("configuration", _settings.Configuration),
             ("version", packageVersion.ToString()),
             ("AnalyzerRoslynVersion", analyzerRoslynVersion.ToString()),
-            ("AnalyzerRoslynPackageVersion", analyzerRoslynPackageVersion.ToString())
+            ("AnalyzerRoslynPackageVersion", analyzerRoslynPackageVersion.ToString()),
+            ("CI", "true")
         };
 
         var build = new MSBuild()

diff --git a/tests/Pure.DI.IntegrationTests/ArgsTests.cs b/tests/Pure.DI.IntegrationTests/ArgsTests.cs
@@ -2,7 +2,6 @@
 
 using Core;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class ArgsTests
 {
     [Fact]

diff --git a/tests/Pure.DI.IntegrationTests/ArrayInjectionTests.cs b/tests/Pure.DI.IntegrationTests/ArrayInjectionTests.cs
@@ -1,6 +1,5 @@
 namespace Pure.DI.IntegrationTests;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class ArrayInjectionTests
 {
     [Fact]

diff --git a/tests/Pure.DI.IntegrationTests/AutoBindingTests.cs b/tests/Pure.DI.IntegrationTests/AutoBindingTests.cs
@@ -1,6 +1,5 @@
 namespace Pure.DI.IntegrationTests;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class AutoBindingTests
 {
     [Fact]

diff --git a/tests/Pure.DI.IntegrationTests/BclInjectionTests.cs b/tests/Pure.DI.IntegrationTests/BclInjectionTests.cs
@@ -1,6 +1,5 @@
 namespace Pure.DI.IntegrationTests;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class BclInjectionTests
 {
     [Theory]

diff --git a/tests/Pure.DI.IntegrationTests/BenchmarksTests.cs b/tests/Pure.DI.IntegrationTests/BenchmarksTests.cs
@@ -1,6 +1,5 @@
 namespace Pure.DI.IntegrationTests;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class BenchmarksTests
 {
     private const string Models = """

diff --git a/tests/Pure.DI.IntegrationTests/CompositionInjectionTests.cs b/tests/Pure.DI.IntegrationTests/CompositionInjectionTests.cs
@@ -1,6 +1,5 @@
 namespace Pure.DI.IntegrationTests;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class CompositionInjectionTests
 {
     [Fact]

diff --git a/tests/Pure.DI.IntegrationTests/CtorTests.cs b/tests/Pure.DI.IntegrationTests/CtorTests.cs
@@ -1,7 +1,6 @@
 // ReSharper disable StringLiteralTypo
 namespace Pure.DI.IntegrationTests;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class CtorTests
 {
     [Fact]

diff --git a/tests/Pure.DI.IntegrationTests/EnumerableInjectionTests.cs b/tests/Pure.DI.IntegrationTests/EnumerableInjectionTests.cs
@@ -1,6 +1,5 @@
 namespace Pure.DI.IntegrationTests;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class EnumerableInjectionTests
 {
     [Theory]

diff --git a/tests/Pure.DI.IntegrationTests/FactoryTests.cs b/tests/Pure.DI.IntegrationTests/FactoryTests.cs
@@ -2,7 +2,6 @@
 
 using Core;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class FactoryTests
 {
     [Fact]

diff --git a/tests/Pure.DI.IntegrationTests/FieldInjectionTests.cs b/tests/Pure.DI.IntegrationTests/FieldInjectionTests.cs
@@ -1,6 +1,5 @@
 namespace Pure.DI.IntegrationTests;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class FieldInjectionTests
 {
     [Fact]

diff --git a/tests/Pure.DI.IntegrationTests/FuncTests.cs b/tests/Pure.DI.IntegrationTests/FuncTests.cs
@@ -1,6 +1,5 @@
 namespace Pure.DI.IntegrationTests;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class FuncTests
 {
     [Theory]

diff --git a/tests/Pure.DI.IntegrationTests/GenericsTests.cs b/tests/Pure.DI.IntegrationTests/GenericsTests.cs
@@ -1,6 +1,5 @@
 namespace Pure.DI.IntegrationTests;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class GenericsTests
 {
     [Fact]

diff --git a/tests/Pure.DI.IntegrationTests/GraphTests.cs b/tests/Pure.DI.IntegrationTests/GraphTests.cs
@@ -4,7 +4,6 @@ namespace Pure.DI.IntegrationTests;
 using Core;
 using Core.Models;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class GraphTests
 {
     [Fact]

diff --git a/tests/Pure.DI.IntegrationTests/IntegrationTestsCollectionDefinition.cs b/tests/Pure.DI.IntegrationTests/IntegrationTestsCollectionDefinition.cs
diff --git a/tests/Pure.DI.IntegrationTests/LifetimesTests.cs b/tests/Pure.DI.IntegrationTests/LifetimesTests.cs
@@ -1,6 +1,5 @@
 namespace Pure.DI.IntegrationTests;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class LifetimesTests
 {
     [Fact]

diff --git a/tests/Pure.DI.IntegrationTests/MethodInjectionTests.cs b/tests/Pure.DI.IntegrationTests/MethodInjectionTests.cs
@@ -1,6 +1,5 @@
 namespace Pure.DI.IntegrationTests;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class MethodInjectionTests
 {
     [Fact]

diff --git a/tests/Pure.DI.IntegrationTests/NamespaceTests.cs b/tests/Pure.DI.IntegrationTests/NamespaceTests.cs
@@ -1,6 +1,5 @@
 namespace Pure.DI.IntegrationTests;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class NamespaceTests
 {
     [Fact]

diff --git a/tests/Pure.DI.IntegrationTests/PartialMethodsTests.cs b/tests/Pure.DI.IntegrationTests/PartialMethodsTests.cs
@@ -1,6 +1,5 @@
 namespace Pure.DI.IntegrationTests;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class PartialMethodsTests
 {
     [Fact]

diff --git a/tests/Pure.DI.IntegrationTests/PropertyInjectionTests.cs b/tests/Pure.DI.IntegrationTests/PropertyInjectionTests.cs
@@ -1,6 +1,5 @@
 namespace Pure.DI.IntegrationTests;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class PropertyInjectionTests
 {
     [Fact]

diff --git a/tests/Pure.DI.IntegrationTests/Pure.DI.IntegrationTests.csproj b/tests/Pure.DI.IntegrationTests/Pure.DI.IntegrationTests.csproj
@@ -14,4 +14,8 @@
         </PackageReference>
     </ItemGroup>
 
+    <ItemGroup Condition="'$(CI)'!=''">
+        <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+    </ItemGroup>
+
 </Project>
diff --git a/tests/Pure.DI.IntegrationTests/ResolversTests.cs b/tests/Pure.DI.IntegrationTests/ResolversTests.cs
@@ -1,6 +1,5 @@
 namespace Pure.DI.IntegrationTests;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class ResolversTests
 {
     [Fact]

diff --git a/tests/Pure.DI.IntegrationTests/SetupTests.cs b/tests/Pure.DI.IntegrationTests/SetupTests.cs
@@ -2,7 +2,6 @@
 
 using Core;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class SetupTests
 {
     [Fact]

diff --git a/tests/Pure.DI.IntegrationTests/ShroedingersCatTests.cs b/tests/Pure.DI.IntegrationTests/ShroedingersCatTests.cs
@@ -1,6 +1,5 @@
 namespace Pure.DI.IntegrationTests;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class ShroedingersCatTests
 {
     [Fact]

diff --git a/tests/Pure.DI.IntegrationTests/TagsTests.cs b/tests/Pure.DI.IntegrationTests/TagsTests.cs
@@ -1,6 +1,5 @@
 namespace Pure.DI.IntegrationTests;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class TagsTests
 {
     [Fact]

diff --git a/tests/Pure.DI.IntegrationTests/TuplesTests.cs b/tests/Pure.DI.IntegrationTests/TuplesTests.cs
@@ -2,7 +2,6 @@
 
 using Core;
 
-[Collection(nameof(IntegrationTestsCollectionDefinition))]
 public class TuplesTests
 {
     [Fact]

diff --git a/tests/Pure.DI.IntegrationTests/xunit.runner.json b/tests/Pure.DI.IntegrationTests/xunit.runner.json
@@ -0,0 +1,3 @@
+{
+  "parallelizeTestCollections": false
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ @@
     using Core;
-    [Collection(nameof(IntegrationTestsCollectionDefinition))]
     public class ArgsTests
     {
         [Fact]
@@ Expand Down @@