Endpoint resolver issue

Kepware.Api.Test/ApiClient/AutomaticTagGenerationAsyncTests.cs

@@ -48,11 +48,15 @@ public async Task AutomaticTagGenerationAsync_ShouldReturnKepServerJobPromise_Wh
 
             // Act
             var result = await _kepwareApiClient.ApiServices.AutomaticTagGenerationAsync(UNIT_TEST_CHANNEL, UNIT_TEST_DEVICE, TimeSpan.FromSeconds(30));
+            var jobResult = await result.AwaitCompletionAsync();
 
             // Assert
             result.ShouldNotBeNull();
             result.Endpoint.ShouldBe(ENDPOINT_TAG_GENERATION);
             result.JobTimeToLive.ShouldBe(TimeSpan.FromSeconds(30));
+            jobResult.Value.ShouldBeFalse();
+            jobResult.IsSuccess.ShouldBeFalse();
+            jobResult.ResponseCode.ShouldBe(ApiResponseCode.BadRequest);
         }
 
         [Fact]
@@ -113,6 +117,7 @@ public async Task AutomaticTagGenerationAsync_ShouldReturnSuccess_WhenJobComplet
             // Assert
             completionResult.Value.ShouldBeTrue();
             completionResult.IsSuccess.ShouldBeTrue();
+            completionResult.ResponseCode.ShouldBe(ApiResponseCode.Success);
         }
 
         [Fact]
@@ -135,6 +140,7 @@ public async Task AutomaticTagGenerationAsync_ShouldReturnSuccess_WhenJobComplet
             // Assert
             completionResult.Value.ShouldBeTrue();
             completionResult.IsSuccess.ShouldBeTrue();
+            completionResult.ResponseCode.ShouldBe(ApiResponseCode.Success);
         }
 
         [Fact]
@@ -155,6 +161,7 @@ public async Task AutomaticTagGenerationAsync_ShouldReturnFailure_WhenJobFailsAf
             // Assert
             completionResult.Value.ShouldBeFalse();
             completionResult.IsSuccess.ShouldBeFalse();
+            completionResult.ResponseCode.ShouldBe(ApiResponseCode.Timeout);
         }
 
         [Fact]
@@ -180,6 +187,8 @@ public async Task AutomaticTagGenerationAsync_ShouldReturnFailure_WhenJobFailsAf
             // Assert
             completionResult.Value.ShouldBeFalse();
             completionResult.IsSuccess.ShouldBeFalse();
+            completionResult.ResponseCode.ShouldBe(ApiResponseCode.ServiceUnavailable);
+            completionResult.Message.ShouldBe(jobStatusFailed.Message);
         }
     }
 }

Kepware.Api.Test/ApiClient/GetProductInfo.cs

@@ -36,12 +36,14 @@ public async Task GetProductInfoAsync_ShouldReturnProductInfo_WhenApiRespondsSuc
 
         #region GetProductInfoAsync - SupportsJsonProjectLoadService
 
-        //TODO: Add more test cases for TKS versions as well. Different product name
         [Theory]
         [InlineData("KEPServerEX", "12", 6, 17, true)]  // Supports JSON Project Load Service (6.17+)
         [InlineData("KEPServerEX", "12", 6, 16, false)] // Does not support it (6.16)
-        [InlineData("ThingWorxKepwareEdge", "13", 1, 10, true)] // Supports it (1.10+)
+        [InlineData("ThingworxKepwareServer", "12", 6, 17, true)]  // Supports JSON Project Load Service (6.17+)
+        [InlineData("ThingworxKepwareServer", "12", 6, 16, false)] // Does not support it (6.16)
+        [InlineData("ThingWorxKepwareEdge", "13", 1, 10, true)] // Supports JSON Project Load Service (1.10+)
         [InlineData("ThingWorxKepwareEdge", "13", 1, 9, false)] // Does not support it (1.9)
