Fix heartbeat tests

Azure · Feb 25, 2025 · 39215ff · 39215ff
1 parent d64d831
commit 39215ff
Showing 1 changed file with 19 additions and 21 deletions.
diff --git a/...ure.IIoT.OpcUa.Publisher.Module/tests/Sdk/ReferenceServer/BasicSamplesIntegrationTests.cs b/...ure.IIoT.OpcUa.Publisher.Module/tests/Sdk/ReferenceServer/BasicSamplesIntegrationTests.cs
@@ -78,35 +78,33 @@ public async Task CanSendHeartbeatToIoTHubTestAsync(MessageTimestamp timestamp,
 
             // Assert
             Assert.True(messages.Count > 1);
-            var message = messages[0].Message;
-            Assert.Equal("i=2271", message.GetProperty("NodeId").GetString());
-            Assert.NotEmpty(message.GetProperty("ApplicationUri").GetString());
-            Assert.NotEmpty(message.GetProperty("Timestamp").GetString());
-            Assert.True(message.GetProperty("SequenceNumber").GetUInt32() > 0);
-            _output.WriteLine(message.ToJsonString());
-            Assert.Equal("en-US", message.GetProperty("Value").GetProperty("Value").EnumerateArray().First().GetString());
-
-            var timestamps = new HashSet<DateTime> { message.GetProperty("Timestamp").GetDateTime() };
-            for (var i = 1; i < messages.Count; i++)
+            var timestamps = new HashSet<DateTime>();
+            for (var i = 0; i < messages.Count; i++)
             {
-                message = messages[i].Message;
-                Assert.Equal("i=2271", message.GetProperty("NodeId").GetString());
-                Assert.NotEmpty(message.GetProperty("ApplicationUri").GetString());
-                Assert.True(message.GetProperty("SequenceNumber").GetUInt32() > 0);
-                Assert.Equal("en-US", message.GetProperty("Value").GetProperty("Value").EnumerateArray().First().GetString());
-
-                if (timestamp == MessageTimestamp.PublishTime)
+                var message = messages[i].Message;
+                _output.WriteLine(message.ToJsonString());
+                if (!message.GetProperty("Value").TryGetProperty("StatusCode", out _))
                 {
-                    Assert.False(message.TryGetProperty("Timestamp", out _));
+                    Assert.Equal("i=2271", message.GetProperty("NodeId").GetString());
+                    Assert.NotEmpty(message.GetProperty("ApplicationUri").GetString());
+                    Assert.True(message.GetProperty("SequenceNumber").GetUInt32() > 0);
+                    Assert.Equal("en-US", message.GetProperty("Value").GetProperty("Value").EnumerateArray().First().GetString());
                 }
-                else
+
+                if (message.TryGetProperty("Timestamp", out _))
                 {
                     Assert.NotEmpty(message.GetProperty("Timestamp").GetString());
                     timestamps.Add(message.GetProperty("Timestamp").GetDateTime());
                 }
             }
-
-            Assert.Equal(timestamp != MessageTimestamp.PublishTime ? messages.Count : 1, timestamps.Count);
+            if (timestamp == MessageTimestamp.PublishTime)
+            {
+                Assert.NotEmpty(timestamps);
+            }
+            else
+            {
+                Assert.Equal(messages.Count, timestamps.Count);
+            }
         }
 
         [Theory]