Fix return type for get test item history endpoint

Fix #128
reportportal · Nov 2, 2023 · ebaef7a · ebaef7a
1 parent dbd5ae3
commit ebaef7a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 31 deletions.
diff --git a/src/ReportPortal.Client/Abstractions/Models/ItemAttribute.cs b/src/ReportPortal.Client/Abstractions/Models/ItemAttribute.cs
@@ -1,5 +1,4 @@
-using ReportPortal.Client.Converters;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace ReportPortal.Client.Abstractions.Models
 {

diff --git a/src/ReportPortal.Client/Abstractions/Responses/TestItemHistoryResponse.cs b/src/ReportPortal.Client/Abstractions/Responses/TestItemHistoryResponse.cs
@@ -1,35 +1,11 @@
-using ReportPortal.Client.Abstractions.Models;
-using ReportPortal.Client.Converters;
-using System;
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
+using System.Collections.Generic;
 
 namespace ReportPortal.Client.Abstractions.Responses
 {
     public class TestItemHistoryContainer
     {
         public string GroupingField { get; set; }
 
-        public IList<TestItemHistoryElement> Resources { get; set; }
-    }
-
-    public class TestItemHistoryElement
-    {
-        public string Name { get; set; }
-
-        [JsonConverter(typeof(JsonStringEnumConverterEx<Status>))]
-        public Status Status { get; set; }
-
-        public long LaunchNumber { get; set; }
-
-        public long LaunchId { get; set; }
-
-        [JsonConverter(typeof(DateTimeUnixEpochConverter))]
-        public DateTime StartTime { get; set; }
-
-        [JsonConverter(typeof(JsonStringEnumConverterEx<Status>))]
-        public Status LaunchStatus { get; set; }
-
         public IList<TestItemResponse> Resources { get; set; }
     }
 }
diff --git a/test/ReportPortal.Client.IntegrationTests/TestItem/TestItemFixture.cs b/test/ReportPortal.Client.IntegrationTests/TestItem/TestItemFixture.cs
@@ -634,10 +634,12 @@ public async Task GetTestItemHistory()
         {
             var launchName = Guid.NewGuid().ToString();
             var launch1 = await Service.Launch.StartAsync(new StartLaunchRequest { Name = launchName, StartTime = DateTime.UtcNow });
-            var test1 = await Service.TestItem.StartAsync(new StartTestItemRequest { LaunchUuid = launch1.Uuid, Name = "ABC", StartTime = DateTime.UtcNow });
+            var test1 = await Service.TestItem.StartAsync(new StartTestItemRequest
+            { LaunchUuid = launch1.Uuid, Name = "ABC", StartTime = DateTime.UtcNow, Attributes = new List<ItemAttribute> { new ItemAttribute() { Key = "k1", Value = "v1" } } });
 
             var launch2 = await Service.Launch.StartAsync(new StartLaunchRequest { Name = launchName, StartTime = DateTime.UtcNow });
-            var test2 = await Service.TestItem.StartAsync(new StartTestItemRequest { LaunchUuid = launch2.Uuid, Name = "ABC", StartTime = DateTime.UtcNow });
+            var test2 = await Service.TestItem.StartAsync(new StartTestItemRequest
+            { LaunchUuid = launch2.Uuid, Name = "ABC", StartTime = DateTime.UtcNow, Attributes = new List<ItemAttribute> { new ItemAttribute() { Key = "k1", Value = "v1" } } });
 
             var gotTest2 = await Service.TestItem.GetAsync(test2.Uuid);
 
@@ -647,12 +649,19 @@ public async Task GetTestItemHistory()
             var element = histories.Items.First().Resources.First();
             element.Name.Should().Be("ABC");
             element.Status.Should().Be(Status.InProgress);
+            element.Attributes.Should().BeEquivalentTo(new List<ItemAttribute> { new ItemAttribute() { Key = "k1", Value = "v1" } });
 
             var gotLaunch1 = await Service.Launch.GetAsync(launch1.Uuid);
             var gotLaunch2 = await Service.Launch.GetAsync(launch2.Uuid);
 
-            await Service.Launch.StopAsync(gotLaunch1.Id, new FinishLaunchRequest { EndTime = DateTime.UtcNow });
-            await Service.Launch.StopAsync(gotLaunch2.Id, new FinishLaunchRequest { EndTime = DateTime.UtcNow });
+            await Service.Launch.StopAsync(gotLaunch1.Id, new FinishLaunchRequest
+            {
+                EndTime = DateTime.UtcNow
+            });
+            await Service.Launch.StopAsync(gotLaunch2.Id, new FinishLaunchRequest
+            {
+                EndTime = DateTime.UtcNow
+            });
 
             await Service.Launch.DeleteAsync(gotLaunch1.Id);
             await Service.Launch.DeleteAsync(gotLaunch2.Id);