test updates

Author: GarrettBeatty

test/AWS.Messaging.UnitTests/SerializationTests/EnvelopeSerializerTests.cs

@@ -478,42 +478,64 @@ public async Task SerializeAsync_DataMessageLogging_NoError(bool dataMessageLogg
     [InlineData(true)]
     public async Task SerializeAsync_DataMessageLogging_WithError(bool dataMessageLogging)
     {
+        // ARRANGE
         var logger = new Mock<ILogger<EnvelopeSerializer>>();
         var messageConfiguration = new MessageConfiguration { LogMessageContent = dataMessageLogging };
         var messageSerializer = new Mock<IMessageSerializer>();
         var dateTimeHandler = new Mock<IDateTimeHandler>();
         var messageIdGenerator = new Mock<IMessageIdGenerator>();
         var messageSourceHandler = new Mock<IMessageSourceHandler>();
-        var envelopeSerializer = new EnvelopeSerializer(logger.Object, messageConfiguration, messageSerializer.Object, dateTimeHandler.Object, messageIdGenerator.Object, messageSourceHandler.Object);
-        var messageEnvelope = new MessageEnvelope<MessageEnvelope>
+        var envelopeSerializer = new EnvelopeSerializer(
+            logger.Object, 
+            messageConfiguration, 
+            messageSerializer.Object, 
+            dateTimeHandler.Object, 
+            messageIdGenerator.Object, 
+            messageSourceHandler.Object);
+
+        var messageEnvelope = new MessageEnvelope<AddressInfo>
         {
             Id = "123",
             Source = new Uri("/aws/messaging", UriKind.Relative),
             Version = "1.0",
             MessageTypeIdentifier = "addressInfo",
             TimeStamp = _testdate,
-            Message = new MessageEnvelope<MessageEnvelope>
+            Message = new AddressInfo
             {
-                Id = "123",
-                Source = new Uri("/aws/messaging", UriKind.Relative),
-                Version = "1.0",
-                MessageTypeIdentifier = "addressInfo",
-                TimeStamp = _testdate
+                Street = "Prince St",
+                Unit = 123,
+                ZipCode = "00001"
             }
         };
-        messageSerializer.Setup(x => x.Serialize(It.IsAny<object>())).Throws(new JsonException("Test exception"));
 
-        var exception = await Assert.ThrowsAsync<FailedToSerializeMessageEnvelopeException>(async () => await envelopeSerializer.SerializeAsync(messageEnvelope));
+        // Setup the serializer to throw when trying to serialize the message
+        messageSerializer.Setup(x => x.Serialize(It.IsAny<object>()))
+            .Throws(new JsonException("Test exception"));
+
+        // ACT & ASSERT
+        var exception = await Assert.ThrowsAsync<FailedToSerializeMessageEnvelopeException>(
+            async () => await envelopeSerializer.SerializeAsync(messageEnvelope));
 
         Assert.Equal("Failed to serialize the MessageEnvelope into a raw string", exception.Message);
+        
         if (dataMessageLogging)
         {
             Assert.NotNull(exception.InnerException);
+            Assert.IsType<JsonException>(exception.InnerException);
+            Assert.Equal("Test exception", exception.InnerException.Message);
         }
         else
         {
             Assert.Null(exception.InnerException);
         }
+
+        // Verify logging behavior
+        logger.Verify(
+            x => x.LogError(
+                It.Is<string>(msg => msg == "Failed to serialize the MessageEnvelope into a raw string"),
+                It.IsAny<object[]>()
+            ),
+            Times.Once);
     }
 
     [Theory]