+        [InlineData("Kepware Edge", "13", 1, 0, true)] // Supports JSON Project Load Service
         [InlineData("UnknownProduct", "99", 10, 0, false)] // Unknown product, should be false
         public async Task GetProductInfoAsync_ShouldReturnCorrect_SupportsJsonProjectLoadService(
             string productName, string productId, int majorVersion, int minorVersion, bool expectedResult)
@@ -62,8 +64,10 @@ public async Task GetProductInfoAsync_ShouldReturnCorrect_SupportsJsonProjectLoa
         #region GetProductInfoAsync - ProductType
 
         [Theory]
-        [InlineData("KEPServerEX", "12", ProductType.KEPServerEX)]
-        [InlineData("ThingWorxKepwareEdge", "13", ProductType.ThingWorxKepwareEdge)]
+        [InlineData("KEPServerEX", "12", ProductType.KepwareServer)]
+        [InlineData("ThingworxKepwareServer", "12", ProductType.KepwareServer)]
+        [InlineData("ThingWorxKepwareEdge", "13", ProductType.KepwareEdge)]
+        [InlineData("Kepware Edge", "13", ProductType.KepwareEdge)]
         [InlineData("UnknownProduct", "99", ProductType.Unknown)]
         [InlineData("InvalidProduct", "abc", ProductType.Unknown)] // Invalid ID, should be Unknown
         public async Task GetProductInfoAsync_ShouldReturnCorrect_ProductType(

Kepware.Api.Test/ApiClient/LoadEntity.cs

@@ -352,7 +352,7 @@ public async Task LoadEntityAsync_ShouldReturnTagCollection_WhenApiRespondsSucce
                                    .ReturnsResponse(tagsJson, "application/json");
 
             // Act
-            var result = await _kepwareApiClient.GenericConfig.LoadCollectionAsync<DeviceTagGroupTagCollection, Tag>(new DeviceTagGroup("B Registers", new Device("16 Bit Device", "Data Type Examples")));
+            var result = await _kepwareApiClient.GenericConfig.LoadCollectionAsync<DeviceTagCollection, Tag>(new DeviceTagGroup("B Registers", new Device("16 Bit Device", "Data Type Examples")));
 
             // Assert
             Assert.NotNull(result);
@@ -363,15 +363,15 @@ public async Task LoadEntityAsync_ShouldReturnTagCollection_WhenApiRespondsSucce
 
         #endregion
 
-        #region LoadEntityAsync - Exception Fall
+        #region LoadEntityAsync - Exception Fail
 
         [Fact]
         public async Task LoadEntityAsync_ShouldThrowInvalidOperationException_WhenLoadRecursiveEndpointWithStringList()
         {
             // Act & Assert
             var exception = await Assert.ThrowsAsync<InvalidOperationException>(async () =>
             {
-                await _kepwareApiClient.GenericConfig.LoadCollectionAsync<DeviceTagGroupTagCollection, Tag>(["Data Type Examples", "16 Bit Device", "B Registers"]);
+                await _kepwareApiClient.GenericConfig.LoadCollectionAsync<DeviceTagCollection, Tag>(["Data Type Examples", "16 Bit Device", "B Registers"]);
             });
 
             Assert.Equal("Recursive endpoint does not support string list item name", exception.Message);

Kepware.Api.Test/ApiClient/ProjectApiHandlerTests.cs

@@ -79,6 +79,49 @@ public async Task GetOrCreateChannelAsync_ShouldCreateChannel_WhenChannelDoesNot
             Assert.Equal(channelName, result.Name);
         }
 
+        [Fact]
+        public async Task GetChannelAsync_ShouldReturnChannel_WhenChannelExists()
+        {
+            // Arrange
+            var channelName = "ExistingChannel";
+            var channelJson = """
+                {
+                    "PROJECT_ID": 676550906,
+                    "common.ALLTYPES_NAME": "ExistingChannel",
+                    "common.ALLTYPES_DESCRIPTION": "Example Channel",
+                    "servermain.MULTIPLE_TYPES_DEVICE_DRIVER": "Simulator"
+                }
+                """;
+
+            _httpMessageHandlerMock.SetupRequest(HttpMethod.Get, TEST_ENDPOINT + $"/config/v1/project/channels/{channelName}")
+                                   .ReturnsResponse(channelJson, "application/json");
+
+            // Act
+            var result = await _projectApiHandler.Channels.GetChannelAsync(channelName);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Equal(channelName, result.Name);
+        }
+
+        [Fact]
+        public async Task GetChannelAsync_ShouldReturnNull_WhenChannelDoesNotExist()
+        {
+            // Arrange
+            await ConfigureToServeDrivers();
+
+            var channelName = "NewChannel";
+
+            _httpMessageHandlerMock.SetupRequest(HttpMethod.Get, TEST_ENDPOINT + $"/config/v1/project/channels/{channelName}")
+                                   .ReturnsResponse(HttpStatusCode.NotFound);
+
+            // Act
+            var result = await _projectApiHandler.Channels.GetChannelAsync(channelName);
+
+            // Assert
+            Assert.Null(result);
+        }
+
         [Fact]
         public async Task UpdateChannelAsync_ShouldReturnTrue_WhenUpdateIsSuccessful()
         {
@@ -190,6 +233,57 @@ public async Task GetOrCreateDeviceAsync_ShouldCreateDevice_WhenDeviceDoesNotExi
             Assert.Equal(deviceName, result.Name);
         }
 
+        [Fact]
+        public async Task GetDeviceAsync_ShouldReturnDevice_WhenDeviceExists()
+        {
+            // Arrange
+            await ConfigureToServeDrivers();
+            var channel = new Channel { Name = "ExistingChannel" };
+            var deviceName = "ExistingDevice";
+            var deviceJson = """
+                {
+                    "PROJECT_ID": 676550906,
+                    "common.ALLTYPES_NAME": "ExistingDevice",
+                    "common.ALLTYPES_DESCRIPTION": "Example Device",
+                    "servermain.DEVICE_CHANNEL_ASSIGNMENT": "ExistingChannel"
+                }
+                """;
+
+            _httpMessageHandlerMock.SetupRequest(HttpMethod.Get, TEST_ENDPOINT + $"/config/v1/project/channels/{channel.Name}/devices/{deviceName}")
+                                   .ReturnsResponse(deviceJson, "application/json");
+
+            _httpMessageHandlerMock.SetupRequest(HttpMethod.Get, TEST_ENDPOINT + $"/config/v1/project/channels/{channel.Name}/devices/{deviceName}/tags")
+                                .ReturnsResponse("[]", "application/json");
+
+            _httpMessageHandlerMock.SetupRequest(HttpMethod.Get, TEST_ENDPOINT + $"/config/v1/project/channels/{channel.Name}/devices/{deviceName}/tag_groups")
+                                .ReturnsResponse("[]", "application/json");
+
+            // Act
+            var result = await _projectApiHandler.Devices.GetDeviceAsync(channel, deviceName);
+
+            // Assert
+            Assert.NotNull(result);
+            Assert.Equal(deviceName, result.Name);
+        }
+
+        [Fact]
+        public async Task GetDeviceAsync_ShouldReturnNull_WhenDeviceDoesNotExist()
+        {
+            // Arrange
+            await ConfigureToServeDrivers();
+            var channel = new Channel { Name = "ExistingChannel", DeviceDriver = "Simulator" };
+            var deviceName = "NewDevice";
+
+            _httpMessageHandlerMock.SetupRequest(HttpMethod.Get, TEST_ENDPOINT + $"/config/v1/project/channels/{channel.Name}/devices/{deviceName}")
+                                   .ReturnsResponse(HttpStatusCode.NotFound);
+
+            // Act
+            var result = await _projectApiHandler.Devices.GetDeviceAsync(channel, deviceName);
+
+            // Assert
+            Assert.Null(result);
+        }
+
         [Fact]
         public async Task UpdateDeviceAsync_ShouldReturnTrue_WhenUpdateIsSuccessful()
         {
@@ -269,7 +363,8 @@ public async Task LoadTagGroupsRecursiveAsync_ShouldLoadTagGroupsCorrectly()
                         .ReturnsResponse("[]", "application/json");
 
             var tagGroup = new DeviceTagGroup { Name = "TagGroup1", Owner = device };
-            var tagGroups = new List<DeviceTagGroup> { tagGroup };
+            var tagGroup2 = new DeviceTagGroup { Name = "TagGroup1", Owner = tagGroup };
+            var tagGroups = new List<DeviceTagGroup> { tagGroup , tagGroup2 };
 
             // Act
             await ProjectApiHandler.LoadTagGroupsRecursiveAsync(_kepwareApiClient, tagGroups);
@@ -278,6 +373,8 @@ public async Task LoadTagGroupsRecursiveAsync_ShouldLoadTagGroupsCorrectly()
             Assert.NotNull(tagGroup.TagGroups);
             Assert.Single(tagGroup.TagGroups);
             Assert.Equal("TagGroup1", tagGroup.TagGroups.First().Name);
+            Assert.NotNull(tagGroup2.TagGroups);
+            Assert.Empty(tagGroup2.TagGroups);
         }
 
         #endregion

Kepware.Api.Test/ApiClient/ProjectLoadTests.cs

@@ -165,7 +165,7 @@ private static void CompareTagGroupsRecursive(DeviceTagGroupCollection? expected
                 var thisName = parentName + "/" + ExpectedTagGroup.Name;
                 if (ExpectedTagGroup.Tags?.Count > 0 || ActualTagGroup.Tags?.Count > 0)
                 {
-                    var tagCompareResult = EntityCompare.Compare<DeviceTagGroupTagCollection, Tag>(ExpectedTagGroup.Tags, ExpectedTagGroup.Tags);
+                    var tagCompareResult = EntityCompare.Compare<DeviceTagCollection, Tag>(ExpectedTagGroup.Tags, ExpectedTagGroup.Tags);
                     tagCompareResult.ShouldNotBeNull();
                     tagCompareResult.UnchangedItems.ShouldNotBeEmpty($"All tags in device {thisName} should be unchanged.");
                     tagCompareResult.ChangedItems.ShouldBeEmpty($"No tags in device {thisName} should be changed.");

Kepware.Api.Test/ApiClient/ReinitializeRuntimeAsyncTests.cs

@@ -46,11 +46,16 @@ public async Task ReinitializeRuntimeAsync_ShouldReturnKepServerJobPromise_WhenA
 
             // Act
             var result = await _kepwareApiClient.ApiServices.ReinitializeRuntimeAsync(TimeSpan.FromSeconds(30));
-
+            var jobResult = await result.AwaitCompletionAsync();
+
             // Assert
             result.ShouldNotBeNull();
             result.Endpoint.ShouldBe("/config/v1/project/services/ReinitializeRuntime");
             result.JobTimeToLive.ShouldBe(TimeSpan.FromSeconds(30));
+            jobResult.Value.ShouldBeFalse();
+            jobResult.IsSuccess.ShouldBeFalse();
+            jobResult.ResponseCode.ShouldBe(ApiResponseCode.BadRequest);
+
         }
 
         [Fact]
@@ -111,6 +116,7 @@ public async Task ReinitializeRuntimeAsync_ShouldReturnSuccess_WhenJobCompletesS
             // Assert
             completionResult.Value.ShouldBeTrue();
             completionResult.IsSuccess.ShouldBeTrue();
+            completionResult.ResponseCode.ShouldBe(ApiResponseCode.Success);
         }
 
         [Fact]
@@ -133,6 +139,7 @@ public async Task ReinitializeRuntimeAsync_ShouldReturnSuccess_WhenJobCompletesS
             // Assert
             completionResult.Value.ShouldBeTrue();
             completionResult.IsSuccess.ShouldBeTrue();
+            completionResult.ResponseCode.ShouldBe(ApiResponseCode.Success);
         }
 
         [Fact]
