testit-tms · Jul 5, 2024 · Jul 5, 2024 · Jul 5, 2024 · Jul 5, 2024 · Jul 5, 2024
diff --git a/DotnetAdapters.sln b/DotnetAdapters.sln
@@ -12,15 +12,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TmsRunner", "TmsRunner\TmsR
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tms.Adapter", "Tms.Adapter\Tms.Adapter.csproj", "{B5482D1B-736D-4E8D-88D9-5242922B58D8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TmsRunnerTests", "TmsRunnerTests\TmsRunnerTests.csproj", "{5ACF7A63-C444-43D5-87A9-90D43801D28A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TmsRunnerTests", "TmsRunnerTests\TmsRunnerTests.csproj", "{5ACF7A63-C444-43D5-87A9-90D43801D28A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tms.Adapter.Core", "Tms.Adapter.Core\Tms.Adapter.Core.csproj", "{671EC822-3ED1-4797-850E-CA9952B8E5B3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tms.Adapter.Core", "Tms.Adapter.Core\Tms.Adapter.Core.csproj", "{671EC822-3ED1-4797-850E-CA9952B8E5B3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tms.Adapter.CoreTests", "Tms.Adapter.CoreTests\Tms.Adapter.CoreTests.csproj", "{11F581C6-4B0F-424C-8160-6F0C4055C4F2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tms.Adapter.CoreTests", "Tms.Adapter.CoreTests\Tms.Adapter.CoreTests.csproj", "{11F581C6-4B0F-424C-8160-6F0C4055C4F2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tms.Adapter.XUnit", "Tms.Adapter.XUnit\Tms.Adapter.XUnit.csproj", "{B5612734-4F6B-4801-9D17-5A1195C8D2A0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tms.Adapter.XUnit", "Tms.Adapter.XUnit\Tms.Adapter.XUnit.csproj", "{B5612734-4F6B-4801-9D17-5A1195C8D2A0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tms.Adapter.SpecFlowPlugin", "Tms.Adapter.SpecFlowPlugin\Tms.Adapter.SpecFlowPlugin.csproj", "{47C8A533-91F4-43E9-B75B-5DA46A9A05AD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tms.Adapter.SpecFlowPlugin", "Tms.Adapter.SpecFlowPlugin\Tms.Adapter.SpecFlowPlugin.csproj", "{47C8A533-91F4-43E9-B75B-5DA46A9A05AD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Tms.Adapter.Core/Configurator/Configurator.cs b/Tms.Adapter.Core/Configurator/Configurator.cs
@@ -1,5 +1,6 @@
 using System.Configuration;
-using System.Text.Json;
+
+using Newtonsoft.Json;
 
 namespace Tms.Adapter.Core.Configurator;
 
@@ -16,7 +17,6 @@ public static class Configurator
     private const string TmsAutomaticUpdationLinksToTestCases = "TMS_AUTOMATIC_UPDATION_LINKS_TO_TEST_CASES";
     private const string TmsCertValidation = "TMS_CERT_VALIDATION";
     private const string ConfigFile = "TMS_CONFIG_FILE";
-    private static readonly JsonSerializerOptions SerializerOptions = new() { PropertyNameCaseInsensitive = true };
 
     public static TmsSettings GetConfig()
     {
@@ -31,7 +31,7 @@ public static TmsSettings GetConfig()
 
         if (File.Exists(defaultJsonConfigPath))
         {
-            var fileConfig = JsonSerializer.Deserialize<TmsSettings>(File.ReadAllText(defaultJsonConfigPath), SerializerOptions);
+            var fileConfig = JsonConvert.DeserializeObject<TmsSettings>(File.ReadAllText(defaultJsonConfigPath));
 
             if (fileConfig != null)
             {

diff --git a/Tms.Adapter.Core/Tms.Adapter.Core.csproj b/Tms.Adapter.Core/Tms.Adapter.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-		<Version>1.6.1</Version>
+		<Version>1.6.2</Version>
         <TargetFramework>netstandard2.1</TargetFramework>
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>
@@ -42,12 +42,12 @@
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
       <PackageReference Include="Serilog" Version="3.1.1" />
       <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
       <PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
       <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
       <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
-      <PackageReference Include="System.Text.Json" Version="7.0.2" />
       <PackageReference Include="TestIt.ApiClient" Version="3.0.0" />
     </ItemGroup>
 

diff --git a/Tms.Adapter.CoreTests/Client/ClientTests.cs b/Tms.Adapter.CoreTests/Client/ClientTests.cs
@@ -84,16 +84,39 @@ await Assert
     }
 
     [TestMethod]
-    public async Task TryLinkAutoTestToWorkItems()
+    public async Task GetWorkItemsLinkedToAutoTest()
     {
         // Arrange
         var client = new TmsClient(_logger, _settings);
         var id = Guid.NewGuid().ToString();
-        var workItemIds = Array.Empty<string>();
 
         // Act & Assert
         await Assert.ThrowsExceptionAsync<ApiException>(async () =>
-            await client.TryLinkAutoTestToWorkItems(id, workItemIds).ConfigureAwait(false)).ConfigureAwait(false);
+            await client.GetWorkItemsLinkedToAutoTest(id).ConfigureAwait(false)).ConfigureAwait(false);
+    }
+
+    [TestMethod]
+    public async Task DeleteAutoTestLinkFromWorkItem()
+    {
+        // Arrange
+        var client = new TmsClient(_logger, _settings);
+        var id = Guid.NewGuid().ToString();
+        const string workItemId = "";
+
+        // Act & Assert
+        await client.DeleteAutoTestLinkFromWorkItem(id, workItemId).ConfigureAwait(false);
+    }
+
+    [TestMethod]
+    public async Task LinkAutoTestToWorkItems()
+    {
+        // Arrange
+        var client = new TmsClient(_logger, _settings);
+        var id = Guid.NewGuid().ToString();
+        var workItemIds = Array.Empty<string>();
+
+        // Act & Assert
+        await client.LinkAutoTestToWorkItems(id, workItemIds).ConfigureAwait(false);
     }
 
     [TestMethod]

diff --git a/Tms.Adapter.CoreTests/Writer/WriterTests.cs b/Tms.Adapter.CoreTests/Writer/WriterTests.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.Logging;
 using NSubstitute;
 using Tms.Adapter.Core.Client;
+using Tms.Adapter.Core.Configurator;
 using Tms.Adapter.Core.Models;
 
 namespace Tms.Adapter.CoreTests.Writer;
@@ -11,13 +12,14 @@ public class WriterTests
     private readonly ClassContainer _classContainer = Substitute.For<ClassContainer>();
     private readonly ITmsClient _client = Substitute.For<ITmsClient>();
     private readonly ILogger<Core.Writer.Writer> _logger = Substitute.For<ILogger<Core.Writer.Writer>>();
+    private readonly TmsSettings _settings = Substitute.For<TmsSettings>();
     private readonly TestContainer _testContainer = Substitute.For<TestContainer>();
 
     [TestMethod]
     public async Task WriteResults()
     {
         // Arrange
-        var writer = new Core.Writer.Writer(_logger, _client);
+        var writer = new Core.Writer.Writer(_logger, _client, _settings);
 
         // Act & Assert
         await writer.Write(_testContainer, _classContainer).ConfigureAwait(false);

diff --git a/Tms.Adapter.SpecFlowPlugin/Tms.Adapter.SpecFlowPlugin.csproj b/Tms.Adapter.SpecFlowPlugin/Tms.Adapter.SpecFlowPlugin.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-		<Version>1.6.1</Version>
+		<Version>1.6.2</Version>
         <TargetFramework>netstandard2.1</TargetFramework>
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>
@@ -38,6 +38,7 @@
 
     <ItemGroup>
       <PackageReference Include="SpecFlow" Version="3.9.74" />
+      <PackageReference Include="System.Text.Json" Version="8.0.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Tms.Adapter.SpecFlowPlugin/TmsTagParser.cs b/Tms.Adapter.SpecFlowPlugin/TmsTagParser.cs
@@ -1,9 +1,14 @@
 using System.Text.Json;
 using System.Text.Json.Nodes;
+
+using Newtonsoft.Json;
+
 using TechTalk.SpecFlow;
 using Tms.Adapter.Core.Models;
 using Tms.Adapter.Core.Utils;
 
+using JsonException = System.Text.Json.JsonException;
+
 namespace Tms.Adapter.SpecFlowPlugin;
 
 public static class TmsTagParser
@@ -18,10 +23,6 @@ public static class TmsTagParser
     private const string Links = "LINKS";
     private const string WorkItemIds = "WORKITEMIDS";
 
-    private static readonly JsonSerializerOptions Options = new JsonSerializerOptions
-        { PropertyNameCaseInsensitive = true };
-
-
     public static TestContainer AddTags(TestContainer testContainer, FeatureInfo featureInfo,
         ScenarioInfo scenarioInfo, Dictionary<string, string> parameters)
     {
@@ -145,11 +146,11 @@ private static bool IsJsonArray(this string? source)
 
     private static LinkItem? GetLink(string source)
     {
-        return JsonSerializer.Deserialize<LinkItem>(source, Options);
+        return JsonConvert.DeserializeObject<LinkItem>(source);
     }
 
     private static List<LinkItem?>? GetLinks(string source)
     {
-        return JsonSerializer.Deserialize<List<LinkItem?>>(source, Options);
+        return JsonConvert.DeserializeObject<List<LinkItem?>>(source);
     }
 }
diff --git a/Tms.Adapter/Adapter.cs b/Tms.Adapter/Adapter.cs
@@ -1,5 +1,7 @@
 using System.Diagnostics;
-using System.Text.Json;
+
+using Newtonsoft.Json;
+
 using Tms.Adapter.Models;
 
 namespace Tms.Adapter;
@@ -8,19 +10,19 @@
 {
     public static void AddLinks(params Link[] links)
     {
-        Console.WriteLine($"{MessageType.TmsStepLinks}: " + JsonSerializer.Serialize(links));
+        Console.WriteLine($"{MessageType.TmsStepLinks}: " + JsonConvert.SerializeObject(links));
     }
 
     public static void AddLinks(string url, string? title = null, string? description = null,
         LinkType? type = null)
     {
-        Console.WriteLine($"{MessageType.TmsStepLinks}: " + JsonSerializer.Serialize(new List<Link>
+        Console.WriteLine($"{MessageType.TmsStepLinks}: " + JsonConvert.SerializeObject(new List<Link>
         {
             new Link
             {
                Title = title,
                Url = url,
                Description = description,
                Type = type
            }
        }));
@@ -36,7 +38,7 @@
         var fullPath = Path.GetFullPath(pathToFile);
 
         Console.WriteLine($"{MessageType.TmsStepAttachment}: " +
-                          JsonSerializer.Serialize(new Models.File
+                          JsonConvert.SerializeObject(new Models.File
                               { PathToFile = fullPath, CallerMemberName = memberName }));
     }
 
@@ -56,7 +58,7 @@
             .Replace("$_executor_", string.Empty);
 
         Console.WriteLine($"{MessageType.TmsStepAttachmentAsText}: " +
-                          JsonSerializer.Serialize(new Models.File
+                          JsonConvert.SerializeObject(new Models.File
                               { Name = name, Content = content, CallerMemberName = memberName }));
     }
 

diff --git a/Tms.Adapter/Attributes/ParameterizedAttribute.cs b/Tms.Adapter/Attributes/ParameterizedAttribute.cs
@@ -1,5 +1,7 @@
-using System.Text.Json;
-using MethodBoundaryAspect.Fody.Attributes;
+using MethodBoundaryAspect.Fody.Attributes;
+
+using Newtonsoft.Json;
+
 using Tms.Adapter.Models;
 
 namespace Tms.Adapter.Attributes;
@@ -14,7 +16,7 @@ public override void OnEntry(MethodExecutionArgs arg)
             .Zip(arguments, (k, v) => new { k, v })
             .ToDictionary(x => x.k, x => x.v);
 
-        Console.WriteLine($"{MessageType.TmsParameters}: " + JsonSerializer.Serialize(args));
+        Console.WriteLine($"{MessageType.TmsParameters}: " + JsonConvert.SerializeObject(args));
     }
 }
 

diff --git a/Tms.Adapter/Attributes/StepAttribute.cs b/Tms.Adapter/Attributes/StepAttribute.cs
@@ -1,8 +1,10 @@
 using System.Diagnostics;
 using System.Reflection;
-using System.Text.Json;
 using System.Text.RegularExpressions;
 using MethodBoundaryAspect.Fody.Attributes;
+
+using Newtonsoft.Json;
+
 using Tms.Adapter.Models;
 using Tms.Adapter.Utils;
 
@@ -128,7 +130,7 @@
             CurrentMethodType = _currentMethodType
         };
 
-        Console.WriteLine($"{MessageType.TmsStep}: " + JsonSerializer.Serialize(step));
+        Console.WriteLine($"{MessageType.TmsStep}: " + JsonConvert.SerializeObject(step));
     }
 
     public override void OnExit(MethodExecutionArgs arg)
@@ -141,7 +143,7 @@
        WriteData("Failed");
    }

    private void WriteData(string outcome, object result = null)
    {
        _completedAt = DateTime.UtcNow;

@@ -154,6 +156,6 @@
             Outcome = outcome
         };
 
-        Console.WriteLine($"{MessageType.TmsStepResult}: " + JsonSerializer.Serialize(stepResult));
+        Console.WriteLine($"{MessageType.TmsStepResult}: " + JsonConvert.SerializeObject(stepResult));
     }
 }
diff --git a/Tms.Adapter/Tms.Adapter.csproj b/Tms.Adapter/Tms.Adapter.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <Version>1.6.1</Version>
+        <Version>1.6.2</Version>
         <TargetFramework>netstandard2.1</TargetFramework>
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>
@@ -40,7 +40,7 @@
         <PackageReference Include="Fody" Version="6.6.4" />
         <PackageReference Include="MethodBoundaryAspect.Fody" Version="2.0.148" />
         <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.9.0" />
-        <PackageReference Include="System.Text.Json" Version="7.0.2" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 
 </Project>
diff --git a/TmsRunner/Services/ProcessorService.cs b/TmsRunner/Services/ProcessorService.cs
@@ -1,7 +1,9 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+
+using Newtonsoft.Json;
+
 using System.Text;
-using System.Text.Json;
 using System.Text.RegularExpressions;
 using Tms.Adapter.Models;
 using TmsRunner.Entities;
@@ -31,7 +33,7 @@ private async Task<List<Step>> GetStepsWithAttachmentsAsync(string? traceJson, L
             {
                 case MessageType.TmsStep:
                     {
-                        var step = JsonSerializer.Deserialize<Step>(message.Value ?? string.Empty);
+                        var step = JsonConvert.DeserializeObject<Step>(message.Value ?? string.Empty);
                         if (step == null)
                         {
                             logger.LogWarning("Can not deserialize step: {Step}", message.Value);
@@ -77,7 +79,7 @@ private async Task<List<Step>> GetStepsWithAttachmentsAsync(string? traceJson, L
                     }
                 case MessageType.TmsStepResult:
                     {
-                        var stepResult = JsonSerializer.Deserialize<StepResult>(message.Value ?? string.Empty);
+                        var stepResult = JsonConvert.DeserializeObject<StepResult>(message.Value ?? string.Empty);
 
                         if (stepResult == null)
                         {
@@ -96,7 +98,7 @@ private async Task<List<Step>> GetStepsWithAttachmentsAsync(string? traceJson, L
                     }
                 case MessageType.TmsStepAttachmentAsText:
                     {
-                        var attachment = JsonSerializer.Deserialize<File>(message.Value ?? string.Empty);
+                        var attachment = JsonConvert.DeserializeObject<File>(message.Value ?? string.Empty);
                         using var ms = new MemoryStream(Encoding.UTF8.GetBytes(attachment!.Content));
                         var createdAttachment =
                             await apiClient.UploadAttachmentAsync(Path.GetFileName(attachment.Name), ms).ConfigureAwait(false);
@@ -117,7 +119,7 @@ private async Task<List<Step>> GetStepsWithAttachmentsAsync(string? traceJson, L
                     }
                 case MessageType.TmsStepAttachment:
                     {
-                        var file = JsonSerializer.Deserialize<File>(message.Value ?? string.Empty);
+                        var file = JsonConvert.DeserializeObject<File>(message.Value ?? string.Empty);
 
                         if (System.IO.File.Exists(file!.PathToFile))
                         {

diff --git a/TmsRunner/TmsRunner.csproj b/TmsRunner/TmsRunner.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<Version>1.6.1</Version>
+	<Version>1.6.2</Version>
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

diff --git a/TmsRunner/Utils/Converter.cs b/TmsRunner/Utils/Converter.cs
@@ -66,7 +66,7 @@ public static AutoTestResultsForTestRunModel ConvertResultToModel(AutoTestResult
                 l.Title,
                 l.Url,
                 l.Description,
-                Enum.Parse<LinkType>(l.Type.ToString()!))
+                Enum.TryParse<LinkType>(l.Type?.ToString(), true, out var result) ? result : null)
         ).ToList();
 
         return new AutoTestResultsForTestRunModel(

diff --git a/TmsRunner/Utils/LogParser.cs b/TmsRunner/Utils/LogParser.cs
@@ -1,5 +1,7 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-using System.Text.Json;
+
+using Newtonsoft.Json;
+
 using System.Text.RegularExpressions;
 using Tms.Adapter.Attributes;
 using Tms.Adapter.Models;
@@ -19,7 +21,7 @@ public sealed class LogParser(Replacer replacer)
         var match = regex.Match(traceJson);
         var json = match.Groups[1].Value;
 
-        return string.IsNullOrEmpty(json) ? null : JsonSerializer.Deserialize<Dictionary<string, string>>(json);
+        return string.IsNullOrEmpty(json) ? null : JsonConvert.DeserializeObject<Dictionary<string, string>>(json);
     }
 
     public static string GetMessage(string traceJson)
@@ -45,7 +47,7 @@ public static string GetMessage(string traceJson)
 
         var linksJsonArray = $"[ {string.Join(", ", matches.Select(m => m.Groups[1].Value))} ]";
 
-        return JsonSerializer.Deserialize<List<Link>>(linksJsonArray);
+        return JsonConvert.DeserializeObject<List<Link>>(linksJsonArray);
     }
 
     // TODO: write unit tests