Move TestContext.json from run to test method scope

Author: C0nquistadore

src/Dibix.Testing/Utilities/TestMethodTestResultFileComposer.cs

@@ -2,7 +2,10 @@
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
+using System.Reflection;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
 
 namespace Dibix.Testing
 {
@@ -44,12 +47,39 @@ public void ZipTestOutput(string resultRunDirectory, IEnumerable<string> resultF
             RegisterResultFile(path);
         }
 
+        public void RegisterTextContextInfo(TestContext testContext) => AddResultFile("TestContext.json", JsonConvert.SerializeObject(testContext, new JsonSerializerSettings
+        {
+            Formatting = Formatting.Indented,
+            ContractResolver = new TestContextContractResolver()
+        }), testContext);
+
         public string AddResultFile(string fileName) => AddResultFile(fileName, _testContext);
 
         public string AddResultFile(string fileName, string content) => AddResultFile(fileName, content, _testContext);
 
         public string ImportResultFile(string filePath) => ImportResultFile(filePath, _testContext);
 
         public void RegisterResultFile(string path) => RegisterResultFile(path, _testContext);
+
+        private sealed class TestContextContractResolver : DefaultContractResolver, IContractResolver
+        {
+            protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
+            {
+                JsonProperty property = base.CreateProperty(member, memberSerialization);
+
+                JsonProperty result = member.DeclaringType?.FullName switch
+                {
+                    // Self referencing loop detected for property 'Context' with type 'Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.TestContextImplementation'. Path ''.
+                    "Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.TestContextImplementation" when property.PropertyName == "Context" => null,
+
+                    // We don't need this property for debugging purposes
+                    "Microsoft.VisualStudio.TestTools.UnitTesting.TestContext" when property.PropertyName == "CancellationTokenSource" => null,
+
+                    _ => property
+                };
+
+                return result;
+            }
+        }
     }
 }

src/Dibix.Testing/Utilities/TestResultFileManager.cs

@@ -40,6 +40,7 @@ public static TestResultFileManager FromTestContext(TestContext testContext, boo
             TestMethodTestResultFileComposer testMethodFileComposer = TestMethodTestResultFileComposer.Create(testContext, resultTestsDirectory);
             WinMergeComparisonComposer winMergeComparisonComposer = new WinMergeComparisonComposer(testMethodFileComposer, testRunFileComposer, testContext);
             TestResultFileManager resultFileComposer = new TestResultFileManager(testRunFileComposer, testMethodFileComposer, winMergeComparisonComposer, testContext, scope);
+            resultFileComposer.Initialize();
             return resultFileComposer;
         }
 
@@ -114,6 +115,14 @@ string FormatContent(EventLogEntry entry)
                       .Each((x, i) => composer.AddResultFile($"EventLogEntry_{i + 1}_{x.EntryType}.txt", FormatContent(x), _testContext));
         }
 
+        private void Initialize()
+        {
+            if (_scope == TestClassInstanceScope.AssemblyInitialize)
+                return;
+
+            _testMethodFileComposer.RegisterTextContextInfo(_testContext);
+        }
+
         private TestResultFileComposer GetTargetTestResultFileComposer(TestClassInstanceScope scope) => scope switch
         {
             TestClassInstanceScope.AssemblyInitialize => _testRunFileComposer,

src/Dibix.Testing/Utilities/TestRunTestResultFileComposer.cs

@@ -7,8 +7,6 @@
 using System.Reflection;
 using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
 
 namespace Dibix.Testing
 {
@@ -57,7 +55,6 @@ public void CopyTestOutput(IEnumerable<string> resultFiles)
 
         private void Initialize(TestContext testContext)
         {
-            EnsureTestContextDump(testContext);
             EnsureEnvironmentDump(testContext);
         }
 
@@ -67,12 +64,6 @@ private void ImportResultFiles(TestContext testContext)
                 testContext.AddResultFile(resultFile);
         }
 
-        private void EnsureTestContextDump(TestContext testContext) => AddResultFile("TestContext.json", JsonConvert.SerializeObject(testContext, new JsonSerializerSettings
-        {
-            Formatting = Formatting.Indented,
-            ContractResolver = new TestContextContractResolver()
-        }), testContext);
-
         private void EnsureEnvironmentDump(TestContext testContext)
         {
             IDictionary<string, object> environmentVariables = Environment.GetEnvironmentVariables()
@@ -134,26 +125,5 @@ private static string CreateTestRunDirectory(TestContext testContext)
             string path = Path.Combine(Path.GetTempPath(), "TestResults", directoryName, assemblyName);
             return path;
         }
-
-        private sealed class TestContextContractResolver : DefaultContractResolver, IContractResolver
-        {
-            protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
-            {
-                JsonProperty property = base.CreateProperty(member, memberSerialization);
-
-                JsonProperty result = member.DeclaringType?.FullName switch
-                {
-                    // Self referencing loop detected for property 'Context' with type 'Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.TestContextImplementation'. Path ''.
-                    "Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.TestContextImplementation" when property.PropertyName == "Context" => null,
-
-                    // We don't need this property for debugging purposes
-                    "Microsoft.VisualStudio.TestTools.UnitTesting.TestContext" when property.PropertyName == "CancellationTokenSource" => null,
-
-                    _ => property
-                };
-
-                return result;
-            }
-        }
     }
 }