@@ -153,6 +160,8 @@ public async Task ReinitializeRuntimeAsync_ShouldReturnFailure_WhenJobFailsAfter
             // Assert
             completionResult.Value.ShouldBeFalse();
             completionResult.IsSuccess.ShouldBeFalse();
+            completionResult.ResponseCode.ShouldBe(ApiResponseCode.Timeout);
+
         }
 
         [Fact]
@@ -178,6 +187,8 @@ public async Task ReinitializeRuntimeAsync_ShouldReturnFailure_WhenJobFailsAfter
             // Assert
             completionResult.Value.ShouldBeFalse();
             completionResult.IsSuccess.ShouldBeFalse();
+            completionResult.ResponseCode.ShouldBe(ApiResponseCode.ServiceUnavailable);
+            completionResult.Message.ShouldBe(jobStatusFailed.Message);
         }
     }
 }

Kepware.Api.Test/Util/EndpointResolverTests.cs

@@ -56,7 +56,7 @@ public void ResolveEndpoint_ShouldReturnCorrectRecursiveEndpoint()
             var owner = new DeviceTagGroup("Values", new DeviceTagGroup("B Registers", new Device("16 Bit Device", new Channel("Data Type Examples"))));
 
             // Act
-            var endpoint = EndpointResolver.ResolveEndpoint<DeviceTagGroupTagCollection>(owner);
+            var endpoint = EndpointResolver.ResolveEndpoint<DeviceTagCollection>(owner);
 
             // Assert
             Assert.Equal("/config/v1/project/channels/Data%20Type%20Examples/devices/16%20Bit%20Device/tag_groups/B%20Registers/tag_groups/Values/tags", endpoint);
@@ -98,7 +98,7 @@ public void ResolveEndpoint_ShouldThrowException_WhenRecursiveEndpointDoesNotSup
 
             // Act & Assert
             var exception = Assert.Throws<InvalidOperationException>(() =>
-                EndpointResolver.ResolveEndpoint<DeviceTagGroupTagCollection>(owner, "Boolean1")
+                EndpointResolver.ResolveEndpoint<DeviceTagCollection>(owner, "Boolean1")
             );
 
             Assert.Equal("Recursive endpoint does not support item name", exception.Message);

Kepware.Api.TestIntg/ApiClient/LoadEntity.cs

@@ -258,7 +258,7 @@ public async Task LoadEntityAsync_ShouldReturnTagCollection_WhenApiRespondsSucce
             var tagList = await AddSimulatorTestTags(device);
 
             // Act
-            var result = await _kepwareApiClient.GenericConfig.LoadCollectionAsync<DeviceTagGroupTagCollection, Tag>(device);
+            var result = await _kepwareApiClient.GenericConfig.LoadCollectionAsync<DeviceTagCollection, Tag>(device);
 
             // Assert
             Assert.NotNull(result);
@@ -318,7 +318,7 @@ public async Task LoadEntityAsync_ShouldReturnTagCollectionFromTagGroup_WhenApiR
                 var tagList = await AddSimulatorTestTags(tagGroup);
 
                 // Act
-                var result = await _kepwareApiClient.GenericConfig.LoadCollectionAsync<DeviceTagGroupTagCollection, Tag>(tagGroup);
+                var result = await _kepwareApiClient.GenericConfig.LoadCollectionAsync<DeviceTagCollection, Tag>(tagGroup);
 
                 // Assert
                 Assert.NotNull(result);